Merge pull request #188 from rabbitmq/rabbtimq-dotnet-client-186

revert changes introduced for issue #157

Author: michaelklishin

.gitignore

@@ -18,6 +18,7 @@ TestResult.xml
 .paket/paket.exe
 /NuGet
 rabbit-mock.snk
+test.sh
 
 #################
 ## Visual Studio

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

@@ -420,8 +420,7 @@ public IConnection CreateConnection(IList<string> hostnames, String clientProvid
                 {
                     IProtocol protocol = Protocols.DefaultProtocol;
                     var selectedHost = this.HostnameSelector.NextFrom(hostnames);
-                    var endPoint = AmqpTcpEndpoint.Parse(selectedHost);
-                    conn = protocol.CreateConnection(this, false, CreateFrameHandler(endPoint), clientProvidedName);
+                    conn = protocol.CreateConnection(this, false, CreateFrameHandlerForHostname(selectedHost), clientProvidedName);
                 }
             }
             catch (Exception e)
@@ -447,9 +446,7 @@ public IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint)
 
         public IFrameHandler CreateFrameHandlerForHostname(string hostname)
         {
-            var ep = AmqpTcpEndpoint.Parse(hostname);
-            ep.Ssl = this.Endpoint.Ssl;
-            return CreateFrameHandler(ep);
+            return CreateFrameHandler(this.Endpoint.CloneWithHostname(hostname));
         }
 
 

projects/client/RabbitMQ.Client/src/client/impl/AutorecoveringConnection.cs

@@ -562,8 +562,7 @@ public void Init(IList<string> hostnames)
             {
                 try
                 {
-                    var endPoint = CloneEndpointWithHostname(h);
-                    fh = m_factory.CreateFrameHandler(endPoint);
+                    fh = m_factory.CreateFrameHandler(m_factory.Endpoint.CloneWithHostname(h));
                     reachableHostname = h;
                 } 
                 catch (Exception caught)
@@ -798,8 +797,7 @@ protected void RecoverConnectionDelegate()
                 try
                 {
                     var nextHostname = m_factory.HostnameSelector.NextFrom(this.hostnames);
-                    var endPoint = CloneEndpointWithHostname(nextHostname);
-                    var fh = m_factory.CreateFrameHandler(endPoint);
+                    var fh = m_factory.CreateFrameHandler(m_factory.Endpoint.CloneWithHostname(nextHostname));
                     m_delegate = new Connection(m_factory, false, fh, this.ClientProvidedName);
                     recovering = false;
                 }
@@ -1006,12 +1004,5 @@ protected bool ShouldTriggerConnectionRecovery(ShutdownEventArgs args)
                 // connectivity loss or abrupt shutdown
                     args.Initiator == ShutdownInitiator.Library);
         }
-
-        private AmqpTcpEndpoint CloneEndpointWithHostname(string hostname)
-        {
-            var ate = AmqpTcpEndpoint.Parse(hostname);
-            ate.Ssl = m_factory.Endpoint.Ssl;
-            return ate;
-        }
     }
 }

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

@@ -40,6 +40,7 @@
 
 using System;
 using NUnit.Framework;
+using RabbitMQ.Client.Exceptions;
 
 namespace RabbitMQ.Client.Unit
 {
@@ -70,19 +71,34 @@ public void TestProperties()
         }
 
         [Test]
-        public void TestCreateConnectionParsesHostNameWithPort()
+        [ExpectedException(typeof(BrokerUnreachableException))]
+        public void TestCreateConnectionUsesSpecifiedPort()
         {
             var cf = new ConnectionFactory();
             cf.AutomaticRecoveryEnabled = true;
-            cf.HostName = "not_localhost";
+            cf.HostName = "localhost";
             cf.Port = 1234;
-            var conn = cf.CreateConnection(new System.Collections.Generic.List<string> { "localhost:5672" }, "oregano");
-            conn.Close();
-            conn.Dispose();
-            Assert.AreEqual("not_localhost", cf.HostName);
-            Assert.AreEqual(1234, cf.Port);
-            Assert.AreEqual("localhost", conn.Endpoint.HostName);
-            Assert.AreEqual(5672, conn.Endpoint.Port);
+            using(var conn = cf.CreateConnection());
+        }
+
+        [Test]
+        [ExpectedException(typeof(BrokerUnreachableException))]
+        public void TestCreateConnectionWithClientProvidedNameUsesSpecifiedPort()
+        {
+            var cf = new ConnectionFactory();
+            cf.AutomaticRecoveryEnabled = true;
+            cf.HostName = "localhost";
+            cf.Port = 1234;
+            using(var conn = cf.CreateConnection("some_name"));
+        }
+        
+        [Test]
+        public void TestCreateConnectionUsesDefaultPort()
+        {
+            var cf = new ConnectionFactory();
+            cf.AutomaticRecoveryEnabled = true;
+            cf.HostName = "localhost";
+            using(var conn = cf.CreateConnection());
         }
 
         [Test]
@@ -91,12 +107,11 @@ public void TestCreateConnectionWithoutAutoRecoverySelectsAHostFromTheList()
             var cf = new ConnectionFactory();
             cf.AutomaticRecoveryEnabled = false;
             cf.HostName = "not_localhost";
-            cf.Port = 1234;
             var conn = cf.CreateConnection(new System.Collections.Generic.List<string> { "localhost" }, "oregano");
             conn.Close();
             conn.Dispose();
             Assert.AreEqual("not_localhost", cf.HostName);
             Assert.AreEqual("localhost", conn.Endpoint.HostName);       
-	}
+        }
     }
 }