Fix MixScenarioTest and Inheritance parallel running problem

Author: xuzhg

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Common/Controllers/AsyncInMemoryODataController.cs

@@ -11,6 +11,11 @@
 
 namespace Microsoft.Test.E2E.AspNet.OData.Common.Controllers
 {
+    /// <summary>
+    /// Pay attention to use this class when you create test cases in parallel.
+    /// If multiple test cases rely on the same <typeparamref name="TEntity"/>, these test cases maybe conflict each other.
+    /// So, do not use the same <typeparamref name="TEntity"/> in mulitple test cases.
+    /// </summary>
     [ModelStateErrorHandling]
     public abstract class InMemoryODataController<TEntity, TKey> : TestODataController
         where TEntity : class

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/ETags/GetEntryWithIfNoneMatchETagsTest.cs

@@ -47,6 +47,11 @@ public async Task GetEntryWithIfNoneMatchShouldReturnNotModifiedETagsTest()
         {
             string eTag;
 
+             // DeleteUpdatedEntryWithIfMatchETagsTests will change #"0" customer
+             // PutUpdatedEntryWithIfMatchETagsTests will change #"1"customer
+             // PatchUpdatedEntryWithIfMatchETagsTest will change #"2" customer
+             // So, this case uses "4"
+            int customerId = 4;
             var getUri = this.BaseAddress + "/odata/ETagsCustomers?$format=json";
             using (var response = await Client.GetAsync(getUri))
             {
@@ -56,11 +61,11 @@ public async Task GetEntryWithIfNoneMatchShouldReturnNotModifiedETagsTest()
                 var result = json.GetValue("value") as JArray;
                 Assert.NotNull(result);
 
-                eTag = result[0]["@odata.etag"].ToString();
+                eTag = result[customerId]["@odata.etag"].ToString();
                 Assert.False(String.IsNullOrEmpty(eTag));
             }
 
-            var getRequestWithEtag = new HttpRequestMessage(HttpMethod.Get, this.BaseAddress + "/odata/ETagsCustomers(0)");
+            var getRequestWithEtag = new HttpRequestMessage(HttpMethod.Get, this.BaseAddress + "/odata/ETagsCustomers(" + customerId + ")");
             getRequestWithEtag.Headers.IfNoneMatch.ParseAdd(eTag);
             using (var response = await Client.SendAsync(getRequestWithEtag))
             {

test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Formatter/MixScenarioTests.cs

@@ -14,7 +14,6 @@
 using Microsoft.Test.E2E.AspNet.OData.Common.Execution;
 using Microsoft.Test.E2E.AspNet.OData.Common.Extensions;
 using Microsoft.Test.E2E.AspNet.OData.Common.Instancing;
-using Microsoft.Test.E2E.AspNet.OData.Common.Models.Vehicle;
 using Nop.Core.Domain.Blogs;
 using Xunit;
 
@@ -60,7 +59,19 @@ public void ThrowExceptionInAction()
         }
     }
 
-    public class MixScenarioTests_ODataController : InMemoryODataController<Vehicle, int>
+    [Key("Id")]
+    public class MixVehicle
+    {
+        public int Id { get; set; }
+
+        public string Model { get; set; }
+
+        public string Name { get; set; }
+
+        public virtual int WheelCount { get; set; }
+    }
+
+    public class MixScenarioTests_ODataController : InMemoryODataController<MixVehicle, int>
     {
         public MixScenarioTests_ODataController()
             : base("Id")
@@ -85,7 +96,7 @@ protected override void UpdateConfiguration(WebRouteConfiguration configuration)
         protected static IEdmModel GetEdmModel(WebRouteConfiguration configuration)
         {
             var mb = configuration.CreateConventionModelBuilder();
-            mb.EntitySet<Vehicle>("MixScenarioTests_OData");
+            mb.EntitySet<MixVehicle>("MixScenarioTests_OData");
             return mb.GetEdmModel();
         }
 
@@ -128,7 +139,7 @@ public MixScenarioTestsOData(WebHostTestFixture fixture)
         protected static IEdmModel GetEdmModel(WebRouteConfiguration configuration)
         {
             var mb = configuration.CreateConventionModelBuilder();
-            mb.EntitySet<Vehicle>("MixScenarioTests_OData");
+            mb.EntitySet<MixVehicle>("MixScenarioTests_OData");
             return mb.GetEdmModel();
         }
 
@@ -143,7 +154,7 @@ public async Task ODataCRUDShouldWorkAsync()
             await this.ClearRepositoryAsync(entitySetName);
 
             // post new entity to repository
-            var baseline = InstanceCreator.CreateInstanceOf<Vehicle>(rand);
+            var baseline = InstanceCreator.CreateInstanceOf<MixVehicle>(rand);
             await PostNewEntityAsync(uri, baseline, entitySetName);
 
             // get collection of entities from repository
@@ -178,23 +189,23 @@ await UpdateEntityAsync(
             Assert.Null(thirdVersion);
         }
 
-        private async Task<DataServiceResponse> PostNewEntityAsync(Uri baseAddress, Vehicle entity, string entitySetName)
+        private async Task<DataServiceResponse> PostNewEntityAsync(Uri baseAddress, MixVehicle entity, string entitySetName)
         {
             var context = WriterClient(baseAddress, ODataProtocolVersion.V4);
             context.AddObject(entitySetName, entity);
 
             return await context.SaveChangesAsync();
         }
 
-        private async Task<IEnumerable<Vehicle>> GetEntitiesAsync(Uri baseAddress, string entitySetName)
+        private async Task<IEnumerable<MixVehicle>> GetEntitiesAsync(Uri baseAddress, string entitySetName)
         {
             var context = ReaderClient(baseAddress, ODataProtocolVersion.V4);
-            var query = context.CreateQuery<Vehicle>(entitySetName);
+            var query = context.CreateQuery<MixVehicle>(entitySetName);
 
             return await query.ExecuteAsync();
         }
 
-        private async Task<DataServiceResponse> UpdateEntityAsync(Uri baseAddress, Vehicle from, Func<Vehicle, Vehicle> update, string entitySetName)
+        private async Task<DataServiceResponse> UpdateEntityAsync(Uri baseAddress, MixVehicle from, Func<MixVehicle, MixVehicle> update, string entitySetName)
         {
             var context = WriterClient(baseAddress, ODataProtocolVersion.V4);
 
@@ -205,7 +216,7 @@ private async Task<DataServiceResponse> UpdateEntityAsync(Uri baseAddress, Vehic
             return await context.SaveChangesAsync();
         }
 
-        private async Task<DataServiceResponse> DeleteEntityAsync(Uri baseAddress, Vehicle entity, string entitySetName)
+        private async Task<DataServiceResponse> DeleteEntityAsync(Uri baseAddress, MixVehicle entity, string entitySetName)
         {
             var context = WriterClient(baseAddress, ODataProtocolVersion.V4);
             context.AttachTo(entitySetName, entity);