create TestFixture to ensure pools are created only once and then pro…

…perly disposed
Aaronontheweb · May 21, 2019 · 3cf0142 · 3cf0142
1 parent 5d2f46b
commit 3cf0142
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/core/Akka.Remote.TestKit.Tests/RemoteConnectionSpecs.cs b/src/core/Akka.Remote.TestKit.Tests/RemoteConnectionSpecs.cs
@@ -23,7 +23,26 @@
 
 namespace Akka.Remote.TestKit.Tests
 {
-    public class RemoteConnectionSpecs : AkkaSpec
+    public class RemoteConnectionFixture : IDisposable
+    {
+        private IEventLoopGroup _clientGroup;
+        private IEventLoopGroup _serverGroup;
+
+        public RemoteConnectionFixture()
+        {
+            // allocate connection pools in advance - will be reused on subsequent RemoteConnection.CreateConnection calls
+            _clientGroup = RemoteConnection.GetClientWorkerPool(1);
+            _serverGroup = RemoteConnection.GetServerPool(1);
+        }
+
+        public void Dispose()
+        {
+            // dispose all of the event loop groups created
+            RemoteConnection.ReleaseAll().Wait(TimeSpan.FromSeconds(3));
+        }
+    }
+
+    public class RemoteConnectionSpecs : AkkaSpec, IClassFixture<RemoteConnectionFixture>
     {
         private const string Config = @"
             akka.testconductor.barrier-timeout = 5s
@@ -33,7 +52,7 @@ public class RemoteConnectionSpecs : AkkaSpec
             akka.actor.debug.lifecycle = on
         ";
 
-        public RemoteConnectionSpecs(ITestOutputHelper output) : base(Config, output)
+        public RemoteConnectionSpecs(RemoteConnectionFixture fixture, ITestOutputHelper output) : base(Config, output)
         {
 
         }

diff --git a/src/core/Akka.Remote.TestKit/RemoteConnection.cs b/src/core/Akka.Remote.TestKit/RemoteConnection.cs
@@ -63,7 +63,7 @@ private static void ApplyChannelPipeline(IChannel channel, IChannelHandler handl
         #region Static methods
 
         private static IEventLoopGroup _clientPool;
-        private static IEventLoopGroup GetClientWorkerPool(int poolSize)
+        internal static IEventLoopGroup GetClientWorkerPool(int poolSize)
         {
             if (_clientPool == null)
             {
@@ -73,7 +73,7 @@ private static IEventLoopGroup GetClientWorkerPool(int poolSize)
         }
 
         private static IEventLoopGroup _serverPool;
-        private static IEventLoopGroup GetServerPool(int poolSize)
+        internal static IEventLoopGroup GetServerPool(int poolSize)
         {
             if (_serverPool == null)
             {