Merge pull request #4176 from abpframework/maliming/mongo-patch

Initialize MongoDbRunner in the static constructor.

framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.AuditLogging.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
-        
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
+
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/blob-storing-database/test/Volo.Abp.BlobStoring.Database.MongoDB.Tests/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.BlobStoring.Database.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Blogging.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Docs.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.FeatureManagement.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.Identity.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.IdentityServer
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.PermissionManagement.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.SettingManagement.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace Volo.Abp.TenantManagement.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUserRepository_Tests.cs

@@ -1,5 +1,6 @@
 namespace Volo.Abp.Users.MongoDB
 {
+    [Collection(MongoTestCollection.Name)]
     public class AbpUserRepository_Tests : AbpUserRepository_Tests<AbpUsersMongoDbTestModule>
     {
 

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs

@@ -16,9 +16,9 @@ namespace Volo.Abp.Users.MongoDB
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            var connectionString = MongoDbRunner.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
                                    "Db_" +
-                                    Guid.NewGuid().ToString("N");
+                                   Guid.NewGuid().ToString("N");
 
             Configure<AbpDbConnectionOptions>(options =>
             {

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/ExternalUserLookupService_Tests.cs

@@ -1,7 +1,8 @@
 namespace Volo.Abp.Users.MongoDB
 {
+    [Collection(MongoTestCollection.Name)]
     public class ExternalUserLookupService_Tests : ExternalUserLookupService_Tests<AbpUsersMongoDbTestModule>
     {
-        
+
     }
-}
+}

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/LocalUserLookupService_Tests.cs

@@ -1,7 +1,8 @@
 namespace Volo.Abp.Users.MongoDB
 {
+    [Collection(MongoTestCollection.Name)]
     public class LocalUserLookupService_Tests : LocalUserLookupService_Tests<AbpUsersMongoDbTestModule>
     {
-        
+
     }
-}
+}

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/MongoDbFixture.cs

@@ -0,0 +1,22 @@
+using System;
+using Mongo2Go;
+
+namespace Volo.Abp.Users.MongoDB
+{
+    public class MongoDbFixture : IDisposable
+    {
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
+
+        public void Dispose()
+        {
+            MongoDbRunner?.Dispose();
+        }
+    }
+}

modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/MongoTestCollection.cs

@@ -0,0 +1,10 @@
+using Xunit;
+
+namespace Volo.Abp.Users.MongoDB
+{
+    [CollectionDefinition(Name)]
+    public class MongoTestCollection : ICollectionFixture<MongoDbFixture>
+    {
+        public const string Name = "MongoDB Collection";
+    }
+}

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace MyCompanyName.MyProjectName.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs

@@ -5,12 +5,18 @@ namespace MyCompanyName.MyProjectName.MongoDB
 {
     public class MongoDbFixture : IDisposable
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+        private static readonly MongoDbRunner MongoDbRunner;
+        public static readonly string ConnectionString;
+
+        static MongoDbFixture()
+        {
+            MongoDbRunner = MongoDbRunner.Start();
+            ConnectionString = MongoDbRunner.ConnectionString;
+        }
 
         public void Dispose()
         {
             MongoDbRunner?.Dispose();
         }
     }
-}
+}