(Patch supplied by Tomas Restrepo) QPID-312.diff applied. This converts Javadoc copied accross from the orignal Java code to .Net format. Renames some files/classes/methods to use .Net conventions.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@501006 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 130 insertions, 130 deletions

diff --git a/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs b/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
index fae610eb85..69f8cc1406 100644
--- a/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
+++ b/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
@@ -22,7 +22,7 @@ using System;
 using log4net;
 using NUnit.Framework;
 using Qpid.Messaging;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
 
 namespace Qpid.Client.Tests
 {
@@ -54,7 +54,7 @@ namespace Qpid.Client.Tests
 
             try
             {
-                ConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);               
+                IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(connectionUri);               
                 _connection = new AMQConnection(connectionInfo);
                 _channel = _connection.CreateChannel(false, AcknowledgeMode.NoAcknowledge, 1);
             }
diff --git a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index d5330898a0..f03df903b2 100644
--- a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
@@ -20,7 +20,7 @@
  */
 using System;
 using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
 using Qpid.Messaging;
 
 namespace Qpid.Client.Tests.Connection
@@ -31,7 +31,7 @@ namespace Qpid.Client.Tests.Connection
         [Test]
         public void SimpleConnection()
         {
-            ConnectionInfo connectionInfo = new QpidConnectionInfo();
+            IConnectionInfo connectionInfo = new QpidConnectionInfo();
             connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
             using (IConnection connection = new AMQConnection(connectionInfo))
             {
@@ -42,8 +42,8 @@ namespace Qpid.Client.Tests.Connection
         [Test]
         public void PasswordFailureConnection()
         {
-            ConnectionInfo connectionInfo = new QpidConnectionInfo();
-            connectionInfo.SetPassword("rubbish");
+            IConnectionInfo connectionInfo = new QpidConnectionInfo();
+            connectionInfo.Password = "rubbish";
             connectionInfo.AddBrokerInfo(new AmqBrokerInfo());
             try
             {
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
index 52ef76c559..478d66b9da 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
@@ -22,7 +22,7 @@ using System;
 using System.Threading;
 using log4net;
 using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
 using Qpid.Messaging;
 
 namespace Qpid.Client.Tests.failover
@@ -39,7 +39,7 @@ namespace Qpid.Client.Tests.failover
 
         private IMessageConsumer _consumerOfResponse;
 
-        void DoFailoverTest(ConnectionInfo info)
+        void DoFailoverTest(IConnectionInfo info)
         {
             DoFailoverTest(new AMQConnection(info));
         }
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index b2eecfc423..602f72762a 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
@@ -23,7 +23,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using log4net;
 using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
 using Qpid.Messaging;
 
 namespace Qpid.Client.Tests.failover
@@ -97,7 +97,7 @@ namespace Qpid.Client.Tests.failover
             }
         }
 
-        void DoFailoverTxTest(ConnectionInfo connectionInfo)
+        void DoFailoverTxTest(IConnectionInfo connectionInfo)
         {
             _connection = new AMQConnection(connectionInfo);
             _connection.ConnectionListener = this;
@@ -237,7 +237,7 @@ namespace Qpid.Client.Tests.failover
 
             _log.Info("url = [" + defaultUrl + "]");
 
-            ConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(defaultUrl);
+            IConnectionInfo connectionInfo = QpidConnectionInfo.FromUrl(defaultUrl);
 
             _log.Info("connection url = [" + connectionInfo + "]");
 
diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
index 3e99c6f444..4ab6dd5736 100644
--- a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
+++ b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Net;
 using NUnit.Framework;
-using Qpid.Client.qms;
+using Qpid.Client.Qms;
 
 namespace Qpid.Client.Tests.url
 {
@@ -34,26 +34,26 @@ namespace Qpid.Client.Tests.url
             //String url = "amqp://ritchiem:bob@/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
             String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672;tcp://fancyserver:3000/',failover='roundrobin'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.AreEqual("roundrobin", connectionurl.GetFailoverMethod());
-            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.AreEqual("roundrobin", connectionurl.FailoverMethod);
+            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.Password.Equals("bob"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 2);
+            Assert.IsTrue(connectionurl.BrokerCount == 2);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
 
             service = connectionurl.GetBrokerInfo(1);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("fancyserver"));
-            Assert.IsTrue(service.getPort() == 3000);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("fancyserver"));
+            Assert.IsTrue(service.Port == 3000);
 
         }
 
@@ -62,20 +62,20 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.Password.Equals("bob"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
         }
 
         [Test]
@@ -83,20 +83,20 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://ritchiem:@default/temp?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals(""));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.Password.Equals(""));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
         }
 
         [Test]
@@ -121,23 +121,23 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/test?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
 
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
         }
 
         [Test]
@@ -145,24 +145,24 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@clientname/temp?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
-            Assert.IsTrue(connectionurl.GetClientName().Equals("clientname"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
+            Assert.IsTrue(connectionurl.ClientName.Equals("clientname"));
 
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Transport.Equals("tcp"));
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
         }
 
         [Test]
@@ -170,22 +170,22 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.Transport.Equals("tcp"));
 
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
             Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
         }
 
@@ -194,22 +194,22 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/temp?brokerlist='localhost:'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.Transport.Equals("tcp"));
 
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
         }
 
         [Test]
@@ -217,21 +217,21 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim',timeout='200',immediatedelivery='true'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.Transport.Equals("tcp"));
 
-            Assert.IsTrue(service.getHost().Equals("localhost"));
-            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(service.Host.Equals("localhost"));
+            Assert.IsTrue(service.Port == 5672);
 
             Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
             Assert.IsTrue(connectionurl.GetOption("timeout").Equals("200"));
@@ -243,20 +243,20 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/messages?brokerlist='vm://default:2'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
-            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/messages"));
+            Assert.IsTrue(connectionurl.FailoverMethod == null);
+            Assert.IsTrue(connectionurl.Username.Equals("guest"));
+            Assert.IsTrue(connectionurl.Password.Equals("guest"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/messages"));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("vm"));
-            Assert.AreEqual("localhost", service.getHost());
-            Assert.AreEqual(2, service.getPort());
+            Assert.IsTrue(service.Transport.Equals("vm"));
+            Assert.AreEqual("localhost", service.Host);
+            Assert.AreEqual(2, service.Port);
         }
 
         [Test]
@@ -264,25 +264,25 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://ritchiem:bob@default/temp?brokerlist='vm://default:2;vm://default:3',failover='roundrobin'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetFailoverMethod().Equals("roundrobin"));
-            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.FailoverMethod.Equals("roundrobin"));
+            Assert.IsTrue(connectionurl.Username.Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.Password.Equals("bob"));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/temp"));
 
-            Assert.AreEqual(2, connectionurl.GetBrokerCount());
+            Assert.AreEqual(2, connectionurl.BrokerCount);
 
-            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+            IBrokerInfo service = connectionurl.GetBrokerInfo(0);
 
-            Assert.IsTrue(service.getTransport().Equals("vm"));
-            Assert.AreEqual("localhost", service.getHost());
-            Assert.IsTrue(service.getPort() == 2);
+            Assert.IsTrue(service.Transport.Equals("vm"));
+            Assert.AreEqual("localhost", service.Host);
+            Assert.IsTrue(service.Port == 2);
 
             service = connectionurl.GetBrokerInfo(1);
-            Assert.IsTrue(service.getTransport().Equals("vm"));
-            Assert.AreEqual("localhost", service.getHost());
-            Assert.IsTrue(service.getPort() == 3);
+            Assert.IsTrue(service.Transport.Equals("vm"));
+            Assert.AreEqual("localhost", service.Host);
+            Assert.IsTrue(service.Port == 3);
         }
 
         [Test]
@@ -306,14 +306,14 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://user:@default/test?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
 
-            Assert.IsTrue(connectionurl.GetUsername().Equals("user"));
-            Assert.IsTrue(connectionurl.GetPassword().Equals(""));
-            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
-            Assert.IsTrue(connectionurl.GetClientName().StartsWith(Dns.GetHostName()));
+            Assert.IsTrue(connectionurl.Username.Equals("user"));
+            Assert.IsTrue(connectionurl.Password.Equals(""));
+            Assert.IsTrue(connectionurl.VirtualHost.Equals("/test"));
+            Assert.IsTrue(connectionurl.ClientName.StartsWith(Dns.GetHostName()));
 
-            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+            Assert.IsTrue(connectionurl.BrokerCount == 1);
         }
 
         [Test]
@@ -372,8 +372,8 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/t.-_+!=:?brokerlist='tcp://localhost:5672'";
 
-            ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
-            Assert.IsTrue(connection.GetVirtualHost().Equals("/t.-_+!=:"));
+            IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+            Assert.IsTrue(connection.VirtualHost.Equals("/t.-_+!=:"));
         }
 
         [Test]
@@ -381,10 +381,10 @@ namespace Qpid.Client.Tests.url
         {
             String url = "amqp://guest:guest@default/test=:?brokerlist='tcp://localhost'";
 
-            ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+            IConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
 
-            BrokerInfo broker = connection.GetBrokerInfo(0);
-            Assert.IsTrue(broker.getPort() == BrokerInfoConstants.DEFAULT_PORT);
+            IBrokerInfo broker = connection.GetBrokerInfo(0);
+            Assert.IsTrue(broker.Port == BrokerInfoConstants.DEFAULT_PORT);
 
         }