Merged revisions 653420-654109 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.x

........
  r653447 | aidan | 2008-05-05 13:26:29 +0100 (Mon, 05 May 2008) | 1 line
  
  Check  if consumer is closed and dont reclose it 
........
  r653451 | aidan | 2008-05-05 13:29:15 +0100 (Mon, 05 May 2008) | 1 line
  
  QPID-1022 Use synchronous writes to fix race conditions
........
  r653452 | aidan | 2008-05-05 13:30:45 +0100 (Mon, 05 May 2008) | 1 line
  
  QPID-1023 increase some timeouts
........
  r653760 | aidan | 2008-05-06 13:40:34 +0100 (Tue, 06 May 2008) | 3 lines
  
  QPID-1029: Generate temporary queue names using GUIDs to ensure uniqueness.
........
  r654097 | aidan | 2008-05-07 14:25:38 +0100 (Wed, 07 May 2008) | 2 lines
  
  QPID-952, QPID-951, QPID-1032 Fix failover, ensure that it is properly detected, that frames are replayed approrpiately and that failover does not timeout.
........
  r654104 | aidan | 2008-05-07 14:46:51 +0100 (Wed, 07 May 2008) | 1 line
  
  QPID-952 should have been part of previous commit
........
  r654109 | aidan | 2008-05-07 14:56:09 +0100 (Wed, 07 May 2008) | 2 lines
  
  QPID-1036 increase timeouts to more reasonable levels, ensure that durable queues are deleted when no longer needed
........


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

1 files changed, 14 insertions, 3 deletions

diff --git a/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs b/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
index f6d511034f..d4b61a2788 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'";

@@ -55,6 +55,9 @@ namespace Apache.Qpid.Integration.Tests.testcases
         /// <summary> Holds an array of channels for building mutiple test end-points. </summary>

         protected IChannel[] testChannel = new IChannel[10];

 

+         /// <summary> Holds an array of queues for building mutiple test end-points. </summary>

+        protected String[] testQueue = new String[10];

+        

         /// <summary> Holds an array of producers for building mutiple test end-points. </summary>

         protected IMessagePublisher[] testProducer = new IMessagePublisher[10];

 

@@ -65,7 +68,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 +77,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>

@@ -144,6 +147,10 @@ namespace Apache.Qpid.Integration.Tests.testcases
 

                     if (declareBind)

                     {

+                    	if (durable) 

+                    	{

+                    		testQueue[n] = queueName;

+                    	}

                         testChannel[n].DeclareQueue(queueName, durable, true, true);

                         testChannel[n].Bind(queueName, exchangeName, routingKey);

                     }

@@ -167,6 +174,10 @@ namespace Apache.Qpid.Integration.Tests.testcases
 

             if (testConsumer[n] != null)

             {

+            	if (testQueue[n] != null)

+            	{

+            		testChannel[n].DeleteQueue(testQueue[n], false, false, true);

+            	}

                 testConsumer[n].Close();

                 testConsumer[n].Dispose();

                 testConsumer[n] = null;