URI parsing tests: assert on whether TLS is enabled

References #764.

Author: michaelklishin

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -241,10 +241,18 @@ public TimeSpan ContinuationTimeout
         public TimeSpan SocketWriteTimeout { get; set; } = DefaultConnectionTimeout;
 
         /// <summary>
-        /// Ssl options setting.
+        /// TLS options setting.
         /// </summary>
         public SslOption Ssl { get; set; } = new SslOption();
 
+        /// <summary>
+        /// TLS options setting.
+        /// </summary>
+        public SslOption Tls {
+            get { return this.Ssl; }
+            set { this.Ssl = value; }
+        }
+
         /// <summary>
         /// Set to false to make automatic connection recovery not recover topology (exchanges, queues, bindings, etc).
         /// Defaults to true.

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

@@ -76,9 +76,11 @@ public void TestAmqpUriParseSucceed()
             {
                 /* From the spec */
                 ParseSuccess("amqp://user:pass@host:10000/vhost",
-                    "user", "pass", "host", 10000, "vhost");
+                    "user", "pass", "host", 10000, "vhost", false);
+                ParseSuccess("amqps://user:pass@host:10000/vhost",
+                    "user", "pass", "host", 10000, "vhost", true);
                 ParseSuccess("aMQps://user%61:%61pass@host:10000/v%2fhost",
-                    "usera", "apass", "host", 10000, "v/host");
+                    "usera", "apass", "host", 10000, "v/host", true);
                 ParseSuccess("amqp://localhost", "guest", "guest", "localhost", 5672, "/");
                 ParseSuccess("amqp://:@localhost/", "", "", "localhost", 5672, "/");
                 ParseSuccess("amqp://user@localhost",
@@ -137,12 +139,13 @@ public void TestAmqpUriParseSucceed()
             }
         }
 
-        private static void AssertUriPartEquivalence(string user, string password, int port, string vhost, ConnectionFactory cf)
+        private static void AssertUriPartEquivalence(ConnectionFactory cf, string user, string password, int port, string vhost, bool tlsEnabled)
         {
             Assert.AreEqual(user, cf.UserName);
             Assert.AreEqual(password, cf.Password);
             Assert.AreEqual(port, cf.Port);
             Assert.AreEqual(vhost, cf.VirtualHost);
+            Assert.AreEqual(tlsEnabled, cf.Tls.Enabled);
         }
 
         private void ParseFailWith<T>(string uri) where T : Exception
@@ -151,26 +154,27 @@ private void ParseFailWith<T>(string uri) where T : Exception
             Assert.That(() => cf.Uri = new Uri(uri), Throws.TypeOf<T>());
         }
 
-        private void ParseSuccess(string uri, string user, string password, string host, int port, string vhost)
+        private void ParseSuccess(string uri, string user, string password, string host, int port, string vhost, bool tlsEnabled = false)
         {
             var factory = new ConnectionFactory
             {
                 Uri = new Uri(uri)
             };
-            AssertUriPartEquivalence(user, password, port, vhost, factory);
+            AssertUriPartEquivalence(factory, user, password, port, vhost, tlsEnabled);
             Assert.AreEqual(host, factory.HostName);
         }
 
         private void ParseSuccess(string uri, string user, string password,
-            string[] hosts, int port, string vhost)
+            string[] hosts, int port, string vhost, bool tlsEnabled = false)
         {
             var factory = new ConnectionFactory
             {
                 Uri = new Uri(uri)
             };
-            AssertUriPartEquivalence(user, password, port, vhost, factory);
+            AssertUriPartEquivalence(factory, user, password, port, vhost, tlsEnabled);
             Assert.IsTrue(Array.IndexOf(hosts, factory.HostName) != -1);
         }
+
         public static bool IsRunningOnMono()
         {
             #if CORECLR