Refactor

Preparing to have TLS-aware tests in TestHeartbeats.

Author: michaelklishin

projects/client/Unit/src/unit/Fixtures.cs

@@ -559,6 +559,15 @@ protected void Wait(ManualResetEvent latch, TimeSpan timeSpan)
         {
             Assert.IsTrue(latch.WaitOne(timeSpan), "waiting on a latch timed out");
         }
+
+        //
+        // TLS
+        //
+
+        public static string CertificatesDirectory()
+        {
+            return Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
+        }
     }
 
     public class TimingFixture

projects/client/Unit/src/unit/TestHeartbeats.cs

@@ -65,27 +65,7 @@ public void TestThatHeartbeatWriterUsesConfigurableInterval()
                 RequestedHeartbeat = heartbeatTimeout,
                 AutomaticRecoveryEnabled = false
             };
-            var conn = cf.CreateConnection();
-            var ch = conn.CreateModel();
-            bool wasShutdown = false;
-
-            conn.ConnectionShutdown += (sender, evt) =>
-            {
-                lock (conn)
-                {
-                    if (InitiatedByPeerOrLibrary(evt))
-                    {
-                        CheckInitiator(evt);
-                        wasShutdown = true;
-                    }
-                }
-            };
-            SleepFor(30);
-
-            Assert.IsFalse(wasShutdown, "shutdown event should not have been fired");
-            Assert.IsTrue(conn.IsOpen, "connection should be open");
-
-            conn.Close();
+            RunSingleConnectionTest(cf);
         }
 
         [Test]
@@ -122,6 +102,31 @@ public void TestHundredsOfConnectionsWithRandomHeartbeatInterval()
             }
         }
 
+        protected void RunSingleConnectionTest(ConnectionFactory cf)
+        {
+            var conn = cf.CreateConnection();
+            var ch = conn.CreateModel();
+            bool wasShutdown = false;
+
+            conn.ConnectionShutdown += (sender, evt) =>
+            {
+                lock (conn)
+                {
+                    if (InitiatedByPeerOrLibrary(evt))
+                    {
+                        CheckInitiator(evt);
+                        wasShutdown = true;
+                    }
+                }
+            };
+            SleepFor(30);
+
+            Assert.IsFalse(wasShutdown, "shutdown event should not have been fired");
+            Assert.IsTrue(conn.IsOpen, "connection should be open");
+
+            conn.Close();
+        }
+
         private void CheckInitiator(ShutdownEventArgs evt)
         {
             if (InitiatedByPeerOrLibrary(evt))

projects/client/Unit/src/unit/TestSsl.cs

@@ -50,11 +50,6 @@ namespace RabbitMQ.Client.Unit
     [TestFixture]
     public class TestSsl
     {
-        public static string CertificatesDirectory()
-        {
-            return Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
-        }
-
         public void SendReceive(ConnectionFactory cf)
         {
             using (IConnection conn = cf.CreateConnection())
@@ -81,7 +76,7 @@ public void SendReceive(ConnectionFactory cf)
         [Test]
         public void TestServerVerifiedIgnoringNameMismatch()
         {
-            string sslDir = CertificatesDirectory();
+            string sslDir = IntegrationFixture.CertificatesDirectory();
             if (null == sslDir)
             {
                 Console.WriteLine("SSL_CERT_DIR is not configured, skipping test");
@@ -98,7 +93,7 @@ public void TestServerVerifiedIgnoringNameMismatch()
         [Test]
         public void TestServerVerified()
         {
-            string sslDir = CertificatesDirectory();
+            string sslDir = IntegrationFixture.CertificatesDirectory();
             if (null == sslDir)
             {
                 Console.WriteLine("SSL_CERT_DIR is not configured, skipping test");
@@ -114,7 +109,7 @@ public void TestServerVerified()
         [Test]
         public void TestVersionVerified()
         {
-            string sslDir = CertificatesDirectory();
+            string sslDir = IntegrationFixture.CertificatesDirectory();
             if (null == sslDir)
             {
                 Console.WriteLine("SSL_CERT_DIR is not configured, skipping test");
@@ -135,7 +130,7 @@ public void TestVersionVerified()
         [Test]
         public void TestClientAndServerVerified()
         {
-            string sslDir = CertificatesDirectory();
+            string sslDir = IntegrationFixture.CertificatesDirectory();
             if (null == sslDir)
             {
                 Console.WriteLine("SSL_CERT_DIR is not configured, skipping test");
@@ -157,7 +152,7 @@ public void TestClientAndServerVerified()
         [Test]
         public void TestNoClientCertificate()
         {
-            string sslDir = CertificatesDirectory();
+            string sslDir = IntegrationFixture.CertificatesDirectory();
             if (null == sslDir)
             {
                 Console.WriteLine("SSL_CERT_DIR is not configured, skipping test");