(Submitted by Rupert Smith) All tests run without hanging forever.

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

5 files changed, 35 insertions, 9 deletions

diff --git a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index f03df903b2..bcfbb3da20 100644
--- a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
@@ -32,6 +32,7 @@ namespace Qpid.Client.Tests.Connection
         public void SimpleConnection()
         {
             IConnectionInfo connectionInfo = new QpidConnectionInfo();
+            connectionInfo.VirtualHost = "test";
             connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5672, false));
             using (IConnection connection = new AMQConnection(connectionInfo))
             {
@@ -43,6 +44,7 @@ namespace Qpid.Client.Tests.Connection
         public void PasswordFailureConnection()
         {
             IConnectionInfo connectionInfo = new QpidConnectionInfo();
+            connectionInfo.VirtualHost = "test";
             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 478d66b9da..24b16e37ec 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
@@ -213,6 +213,12 @@ namespace Qpid.Client.Tests.failover
         }
 
         [Test]
+        public void TestFail()
+        {
+            Assert.Fail("Tests in this class do not pass, but hang forever, so commented out until can be fixed.");
+        }
+
+        /*[Test]
         public void TestWithBasicInfo()
         {
             Console.WriteLine("TestWithBasicInfo");
@@ -231,7 +237,7 @@ namespace Qpid.Client.Tests.failover
             {
                 _logger.Error("Exception caught", e);
             }
-        }
+        }*/
 
 //        [Test]
 //        public void TestWithUrl()
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index 602f72762a..ccb95b0c7d 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
@@ -215,7 +215,13 @@ namespace Qpid.Client.Tests.failover
             _log.Info("failoverComplete() called");
         }
 
-//        [Test]
+        [Test]
+        public void TestFail()
+        {
+            Assert.Fail("Tests in this class do not pass, but hang forever, so commented out until can be fixed.");
+        }
+
+        /*[Test]
         public void TestWithBasicInfo()
         {
             Console.WriteLine("TestWithBasicInfo");
@@ -226,9 +232,9 @@ namespace Qpid.Client.Tests.failover
             connectionInfo.AddBrokerInfo(new AmqBrokerInfo("amqp", "localhost", 5673, false));
 
             DoFailoverTxTest(connectionInfo);
-        }
+        }*/
 
-        [Test]
+        /*[Test]
         public void runTestWithUrl()
         {
             String clientId = "failover" + DateTime.Now.Ticks;
@@ -242,6 +248,6 @@ namespace Qpid.Client.Tests.failover
             _log.Info("connection url = [" + connectionInfo + "]");
 
             DoFailoverTxTest(connectionInfo);
-        }
+        }*/
     }
 }
diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
index a52b4e2c50..515ae41e1c 100644
--- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
+++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
@@ -75,12 +75,18 @@ namespace Qpid.Client.Tests
         }
 
         [Test]
+        public void TestFail()
+        {
+            Assert.Fail("Tests in this class do not run on autopilot, but hang forever, so commented out until can be fixed.");
+        }
+
+        /*[Test]
         public void Test()
         {
             _connection.Start();
             _logger.Info("Waiting...");
             _event.WaitOne();
-        }
+        }*/
 
         public void OnMessage(IMessage message)
         {
diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
index e437b670bf..68eee90b64 100644
--- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
+++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
@@ -64,7 +64,7 @@ namespace Qpid.Client.Tests
             }
         }
         
-        [Test]
+        /*[Test]
         public void SendMessages()
         {
             InitialiseProducer();
@@ -135,6 +135,12 @@ namespace Qpid.Client.Tests
             _log.Info(String.Format("Waiting {0} seconds to receive last message...", waitSeconds));
             Assert.IsTrue(_finishedEvent.WaitOne(waitMilliseconds, false), 
                           String.Format("Expected to finish in {0} seconds", waitSeconds));
+        }*/
+
+        [Test]
+        public void TestFail()
+        {
+            Assert.Fail("Tests in this class do not run on autopilot, but hang forever, so commented out until can be fixed.");
         }
 
         public void OnMessage(IMessage m)
@@ -180,12 +186,12 @@ namespace Qpid.Client.Tests
             }
         }
         
-        public static void Main(String[] args)
+        /*public static void Main(String[] args)
         {
             ServiceRequestingClient c = new ServiceRequestingClient();
             c.Init();
             c.SendMessages();
-        }
+        }*/
     }
     
     class Avergager