From 1645483bd0b2cce12eb53934c2728184d49e2f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20Tu=CC=88ken?= <mehmetuken@hotmail.com>
Date: Wed, 18 Dec 2019 02:40:06 +0300
Subject: [PATCH] [modules/auditlogging] fix mongo.exe dispose

---
 .../MongoDB/AbpAuditLoggingMongoDbTestModule.cs       |  4 +---
 .../AuditLogging/MongoDB/AuditLogRepository_Tests.cs  |  2 ++
 .../AuditLogging/MongoDB/AuditStore_Basic_Tests.cs    |  5 ++++-
 .../Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs   | 11 ++++++++++-
 .../Abp/AuditLogging/MongoDB/MongoTestCollection.cs   |  7 +++++--
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
index 7c70d720ec..b57c204818 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
@@ -12,11 +12,9 @@ namespace Volo.Abp.AuditLogging.MongoDB
     )]
     public class AbpAuditLoggingMongoDbTestModule : 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/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditLogRepository_Tests.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditLogRepository_Tests.cs
index ffcc2094ab..a0edd58a45 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditLogRepository_Tests.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditLogRepository_Tests.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Xunit;
 
 namespace Volo.Abp.AuditLogging.MongoDB
 {
+    [Collection(MongoTestCollection.Name)]
     public class AuditLogRepository_Tests : AuditLogRepository_Tests<AbpAuditLoggingMongoDbTestModule>
     {
 
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditStore_Basic_Tests.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditStore_Basic_Tests.cs
index fa7a41ecfd..ad590c61e1 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditStore_Basic_Tests.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AuditStore_Basic_Tests.cs
@@ -1,5 +1,8 @@
-namespace Volo.Abp.AuditLogging.MongoDB
+using Xunit;
+
+namespace Volo.Abp.AuditLogging.MongoDB
 {
+    [Collection(MongoTestCollection.Name)]
     public class AuditStore_Basic_Tests : AuditStore_Basic_Tests<AbpAuditLoggingMongoDbTestModule>
     {
 
diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
index cc2f90e01d..33803c1af4 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoDbFixture.cs
@@ -1,7 +1,16 @@
+using System;
+using Mongo2Go;
+
 namespace Volo.Abp.AuditLogging.MongoDB
 {
-    public class MongoDbFixture
+    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/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoTestCollection.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoTestCollection.cs
index 4ed185cb9c..1d89caa8b0 100644
--- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoTestCollection.cs
+++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/MongoTestCollection.cs
@@ -1,7 +1,10 @@
+using Xunit;
+
 namespace Volo.Abp.AuditLogging.MongoDB
 {
-    public class MongoTestCollection
+    [CollectionDefinition(Name)]
+    public class MongoTestCollection : ICollectionFixture<MongoDbFixture>
     {
-        
+        public const string Name = "MongoDB Collection";
     }
 }
\ No newline at end of file