Author: tabish
Date: Mon May 20 20:50:21 2013
New Revision: 1484591
URL: http://svn.apache.org/r1484591
Log:
Test fixes to catch up with the latest changes.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcBasicTransactionsTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcConsumerTransactionsTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcProducerTransactionsTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcTransactionsTestSupport.cs
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcBasicTransactionsTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcBasicTransactionsTest.cs?rev=1484591&r1=1484590&r2=1484591&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcBasicTransactionsTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcBasicTransactionsTest.cs
Mon May 20 20:50:21 2013
@@ -26,8 +26,6 @@ namespace Apache.NMS.ActiveMQ.Test
[Category("Manual")]
class DtcBasicTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcConsumerTransactionsTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcConsumerTransactionsTest.cs?rev=1484591&r1=1484590&r2=1484591&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcConsumerTransactionsTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcConsumerTransactionsTest.cs
Mon May 20 20:50:21 2013
@@ -31,8 +31,6 @@ namespace Apache.NMS.ActiveMQ.Test
[Category("Manual")]
class DtcConsumerTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcProducerTransactionsTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcProducerTransactionsTest.cs?rev=1484591&r1=1484590&r2=1484591&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcProducerTransactionsTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcProducerTransactionsTest.cs
Mon May 20 20:50:21 2013
@@ -29,8 +29,6 @@ namespace Apache.NMS.ActiveMQ.Test
[Category("Manual")]
class DtcProducerTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcTransactionsTestSupport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcTransactionsTestSupport.cs?rev=1484591&r1=1484590&r2=1484591&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcTransactionsTestSupport.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/DtcTransactionsTestSupport.cs
Mon May 20 20:50:21 2013
@@ -48,6 +48,7 @@ namespace Apache.NMS.ActiveMQ.Test
{
protected const int MSG_COUNT = 5;
protected string nonExistantPath;
+ protected NetTxConnectionFactory factory;
private ITrace oldTracer;
@@ -308,25 +309,23 @@ namespace Apache.NMS.ActiveMQ.Test
}
}
- protected static void VerifyBrokerQueueCount()
+ protected void VerifyBrokerQueueCount()
{
VerifyBrokerQueueCount(MSG_COUNT, connectionURI);
}
- protected static void VerifyBrokerQueueCount(int expectedCount)
+ protected void VerifyBrokerQueueCount(int expectedCount)
{
VerifyBrokerQueueCount(expectedCount, connectionURI);
}
- protected static void VerifyBrokerQueueCount(string connectionUri)
+ protected void VerifyBrokerQueueCount(string connectionUri)
{
VerifyBrokerQueueCount(MSG_COUNT, connectionUri);
}
- protected static void VerifyBrokerQueueCount(int expectedCount, string
connectionUri)
- {
- INetTxConnectionFactory factory = new
NetTxConnectionFactory(ReplaceEnvVar(connectionUri));
-
+ protected void VerifyBrokerQueueCount(int expectedCount, string
connectionUri)
+ {
using (INetTxConnection connection =
factory.CreateNetTxConnection())
{
// check messages are present in the queue
@@ -354,12 +353,12 @@ namespace Apache.NMS.ActiveMQ.Test
}
}
- protected static void VerifyNoMessagesInQueueNoRecovery()
+ protected void VerifyNoMessagesInQueueNoRecovery()
{
VerifyBrokerQueueCountNoRecovery(0);
}
- protected static void VerifyNoMessagesInQueue()
+ protected void VerifyNoMessagesInQueue()
{
VerifyBrokerQueueCount(0);
}
@@ -397,10 +396,8 @@ namespace Apache.NMS.ActiveMQ.Test
}
}
- protected static void VerifyBrokerHasMessagesInQueue(string
connectionURI)
+ protected void VerifyBrokerHasMessagesInQueue(string connectionURI)
{
- INetTxConnectionFactory factory = new
NetTxConnectionFactory(ReplaceEnvVar(connectionURI));
-
using (INetTxConnection connection =
factory.CreateNetTxConnection())
{
// check messages are present in the queue
