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

---
 .../AbpBackgroundJobsMongoDbTestModule.cs        |  6 +-----
 .../MongoDB/BackgroundJobRepositoryTests.cs      |  5 ++++-
 .../Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs | 16 ++++++++++++++++
 .../MongoDB/MongoTestCollection.cs               | 10 ++++++++++
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
 create mode 100644 modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoTestCollection.cs

diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
index 4147917829..07be76b792 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs
@@ -1,6 +1,4 @@
 using System;
-using Microsoft.Extensions.DependencyInjection;
-using Mongo2Go;
 using Volo.Abp.Data;
 using Volo.Abp.Modularity;
 
@@ -12,11 +10,9 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
         )]
     public class AbpBackgroundJobsMongoDbTestModule : 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/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs
index 429cf4821f..f3827c50e2 100644
--- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs
@@ -1,5 +1,8 @@
-namespace Volo.Abp.BackgroundJobs.MongoDB
+using Xunit;
+
+namespace Volo.Abp.BackgroundJobs.MongoDB
 {
+    [Collection((MongoTestCollection.Name))]
     public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests<AbpBackgroundJobsMongoDbTestModule>
     {
 
diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
new file mode 100644
index 0000000000..3ae1d8fc10
--- /dev/null
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoDbFixture.cs
@@ -0,0 +1,16 @@
+using System;
+using Mongo2Go;
+
+namespace Volo.Abp.BackgroundJobs.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/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoTestCollection.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoTestCollection.cs
new file mode 100644
index 0000000000..0096ae6f10
--- /dev/null
+++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/MongoTestCollection.cs
@@ -0,0 +1,10 @@
+using Xunit;
+
+namespace Volo.Abp.BackgroundJobs.MongoDB
+{
+    [CollectionDefinition(Name)]
+    public class MongoTestCollection : ICollectionFixture<MongoDbFixture>
+    {
+        public const string Name = "MongoDB Collection";
+    }
+}
\ No newline at end of file