QPID-1023 increase some timeouts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x@653452 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 79 insertions, 42 deletions

diff --git a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs b/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
index f6d511034f..790f92dcde 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
+++ b/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
@@ -41,7 +41,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
         private const string MESSAGE_DATA_BYTES = "-- Test Message -- Test Message -- Test Message -- Test Message -- Test Message ";

 

         /// <summary> The default timeout in milliseconds to use on receives. </summary>

-        private const long RECEIVE_WAIT = 500;

+        private const long RECEIVE_WAIT = 2000;

 

         /// <summary> The default AMQ connection URL to use for tests. </summary>

         public const string connectionUri = "amqp://guest:guest@test/test?brokerlist='tcp://localhost:5672'";

@@ -65,7 +65,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
         private static int uniqueId = 0;

 

         /// <summary> Used to hold unique ids per test. </summary>

-        protected int testId;

+        protected Guid testId;

 

         /// <summary> Creates the test connection and channel. </summary>

         [SetUp]

@@ -74,7 +74,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
             log.Debug("public virtual void Init(): called");

 

             // Set up a unique id for this test.

-            testId = uniqueId++;

+            testId = System.Guid.NewGuid();

         }

 

         /// <summary>

diff --git a/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs b/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
index aab279285e..1951a8a171 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
+++ b/dotnet/Qpid.Integration.Tests/testcases/CommitRollbackTest.cs
@@ -94,11 +94,11 @@ namespace Apache.Qpid.Integration.Tests.testcases
         public void TestCommittedSendReceived() 

         {

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("B"));

             testChannel[0].Commit();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "B", testConsumer[1]);

             testChannel[1].Commit();

         }

 

@@ -107,11 +107,11 @@ namespace Apache.Qpid.Integration.Tests.testcases
         public void TestRolledBackSendNotReceived()

         {

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("B"));

             testChannel[0].Rollback();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(0, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(0, "B", testConsumer[1]);

             testChannel[1].Commit();

         }

 

@@ -124,17 +124,17 @@ namespace Apache.Qpid.Integration.Tests.testcases
                           true, false, null);

 

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("C"));

             testChannel[0].Commit();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "C", testConsumer[1]);

 

             // Close end-point 1 without committing the message, then re-open to consume again.

             CloseEndPoint(1);

 

             // Check that the message was released from the rolled back end-point an can be received on the alternative one instead.

-            ConsumeNMessagesOnly(1, "A", testConsumer[2]);

+            ConsumeNMessagesOnly(1, "C", testConsumer[2]);

 

             CloseEndPoint(2);

         }

@@ -144,38 +144,33 @@ namespace Apache.Qpid.Integration.Tests.testcases
         public void TestCommittedReceiveNotRereceived() 

         {

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("D"));

             testChannel[0].Commit();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "D", testConsumer[1]);

             testChannel[1].Commit();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(0, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(0, "D", testConsumer[1]);

         }

 

         /// <summary> Check that a rolled back receive can be re-received. </summary>

         [Test]

         public void TestRolledBackReceiveCanBeRereceived() 

         {

-            // Create a third end-point as an alternative delivery route for the message.

-            SetUpEndPoint(2, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.DIRECT, 

-                          true, false, null);

-

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("E"));

             testChannel[0].Commit();

             

             // Try to receive messages.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "E", testConsumer[1]);

 

             testChannel[1].Rollback();

 

             // Try to receive messages.

-            ConsumeNMessagesOnly(1, "A", testConsumer[2]);

-

-            CloseEndPoint(2);

+            ConsumeNMessagesOnly(1, "E", testConsumer[1]);

+            

         }

     }

-}
\ No newline at end of file
+}

diff --git a/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs b/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
index ceda19af3e..ac975100b1 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
+++ b/dotnet/Qpid.Integration.Tests/testcases/DurableSubscriptionTest.cs
@@ -99,7 +99,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
                           true, "TestSubscription" + testId);

 

             ConsumeNMessagesOnly(1, "B", testConsumer[2]);

-

+			

             // Clean up any open consumers at the end of the test.

             CloseEndPoint(2);

             CloseEndPoint(1);

@@ -113,23 +113,23 @@ namespace Apache.Qpid.Integration.Tests.testcases
             SetUpEndPoint(0, true, false, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC,

                           true, false, null);

             SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC, 

-                          true, false, null);

+                          true, true, "foo"+testId);

 

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("C"));

             testChannel[0].Commit();

 

             // Try to receive messages, but don't commit them.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "C", testConsumer[1]);

 

             // Close end-point 1 without committing the message, then re-open the subscription to consume again.

             CloseEndPoint(1);

-            SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.DIRECT, 

-                          true, false, null);

+            SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC, 

+                          true, true, "foo"+testId);

 

             // Check that the message was released from the rolled back end-point an can be received on the alternative one instead.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

-

+            ConsumeNMessagesOnly(1, "C", testConsumer[1]);

+			testChannel[1].Commit();

             CloseEndPoint(1);

             CloseEndPoint(0);

         }

@@ -141,24 +141,24 @@ namespace Apache.Qpid.Integration.Tests.testcases
             SetUpEndPoint(0, true, false, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC, 

                           true, false, null);

             SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC, 

-                          true, false, null);

+                          true, true, "foo"+testId);

 

             // Send messages.

-            testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

+            testProducer[0].Send(testChannel[0].CreateTextMessage("D"));

             testChannel[0].Commit();

             

             // Try to receive messages, but roll them back.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

+            ConsumeNMessagesOnly(1, "D", testConsumer[1]);

             testChannel[1].Rollback();

 

             // Close end-point 1 without committing the message, then re-open the subscription to consume again.

             CloseEndPoint(1);

-            SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.DIRECT, 

-                          true, false, null);

+            SetUpEndPoint(1, false, true, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, true, ExchangeNameDefaults.TOPIC, 

+                          true, true, "foo"+testId);

 

             // Check that the message was released from the rolled back end-point an can be received on the alternative one instead.

-            ConsumeNMessagesOnly(1, "A", testConsumer[1]);

-

+            ConsumeNMessagesOnly(1, "D", testConsumer[1]);

+			testChannel[1].Commit();

             CloseEndPoint(1);

             CloseEndPoint(0);

         }

diff --git a/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs b/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
index 7a4bf29cf6..876e7c7bf7 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
+++ b/dotnet/Qpid.Integration.Tests/testcases/ProducerMultiConsumerTest.cs
@@ -117,7 +117,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
                 testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

             }

 

-            _finishedEvent.WaitOne(new TimeSpan(0, 0, 0, 10), false);

+            _finishedEvent.WaitOne(new TimeSpan(0, 0, 0, 30), false);

 

             // Check that all messages really were received.

             Assert.IsTrue(allReceived, "All messages were not received, only got " + _messageReceivedCount + " but wanted " + expectedMessageCount);

@@ -139,14 +139,14 @@ namespace Apache.Qpid.Integration.Tests.testcases
             SetUpEndPoint(0, true, false, TEST_ROUTING_KEY + testId, AcknowledgeMode.AutoAcknowledge, false, ExchangeNameDefaults.DIRECT,

                           true, false, null);

 

-            expectedMessageCount = MESSAGE_COUNT;

+            expectedMessageCount = (MESSAGE_COUNT * CONSUMER_COUNT);

 

             for (int i = 0; i < MESSAGE_COUNT; i++)

             {

                 testProducer[0].Send(testChannel[0].CreateTextMessage("A"));

             }

 

-            _finishedEvent.WaitOne(new TimeSpan(0, 0, 0, 10), false);

+            _finishedEvent.WaitOne(new TimeSpan(0, 0, 0, 30), false);

 

             // Check that all messages really were received.

             Assert.IsTrue(allReceived, "All messages were not received, only got: " + _messageReceivedCount + " but wanted " + expectedMessageCount);

diff --git a/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj b/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
new file mode 100644
index 0000000000..8b27526da4
--- /dev/null
+++ b/dotnet/Qpid.Integration.Tests/testcases/Qpid.Integration.Tests.csproj
@@ -0,0 +1,42 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectGuid>{EFEB9E41-B66E-4674-85F7-18FAD056AD67}</ProjectGuid>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <OutputType>Exe</OutputType>

+    <RootNamespace>Qpid.Integration.Tests</RootNamespace>

+    <AssemblyName>Qpid.Integration.Tests</AssemblyName>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

+    <OutputPath>bin\Debug\</OutputPath>

+    <DebugSymbols>True</DebugSymbols>

+    <DebugType>Full</DebugType>

+    <Optimize>False</Optimize>

+    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

+    <OutputPath>bin\Release\</OutputPath>

+    <DebugSymbols>False</DebugSymbols>

+    <DebugType>None</DebugType>

+    <Optimize>True</Optimize>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <DefineConstants>TRACE</DefineConstants>

+  </PropertyGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="BaseMessagingTestFixture.cs" />

+    <Compile Include="ChannelQueueTest.cs" />

+    <Compile Include="CommitRollbackTest.cs" />

+    <Compile Include="ConnectionTest.cs" />

+    <Compile Include="DurableSubscriptionTest.cs" />

+    <Compile Include="HeadersExchangeTest.cs" />

+    <Compile Include="MandatoryMessageTest.cs" />

+    <Compile Include="ProducerMultiConsumerTest.cs" />

+    <Compile Include="SslConnectionTest.cs" />

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs b/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
index 950acbed9c..1c104d1451 100644
--- a/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
+++ b/dotnet/Qpid.Integration.Tests/testcases/SslConnectionTest.cs
@@ -39,7 +39,7 @@ namespace Apache.Qpid.Integration.Tests.testcases
         /// Make a test TLS connection to the broker

         /// without using client-certificates

         /// </summary>

-        [Test]

+        //[Test]

         public void DoSslConnection()

         {

             // because for tests we don't usually trust the server certificate