From e44efcb803659f07001b648afe8c58334581e84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20Tu=CC=88ken?= <mehmetuken@hotmail.com>
Date: Wed, 18 Dec 2019 04:01:55 +0300
Subject: [PATCH] [templates/module] fix mongo.exe dispose

---
 .../MongoDB/MongoDbFixture.cs                    | 16 ++++++++++++++++
 .../MongoDB/MongoTestCollection.cs               | 10 ++++++++++
 .../MongoDB/MyProjectNameMongoDbTestModule.cs    |  6 +-----
 .../MongoDB/Samples/SampleRepository_Tests.cs    |  2 ++
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
 create mode 100644 templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoTestCollection.cs

diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
new file mode 100644
index 0000000000..0feac4eebf
--- /dev/null
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoDbFixture.cs
@@ -0,0 +1,16 @@
+using System;
+using Mongo2Go;
+
+namespace MyCompanyName.MyProjectName.MongoDB
+{
+    public class MongoDbFixture : IDisposable
+    {
+        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
+        public static readonly string ConnectionString = MongoDbRunner.ConnectionString;
+
+        public void Dispose()
+        {
+            MongoDbRunner?.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoTestCollection.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoTestCollection.cs
new file mode 100644
index 0000000000..42c85760c3
--- /dev/null
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MongoTestCollection.cs
@@ -0,0 +1,10 @@
+using Xunit;
+
+namespace MyCompanyName.MyProjectName.MongoDB
+{
+    [CollectionDefinition(Name)]
+    public class MongoTestCollection : ICollectionFixture<MongoDbFixture>
+    {
+        public const string Name = "MongoDB Collection";
+    }
+}
\ No newline at end of file
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
index 149db59bcc..f29c713c05 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs
@@ -1,6 +1,4 @@
 using System;
-using Mongo2Go;
-using Volo.Abp;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 
@@ -12,11 +10,9 @@ namespace MyCompanyName.MyProjectName.MongoDB
         )]
     public class MyProjectNameMongoDbTestModule : AbpModule
     {
-        private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start();
-
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            var connectionString = MongoDbRunner.ConnectionString.EnsureEndsWith('/') +
+            var connectionString = MongoDbFixture.ConnectionString.EnsureEndsWith('/') +
                                    "Db_" +
                                     Guid.NewGuid().ToString("N");
 
diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
index 6522b9884e..c16c416b2c 100644
--- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
+++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
@@ -1,7 +1,9 @@
 using MyCompanyName.MyProjectName.Samples;
+using Xunit;
 
 namespace MyCompanyName.MyProjectName.MongoDB.Samples
 {
+    [Collection(MongoTestCollection.Name)]
     public class SampleRepository_Tests : SampleRepository_Tests<MyProjectNameMongoDbTestModule>
     {
         /* Don't write custom repository tests here, instead write to