From 25030cf998f220184a8309b6aa36e6787cc591fc Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Tue, 2 Jun 2020 14:38:16 +0800
Subject: [PATCH] Small refactoring.

---
 .../ProjectBuilding/Templates/App/AppTemplateBase.cs |  6 +-----
 .../Volo/Abp/MongoDB/MongoDbFixture.cs               | 12 +++++++++---
 .../MongoDb/MyProjectNameMongoDbFixture.cs           | 10 ++++++++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index fc88ac7615..417c004f36 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -38,11 +38,6 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
                 steps.Add(new AppTemplateSwitchEntityFrameworkCoreToMongoDbStep());
             }
 
-            if (context.BuildArgs.DatabaseProvider == DatabaseProvider.EntityFrameworkCore)
-            {
-                steps.Add(new AppTemplateRemoveMongodbCollectionFixtureStep());
-            }
-
             if (context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
             {
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore"));
@@ -52,6 +47,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 
             if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb)
             {
+                steps.Add(new AppTemplateRemoveMongodbCollectionFixtureStep());
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests"));
             }
diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs
index f401d0d6d4..3fa239ebbb 100644
--- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/MongoDbFixture.cs
+++ b/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();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
index dbbb3d5980..e59c0c5f7f 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbFixture.cs
@@ -5,8 +5,14 @@ namespace MyCompanyName.MyProjectName.MongoDB
 {
     public class MyProjectNameMongoDbFixture : 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()
         {