Test fixes to catch up with the latest changes.
diff --git a/src/test/csharp/DtcBasicTransactionsTest.cs b/src/test/csharp/DtcBasicTransactionsTest.cs
index 88ebf5f..cdb917e 100644
--- a/src/test/csharp/DtcBasicTransactionsTest.cs
+++ b/src/test/csharp/DtcBasicTransactionsTest.cs
@@ -26,8 +26,6 @@
[Category("Manual")]
class DtcBasicTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
diff --git a/src/test/csharp/DtcConsumerTransactionsTest.cs b/src/test/csharp/DtcConsumerTransactionsTest.cs
index a0a34a4..706efa8 100644
--- a/src/test/csharp/DtcConsumerTransactionsTest.cs
+++ b/src/test/csharp/DtcConsumerTransactionsTest.cs
@@ -31,8 +31,6 @@
[Category("Manual")]
class DtcConsumerTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
diff --git a/src/test/csharp/DtcProducerTransactionsTest.cs b/src/test/csharp/DtcProducerTransactionsTest.cs
index 19f9661..494586b 100644
--- a/src/test/csharp/DtcProducerTransactionsTest.cs
+++ b/src/test/csharp/DtcProducerTransactionsTest.cs
@@ -29,8 +29,6 @@
[Category("Manual")]
class DtcProducerTransactionsTest : DtcTransactionsTestSupport
{
- private NetTxConnectionFactory factory = null;
-
[SetUp]
public override void SetUp()
{
diff --git a/src/test/csharp/DtcTransactionsTestSupport.cs b/src/test/csharp/DtcTransactionsTestSupport.cs
index cda42f6..ddfb394 100644
--- a/src/test/csharp/DtcTransactionsTestSupport.cs
+++ b/src/test/csharp/DtcTransactionsTestSupport.cs
@@ -48,6 +48,7 @@
{
protected const int MSG_COUNT = 5;
protected string nonExistantPath;
+ protected NetTxConnectionFactory factory;
private ITrace oldTracer;
@@ -308,25 +309,23 @@
}
}
- 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 @@
}
}
- protected static void VerifyNoMessagesInQueueNoRecovery()
+ protected void VerifyNoMessagesInQueueNoRecovery()
{
VerifyBrokerQueueCountNoRecovery(0);
}
- protected static void VerifyNoMessagesInQueue()
+ protected void VerifyNoMessagesInQueue()
{
VerifyBrokerQueueCount(0);
}
@@ -397,10 +396,8 @@
}
}
- 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
