Author: aidan
Date: Wed May 7 06:56:09 2008
New Revision: 654109
URL: http://svn.apache.org/viewvc?rev=654109&view=rev
Log:
QPID-1036 increase timeouts to more reasonable levels, ensure that durable
queues are deleted when no longer needed
Modified:
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
Modified:
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs?rev=654109&r1=654108&r2=654109&view=diff
==============================================================================
---
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
(original)
+++
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/BaseMessagingTestFixture.cs
Wed May 7 06:56:09 2008
@@ -55,6 +55,9 @@
/// <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];
@@ -144,6 +147,10 @@
if (declareBind)
{
+ if (durable)
+ {
+ testQueue[n] = queueName;
+ }
testChannel[n].DeclareQueue(queueName, durable, true,
true);
testChannel[n].Bind(queueName, exchangeName,
routingKey);
}
@@ -167,6 +174,10 @@
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;
Modified:
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs?rev=654109&r1=654108&r2=654109&view=diff
==============================================================================
---
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
(original)
+++
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/ChannelQueueTest.cs
Wed May 7 06:56:09 2008
@@ -127,7 +127,7 @@
.WithRoutingKey(_routingKey)
.Create();
_logger.Info("Publisher created...");
- SendTestMessage("Message 1");
+ SendTestMessage("DeleteNonEmptyQueue Message 1");
try
{
@@ -165,8 +165,8 @@
.Create();
_logger.Info("Publisher created...");
- SendTestMessage("Message 1");
- SendTestMessage("Message 2");
+ SendTestMessage("DeleteQueueWithResponse Message 1");
+ SendTestMessage("DeleteQueueWithResponse Message 2");
// delete the queue, the server must respond
_channel.DeleteQueue(_queueName, false, false, false);
Modified:
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs?rev=654109&r1=654108&r2=654109&view=diff
==============================================================================
---
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
(original)
+++
incubator/qpid/branches/M2.x/dotnet/Qpid.Integration.Tests/testcases/HeadersExchangeTest.cs
Wed May 7 06:56:09 2008
@@ -50,7 +50,7 @@
private static ILog _logger =
LogManager.GetLogger(typeof(HeadersExchangeTest));
/// <summary> Holds the default test timeout for broker communications
before tests give up. </summary>
- private static readonly int TIMEOUT = 1000;
+ private static readonly int TIMEOUT = 2000;
/// <summary> Holds the name of the headers exchange to create to send
test messages on. </summary>
private string _exchangeName = "ServiceQ1";
