Tests: DisableTestParallelization (#355)

AlekseyMartynov · web-flow · commit 7b31dc04ccca · 2019-06-06T18:12:39.000+03:00
diff --git a/net/DevExtreme.AspNet.Data.Tests.Common/StaticBarrier.cs b/net/DevExtreme.AspNet.Data.Tests.Common/StaticBarrier.cs
diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.EF6/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj b/net/DevExtreme.AspNet.Data.Tests.EF6/DevExtreme.AspNet.Data.Tests.EF6.csproj
@@ -79,6 +79,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="Bug179.cs" />
     <Compile Include="Bug184.cs" />
     <Compile Include="Bug235.cs" />
diff --git a/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs b/net/DevExtreme.AspNet.Data.Tests.EF6/TestDbContext.cs
@@ -8,7 +8,6 @@
 namespace DevExtreme.AspNet.Data.Tests.EF6 {
 
     class TestDbContext : DbContext {
-        static readonly object LOCK = new object();
         static TestDbContext INSTANCE;
 
         private TestDbContext(string connectionString)
@@ -36,17 +35,15 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder) {
         }
 
         public static void Exec(Action<TestDbContext> action) {
-            lock(LOCK) {
-                if(INSTANCE == null) {
-                    var helper = new SqlServerTestDbHelper("EF6");
-                    helper.ResetDatabase();
+            if(INSTANCE == null) {
+                var helper = new SqlServerTestDbHelper("EF6");
+                helper.ResetDatabase();
 
-                    INSTANCE = new TestDbContext(helper.ConnectionString);
-                    INSTANCE.Database.CreateIfNotExists();
-                }
-
-                action(INSTANCE);
+                INSTANCE = new TestDbContext(helper.ConnectionString);
+                INSTANCE.Database.CreateIfNotExists();
             }
+
+            action(INSTANCE);
         }
 
     }
diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore1/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.EFCore1/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore1/TestDbContext.cs b/net/DevExtreme.AspNet.Data.Tests.EFCore1/TestDbContext.cs
@@ -5,7 +5,6 @@
 namespace DevExtreme.AspNet.Data.Tests.EFCore1 {
 
     class TestDbContext : DbContext {
-        static readonly object LOCK = new object();
         static TestDbContext INSTANCE;
 
         private TestDbContext(DbContextOptions options)
@@ -19,21 +18,19 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
         }
 
         public static void Exec(Action<TestDbContext> action) {
-            lock(LOCK) {
-                if(INSTANCE == null) {
-                    var helper = new SqlServerTestDbHelper("EFCore1");
-                    helper.ResetDatabase();
+            if(INSTANCE == null) {
+                var helper = new SqlServerTestDbHelper("EFCore1");
+                helper.ResetDatabase();
 
-                    var options = new DbContextOptionsBuilder()
-                        .UseSqlServer(helper.ConnectionString)
-                        .Options;
+                var options = new DbContextOptionsBuilder()
+                    .UseSqlServer(helper.ConnectionString)
+                    .Options;
 
-                    INSTANCE = new TestDbContext(options);
-                    INSTANCE.Database.EnsureCreated();
-                }
-
-                action(INSTANCE);
+                INSTANCE = new TestDbContext(options);
+                INSTANCE.Database.EnsureCreated();
             }
+
+            action(INSTANCE);
         }
 
     }
diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore2/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.EFCore2/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.EFCore2/TestDbContext.cs b/net/DevExtreme.AspNet.Data.Tests.EFCore2/TestDbContext.cs
@@ -6,7 +6,6 @@
 namespace DevExtreme.AspNet.Data.Tests.EFCore2 {
 
     class TestDbContext : DbContext {
-        static readonly object LOCK = new object();
         static TestDbContext INSTANCE;
 
         private TestDbContext(DbContextOptions options)
@@ -22,22 +21,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) {
         }
 
         public static void Exec(Action<TestDbContext> action) {
-            lock(LOCK) {
-                if(INSTANCE == null) {
-                    var helper = new SqlServerTestDbHelper("EFCore2");
-                    helper.ResetDatabase();
+            if(INSTANCE == null) {
+                var helper = new SqlServerTestDbHelper("EFCore2");
+                helper.ResetDatabase();
 
-                    var options = new DbContextOptionsBuilder()
-                        .UseSqlServer(helper.ConnectionString)
-                        .ConfigureWarnings(warnings => warnings.Throw(RelationalEventId.QueryClientEvaluationWarning))
-                        .Options;
+                var options = new DbContextOptionsBuilder()
+                    .UseSqlServer(helper.ConnectionString)
+                    .ConfigureWarnings(warnings => warnings.Throw(RelationalEventId.QueryClientEvaluationWarning))
+                    .Options;
 
-                    INSTANCE = new TestDbContext(options);
-                    INSTANCE.Database.EnsureCreated();
-                }
-
-                action(INSTANCE);
+                INSTANCE = new TestDbContext(options);
+                INSTANCE.Database.EnsureCreated();
             }
+
+            action(INSTANCE);
         }
 
     }
diff --git a/net/DevExtreme.AspNet.Data.Tests.L2S/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.L2S/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.L2S/DevExtreme.AspNet.Data.Tests.L2S.csproj b/net/DevExtreme.AspNet.Data.Tests.L2S/DevExtreme.AspNet.Data.Tests.L2S.csproj
@@ -86,6 +86,7 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="RemoteGroupingStress.cs" />
     <Compile Include="Summary.cs" />
     <Compile Include="T670222_TotalSummary.cs" />
diff --git a/net/DevExtreme.AspNet.Data.Tests.L2S/TestDataClasses.cs b/net/DevExtreme.AspNet.Data.Tests.L2S/TestDataClasses.cs
@@ -4,46 +4,43 @@
 namespace DevExtreme.AspNet.Data.Tests.L2S {
 
     partial class TestDataContext {
-        static readonly object LOCK = new object();
         static TestDataContext INSTANCE;
 
         public static void Exec(Action<TestDataContext> action) {
-            lock(LOCK) {
-                if(INSTANCE == null) {
-                    var helper = new SqlServerTestDbHelper("L2S");
-                    helper.ResetDatabase();
-
-                    INSTANCE = new TestDataContext(helper.ConnectionString);
-
-                    INSTANCE.ExecuteCommand(
-                        $@"create table {nameof(RemoteGroupingStress_DataItem)} (
-                            {nameof(RemoteGroupingStress_DataItem.ID)} int identity primary key,
-                            {nameof(RemoteGroupingStress_DataItem.Num)} int not null,
-                            {nameof(RemoteGroupingStress_DataItem.NullNum)} int,
-                            {nameof(RemoteGroupingStress_DataItem.Date)} datetime2 not null,
-                            {nameof(RemoteGroupingStress_DataItem.NullDate)} datetime2
-                        )"
-                    );
-
-                    INSTANCE.ExecuteCommand(
-                        $@"create table {nameof(Summary_DataItem)} (
-                            {nameof(Summary_DataItem.ID)} int identity primary key,
-                            {nameof(Summary_DataItem.Group1)} nvarchar,
-                            {nameof(Summary_DataItem.Group2)} nvarchar,
-                            {nameof(Summary_DataItem.Value)} int
-                        )"
-                    );
-
-                    INSTANCE.ExecuteCommand(
-                        $@"create table {nameof(GenericTestDataItem)} (
-                            {nameof(GenericTestDataItem.ID)} int identity primary key,
-                            {nameof(GenericTestDataItem.Num)} int
-                        )"
-                    );
-                }
-
-                action(INSTANCE);
+            if(INSTANCE == null) {
+                var helper = new SqlServerTestDbHelper("L2S");
+                helper.ResetDatabase();
+
+                INSTANCE = new TestDataContext(helper.ConnectionString);
+
+                INSTANCE.ExecuteCommand(
+                    $@"create table {nameof(RemoteGroupingStress_DataItem)} (
+                        {nameof(RemoteGroupingStress_DataItem.ID)} int identity primary key,
+                        {nameof(RemoteGroupingStress_DataItem.Num)} int not null,
+                        {nameof(RemoteGroupingStress_DataItem.NullNum)} int,
+                        {nameof(RemoteGroupingStress_DataItem.Date)} datetime2 not null,
+                        {nameof(RemoteGroupingStress_DataItem.NullDate)} datetime2
+                    )"
+                );
+
+                INSTANCE.ExecuteCommand(
+                    $@"create table {nameof(Summary_DataItem)} (
+                        {nameof(Summary_DataItem.ID)} int identity primary key,
+                        {nameof(Summary_DataItem.Group1)} nvarchar,
+                        {nameof(Summary_DataItem.Group2)} nvarchar,
+                        {nameof(Summary_DataItem.Value)} int
+                    )"
+                );
+
+                INSTANCE.ExecuteCommand(
+                    $@"create table {nameof(GenericTestDataItem)} (
+                        {nameof(GenericTestDataItem.ID)} int identity primary key,
+                        {nameof(GenericTestDataItem.Num)} int
+                    )"
+                );
             }
+
+            action(INSTANCE);
         }
 
         public void PurgeGenericTestTable() {
diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.NH/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.NH/SessionFactoryHelper.cs b/net/DevExtreme.AspNet.Data.Tests.NH/SessionFactoryHelper.cs
@@ -8,24 +8,21 @@ namespace DevExtreme.AspNet.Data.Tests.NH {
 
     static class SessionFactoryHelper {
         static ISessionFactory FACTORY;
-        static object LOCK = new object();
 
         public static void Exec(Action<ISession> action) {
-            lock(LOCK) {
-                if(FACTORY == null) {
-                    var sqlHelper = new SqlServerTestDbHelper("NH");
-                    sqlHelper.ResetDatabase();
+            if(FACTORY == null) {
+                var sqlHelper = new SqlServerTestDbHelper("NH");
+                sqlHelper.ResetDatabase();
 
-                    FACTORY = Fluently.Configure()
-                        .Database(MsSqlConfiguration.MsSql2012.ConnectionString(sqlHelper.ConnectionString))
-                        .Mappings(m => m.FluentMappings.AddFromAssembly(typeof(SessionFactoryHelper).Assembly))
-                        .ExposeConfiguration(config => new SchemaExport(config).Create(false, true))
-                        .BuildSessionFactory();
-                }
+                FACTORY = Fluently.Configure()
+                    .Database(MsSqlConfiguration.MsSql2012.ConnectionString(sqlHelper.ConnectionString))
+                    .Mappings(m => m.FluentMappings.AddFromAssembly(typeof(SessionFactoryHelper).Assembly))
+                    .ExposeConfiguration(config => new SchemaExport(config).Create(false, true))
+                    .BuildSessionFactory();
+            }
 
-                using(var session = FACTORY.OpenSession()) {
-                    action(session);
-                }
+            using(var session = FACTORY.OpenSession()) {
+                action(session);
             }
         }
 
diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests.Xpo/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/UnitOfWorkHelper.cs b/net/DevExtreme.AspNet.Data.Tests.Xpo/UnitOfWorkHelper.cs
@@ -6,37 +6,34 @@
 namespace DevExtreme.AspNet.Data.Tests.Xpo {
 
     static class UnitOfWorkHelper {
-        static readonly object LOCK = new object();
         static IDataLayer DATA_LAYER;
 
         public static void Exec(Action<UnitOfWork> action) {
-            lock(LOCK) {
-                XpoDefault.Session = null;
-
-                if(DATA_LAYER == null) {
-                    var sqlHelper = new SqlServerTestDbHelper("Xpo");
-                    sqlHelper.ResetDatabase();
-
-                    var dict = new ReflectionDictionary();
-                    dict.GetDataStoreSchema(
-                        typeof(DefaultSort.DataItem),
-                        typeof(RemoteGroupingStress.DataItem),
-                        typeof(Summary.DataItem),
-                        typeof(Bug339.DataItem),
-                        typeof(PaginateViaPrimaryKey.DataItem)
-                    );
-
-                    var provider = XpoDefault.GetConnectionProvider(
-                        sqlHelper.ConnectionString,
-                        AutoCreateOption.SchemaOnly
-                    );
-
-                    DATA_LAYER = new SimpleDataLayer(dict, provider);
-                }
-
-                using(var uow = new UnitOfWork(DATA_LAYER)) {
-                    action(uow);
-                }
+            XpoDefault.Session = null;
+
+            if(DATA_LAYER == null) {
+                var sqlHelper = new SqlServerTestDbHelper("Xpo");
+                sqlHelper.ResetDatabase();
+
+                var dict = new ReflectionDictionary();
+                dict.GetDataStoreSchema(
+                    typeof(DefaultSort.DataItem),
+                    typeof(RemoteGroupingStress.DataItem),
+                    typeof(Summary.DataItem),
+                    typeof(Bug339.DataItem),
+                    typeof(PaginateViaPrimaryKey.DataItem)
+                );
+
+                var provider = XpoDefault.GetConnectionProvider(
+                    sqlHelper.ConnectionString,
+                    AutoCreateOption.SchemaOnly
+                );
+
+                DATA_LAYER = new SimpleDataLayer(dict, provider);
+            }
+
+            using(var uow = new UnitOfWork(DATA_LAYER)) {
+                action(uow);
             }
         }
     }
diff --git a/net/DevExtreme.AspNet.Data.Tests.Xpo/XafDomainComponents.cs b/net/DevExtreme.AspNet.Data.Tests.Xpo/XafDomainComponents.cs
@@ -39,7 +39,7 @@ const string
 
         [Fact]
         public void Scenario() {
-            StaticBarrier.Run(delegate {
+            try {
                 CustomAccessorCompilers.Register((target, accessorText) => {
                     if(accessorText == OID) {
                         return Expression.Property(
@@ -84,7 +84,9 @@ public void Scenario() {
                     Assert.Equal(123, item["Value"]);
                     Assert.Equal(0, item[LOCK_FILED]);
                 });
-            });
+            } finally {
+                CustomAccessorCompilers.Clear();
+            }
         }
 
     }
diff --git a/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs b/net/DevExtreme.AspNet.Data.Tests/AggregateCalculatorTests.cs
@@ -281,7 +281,7 @@ class SumFixItem {
 
         [Fact]
         public void CustomAggregator() {
-            StaticBarrier.Run(delegate {
+            try {
                 CustomAggregators.RegisterAggregator("totalSales", typeof(TotalSalesAggregator<>));
 
                 var data = new[] {
@@ -310,7 +310,9 @@ public void CustomAggregator() {
                 Assert.Equal(34.34M, data[0].summary[0]);
                 Assert.Equal(42.42M, data[1].summary[0]);
                 Assert.Equal(0M, data[2].summary[0]);
-            });
+            } finally {
+                CustomAggregators.Clear();
+            }
         }
 
         class CustomAggregatorDataItem {
diff --git a/net/DevExtreme.AspNet.Data.Tests/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data.Tests/AssemblyInfo.cs
diff --git a/net/DevExtreme.AspNet.Data.Tests/CustomAggregatorsTests.cs b/net/DevExtreme.AspNet.Data.Tests/CustomAggregatorsTests.cs
diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoaderTests.cs
diff --git a/net/DevExtreme.AspNet.Data.Tests/StringToLowerTests.cs b/net/DevExtreme.AspNet.Data.Tests/StringToLowerTests.cs
diff --git a/net/DevExtreme.AspNet.Data/AssemblyInfo.cs b/net/DevExtreme.AspNet.Data/AssemblyInfo.cs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+using Xunit;`
	`2`	`+`
	`3`	`+[assembly: CollectionBehavior(DisableTestParallelization = true)]`