Update client proxy file

chinadragon0515 · May 26, 2016 · b8e5abd · b8e5abd
1 parent 027e188
commit b8e5abd
Show file tree

Hide file tree

Showing 7 changed files with 1,777 additions and 1,165 deletions.
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/BatchTests.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/BatchTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.OData.Client;
-using Microsoft.OData.Service.Sample.Tests.ServiceReference;
+using Microsoft.OData.Service.Sample.Trippin.Models;
 using Xunit;
 
 namespace Microsoft.OData.Service.Sample.Tests

diff --git a/...EndToEnd/Microsoft.OData.Service.Sample.Tests/Microsoft.OData.Service.Sample.Tests.csproj b/...EndToEnd/Microsoft.OData.Service.Sample.Tests/Microsoft.OData.Service.Sample.Tests.csproj
@@ -107,12 +107,6 @@
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.OData.Service.Sample.Trippin\Microsoft.OData.Service.Sample.Trippin.csproj">
-      <Project>{b379640e-9064-438d-8da5-6f7b394c2c46}</Project>
-      <Name>Microsoft.OData.Service.Sample.Trippin</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/ServiceReference/TrippinProxy.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/ServiceReference/TrippinProxy.cs
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TemporalTests.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TemporalTests.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using Microsoft.OData.Client;
 using Microsoft.OData.Edm.Library;
-using Microsoft.OData.Service.Sample.Tests.ServiceReference;
+using Microsoft.OData.Service.Sample.Trippin.Models;
 using Xunit;
 
 namespace Microsoft.OData.Service.Sample.Tests
@@ -33,7 +33,7 @@ public void CURDEntityWithDateProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Count this entity
             var count = this.TestClientContext.People.Count();
@@ -87,7 +87,7 @@ public void UQDateProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Query a property
             var birthDate = this.TestClientContext.People
@@ -264,7 +264,7 @@ public void UQTimeOfDayProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Query a property
             var birthTime = this.TestClientContext.People
@@ -303,7 +303,7 @@ public void QueryOptionsOnTimeOfDayProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Filter this entity
             var persons = this.TestClientContext.People
@@ -358,7 +358,7 @@ public void QueryOptionsOnTimeOfDayProperty()
             Assert.Equal(3, people2.Count);
 
             // skip
-            people2 = this.TestClientContext.People.Skip(personId - 1).ToList();
+            people2 = this.TestClientContext.People.Skip((int)(personId - 1)).ToList();
             Assert.Equal(birthTime, people2.First().BirthTime);
             Assert.Equal(birthTime, people2.First().BirthTime2);
 
@@ -386,7 +386,7 @@ public void CURDEntityWithDateTimeOffsetProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Count this entity
             var count = this.TestClientContext.People.Count();
@@ -440,7 +440,7 @@ public void UQDateTimeOffsetProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Query a property
             var birthDateTime = this.TestClientContext.People
@@ -479,7 +479,7 @@ public void QueryOptionsOnDateTimeOffsetProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Filter this entity
             var persons = this.TestClientContext.People

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinE2ETestBase.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinE2ETestBase.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
-using Microsoft.OData.Service.Sample.Tests.ServiceReference;
+using Microsoft.OData.Service.Sample.Trippin.Models;
 using Xunit;
 
 namespace Microsoft.OData.Service.Sample.Tests
 {
-    public abstract class TrippinE2ETestBase : E2ETestBase<TrippinModel>, IClassFixture<TrippinServiceFixture>
+    public abstract class TrippinE2ETestBase : E2ETestBase<TrippinDataServiceContext>, IClassFixture<TrippinServiceFixture>
     {
         protected TrippinE2ETestBase()
             : base(new Uri("http://localhost:18384/api/Trippin/"))

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinE2ETestCases.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinE2ETestCases.cs
@@ -7,7 +7,7 @@
 using System.Linq;
 using Microsoft.OData.Client;
 using Microsoft.OData.Core;
-using Microsoft.OData.Service.Sample.Tests.ServiceReference;
+using Microsoft.OData.Service.Sample.Trippin.Models;
 using Xunit;
 
 namespace Microsoft.OData.Service.Sample.Tests
@@ -235,7 +235,7 @@ public void UQProperty()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             // Query a property
             var lastName = this.TestClientContext.People
@@ -665,7 +665,7 @@ public void CURDCollectionNavigationPropertyAndRef()
 
             this.TestClientContext.AddToPeople(person);
             this.TestClientContext.SaveChanges();
-            int personId = person.PersonId;
+            long? personId = person.PersonId;
 
             var startDate = DateTime.Now;
             Trip trip1 = new Trip()

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinInMemoryE2ETest.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Sample.Tests/TrippinInMemoryE2ETest.cs
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
-using Microsoft.OData.Service.Sample.Tests.ServiceReference;
+using Microsoft.OData.Service.Sample.Trippin.Models;
 using Xunit;
 
 namespace Microsoft.OData.Service.Sample.Tests
 {
-    public class TrippinInMemoryE2ETest : E2ETestBase<TrippinModel>, IClassFixture<TrippinServiceFixture>
+    public class TrippinInMemoryE2ETest : E2ETestBase<TrippinDataServiceContext>, IClassFixture<TrippinServiceFixture>
     {
         private const string baseUri = "http://localhost:21248/api/Trippin/";