activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r713433 - /activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/
Date Wed, 12 Nov 2008 17:45:19 GMT
Author: jgomes
Date: Wed Nov 12 09:45:18 2008
New Revision: 713433

URL: http://svn.apache.org/viewvc?rev=713433&view=rev
Log:
Refactored unit tests to use RowTest attributes for easier maintenance.

Modified:
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BadConsumeTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs Wed Nov
12 09:45:18 2008
@@ -18,11 +18,12 @@
 using System.Threading;
 using Apache.NMS.Util;
 using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class AsyncConsumeTest : NMSTestSupport
+	public class AsyncConsumeTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "AsyncConsumeDestination";
 		protected static string TEST_CLIENT_ID = "AsyncConsumeClientId";
@@ -46,19 +47,10 @@
 			base.TearDown();
 		}
 
-		[Test]
-		public void TestAsynchronousConsume()
-		{
-			doTestAsynchronousConsume(false);
-		}
-
-		[Test]
-		public void TestAsynchronousConsumePersistent()
-		{
-			doTestAsynchronousConsume(true);
-		}
-
-		protected void doTestAsynchronousConsume(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestAsynchronousConsume(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -85,19 +77,10 @@
 			}
 		}
 
-		[Test]
-		public void TestCreateConsumerAfterSend()
-		{
-			doTestCreateConsumerAfterSend(false);
-		}
-
-		[Test]
-		public void TestCreateConsumerAfterSendPersistent()
-		{
-			doTestCreateConsumerAfterSend(true);
-		}
-
-		protected void doTestCreateConsumerAfterSend(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestCreateConsumerAfterSend(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -126,19 +109,10 @@
 			}
 		}
 
-		[Test]
-		public void TestCreateConsumerBeforeSendAddListenerAfterSend()
-		{
-			doTestCreateConsumerBeforeSendAddListenerAfterSend(false);
-		}
-
-		[Test]
-		public void TestCreateConsumerBeforeSendAddListenerAfterSendPersistent()
-		{
-			doTestCreateConsumerBeforeSendAddListenerAfterSend(true);
-		}
-
-		public void doTestCreateConsumerBeforeSendAddListenerAfterSend(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestCreateConsumerBeforeSendAddListenerAfterSend(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -166,19 +140,10 @@
 			}
 		}
 
-		[Test]
-		public void TestAsynchronousTextMessageConsume()
-		{
-			doTestAsynchronousTextMessageConsume(false);
-		}
-
-		[Test]
-		public void TestAsynchronousTextMessageConsumePersistent()
-		{
-			doTestAsynchronousTextMessageConsume(true);
-		}
-
-		public void doTestAsynchronousTextMessageConsume(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestAsynchronousTextMessageConsume(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -212,19 +177,10 @@
 			}
 		}
 
-		[Test]
-		public void TestTemporaryQueueAsynchronousConsume()
-		{
-			doTestTemporaryQueueAsynchronousConsume(false);
-		}
-
-		[Test]
-		public void TestTemporaryQueueAsynchronousConsumePersistent()
-		{
-			doTestTemporaryQueueAsynchronousConsume(true);
-		}
-
-		protected void doTestTemporaryQueueAsynchronousConsume(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestTemporaryQueueAsynchronousConsume(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BadConsumeTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BadConsumeTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BadConsumeTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BadConsumeTest.cs Wed Nov 12
09:45:18 2008
@@ -20,7 +20,7 @@
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class BadConsumeTest : NMSTestSupport
+	public class BadConsumeTest : NMSTestSupport
 	{
 		protected static string TEST_CLIENT_ID = "BadConsumeTestClientId";
 		protected IConnection connection;

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs Wed Nov
12 09:45:18 2008
@@ -17,29 +17,21 @@
 
 using Apache.NMS.Util;
 using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class BytesMessageTest : NMSTestSupport
+	public class BytesMessageTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "BytesMessageDestination";
 		protected static string TEST_CLIENT_ID = "BytesMessageClientId";
 		protected byte[] msgContent = {1, 2, 3, 4, 5, 6, 7, 8};
-		
-		[Test]
-		public void SendReceiveBytesMessage()
-		{
-			doSendReceiveBytesMessage(false);
-		}
-
-		[Test]
-		public void SendReceiveBytesMessagePersistent()
-		{
-			doSendReceiveBytesMessage(true);
-		}
 
-		protected void doSendReceiveBytesMessage(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveBytesMessage(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs Wed Nov 12
09:45:18 2008
@@ -20,7 +20,7 @@
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class ConnectionTest : NMSTestSupport
+	public class ConnectionTest : NMSTestSupport
 	{
 		/// <summary>
 		/// Verify that it is possible to create multiple connections to the broker.

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs Wed Nov 12 09:45:18
2008
@@ -14,33 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 using System;
 using System.Threading;
-using NUnit.Framework;
 using Apache.NMS.Util;
+using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class ConsumerTest : NMSTestSupport
+	public class ConsumerTest : NMSTestSupport
 	{
 		protected static string TEST_CLIENT_ID = "ConsumerTestClientId";
 		protected static string TOPIC = "TestTopicConsumerTest";
 		protected static string CONSUMER_ID = "ConsumerTestConsumerId";
 
-		[Test]
-		public void TestDurableConsumerSelectorChange()
-		{
-			doTestDurableConsumerSelectorChange(false);
-		}
-
-		[Test]
-		public void TestDurableConsumerSelectorChangePersistent()
-		{
-			doTestDurableConsumerSelectorChange(true);
-		}
-
-		public void doTestDurableConsumerSelectorChange(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void TestDurableConsumerSelectorChange(bool persistent)
 		{
 			try
 			{

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs Wed Nov 12 09:45:18
2008
@@ -21,7 +21,7 @@
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class DurableTest : NMSTestSupport
+	public class DurableTest : NMSTestSupport
 	{
 		protected static string TOPIC = "TestTopicDurableConsumer";
 		protected static string SEND_CLIENT_ID = "SendDurableTestClientId";

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs Wed Nov 12
09:45:18 2008
@@ -16,46 +16,38 @@
  */
 
 using System;
-using NUnit.Framework;
-using Apache.NMS.Util;
 using System.Collections;
+using Apache.NMS.Util;
+using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	abstract public class MapMessageTest : NMSTestSupport
+	public class MapMessageTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "MessagePropsDestination";
 		protected static string TEST_CLIENT_ID = "MessagePropsClientId";
 
-		protected bool		a = true;
-		protected byte		b = 123;
-		protected char		c = 'c';
-		protected short		d = 0x1234;
-		protected int		e = 0x12345678;
-		protected long		f = 0x1234567812345678;
-		protected string	g = "Hello World!";
-		protected bool		h = false;
-		protected byte		i = 0xFF;
-		protected short		j = -0x1234;
-		protected int		k = -0x12345678;
-		protected long		l = -0x1234567812345678;
-		protected float		m = 2.1F;
-		protected double	n = 2.3;
-
-		[Test]
-		public void SendReceiveMapMessage()
-		{
-			doSendReceiveMapMessage(false);
-		}
-
-		[Test]
-		public void SendReceiveMapMessagePersistent()
-		{
-			doSendReceiveMapMessage(true);
-		}
-
-		protected void doSendReceiveMapMessage(bool persistent)
+		protected bool a = true;
+		protected byte b = 123;
+		protected char c = 'c';
+		protected short d = 0x1234;
+		protected int e = 0x12345678;
+		protected long f = 0x1234567812345678;
+		protected string g = "Hello World!";
+		protected bool h = false;
+		protected byte i = 0xFF;
+		protected short j = -0x1234;
+		protected int k = -0x12345678;
+		protected long l = -0x1234567812345678;
+		protected float m = 2.1F;
+		protected double n = 2.3;
+
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveMapMessage(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -108,38 +100,29 @@
 						Assert.AreEqual(n, message.Body["n"], "generic map entry: n");
 
 						// use type safe APIs
-						Assert.AreEqual(a, message.Body.GetBool("a"),   "map entry: a");
-						Assert.AreEqual(b, message.Body.GetByte("b"),   "map entry: b");
-						Assert.AreEqual(c, message.Body.GetChar("c"),   "map entry: c");
-						Assert.AreEqual(d, message.Body.GetShort("d"),  "map entry: d");
-						Assert.AreEqual(e, message.Body.GetInt("e"),    "map entry: e");
-						Assert.AreEqual(f, message.Body.GetLong("f"),   "map entry: f");
+						Assert.AreEqual(a, message.Body.GetBool("a"), "map entry: a");
+						Assert.AreEqual(b, message.Body.GetByte("b"), "map entry: b");
+						Assert.AreEqual(c, message.Body.GetChar("c"), "map entry: c");
+						Assert.AreEqual(d, message.Body.GetShort("d"), "map entry: d");
+						Assert.AreEqual(e, message.Body.GetInt("e"), "map entry: e");
+						Assert.AreEqual(f, message.Body.GetLong("f"), "map entry: f");
 						Assert.AreEqual(g, message.Body.GetString("g"), "map entry: g");
-						Assert.AreEqual(h, message.Body.GetBool("h"),   "map entry: h");
-						Assert.AreEqual(i, message.Body.GetByte("i"),   "map entry: i");
-						Assert.AreEqual(j, message.Body.GetShort("j"),  "map entry: j");
-						Assert.AreEqual(k, message.Body.GetInt("k"),    "map entry: k");
-						Assert.AreEqual(l, message.Body.GetLong("l"),   "map entry: l");
-						Assert.AreEqual(m, message.Body.GetFloat("m"),  "map entry: m");
+						Assert.AreEqual(h, message.Body.GetBool("h"), "map entry: h");
+						Assert.AreEqual(i, message.Body.GetByte("i"), "map entry: i");
+						Assert.AreEqual(j, message.Body.GetShort("j"), "map entry: j");
+						Assert.AreEqual(k, message.Body.GetInt("k"), "map entry: k");
+						Assert.AreEqual(l, message.Body.GetLong("l"), "map entry: l");
+						Assert.AreEqual(m, message.Body.GetFloat("m"), "map entry: m");
 						Assert.AreEqual(n, message.Body.GetDouble("n"), "map entry: n");
 					}
 				}
 			}
 		}
 
-		[Test]
-		public void SendReceiveNestedMapMessage()
-		{
-			doSendReceiveNestedMapMessage(false);
-		}
-
-		[Test]
-		public void SendReceiveNestedMapMessagePersistent()
-		{
-			doSendReceiveNestedMapMessage(true);
-		}
-
-		protected void doSendReceiveNestedMapMessage(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveNestedMapMessage(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -159,7 +142,7 @@
 
 						IDictionary grandChildMap = new Hashtable();
 						grandChildMap["x"] = "abc";
-						grandChildMap["y"] = new ArrayList(new object[] {"a", "b", "c"});
+						grandChildMap["y"] = new ArrayList(new object[] { "a", "b", "c" });
 
 						IDictionary nestedMap = new Hashtable();
 						nestedMap["a"] = "foo";
@@ -168,7 +151,7 @@
 						nestedMap["d"] = grandChildMap;
 
 						request.Body.SetDictionary("mapField", nestedMap);
-						request.Body.SetList("listField", new ArrayList(new Object[] {"a", "b", "c"}));
+						request.Body.SetList("listField", new ArrayList(new Object[] { "a", "b", "c" }));
 
 						producer.Send(request);
 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs Wed Nov 12 09:45:18
2008
@@ -17,12 +17,13 @@
 
 using System;
 using NUnit.Framework;
+using NUnit.Framework.Extensions;
 using Apache.NMS.Util;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	abstract public class MessageTest : NMSTestSupport
+	public class MessageTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "MessagePropsDestination";
 		protected static string TEST_CLIENT_ID = "MessagePropsClientId";
@@ -42,19 +43,10 @@
 		protected float		m = 2.1F;
 		protected double	n = 2.3;
 
-		[Test]
-		public void SendReceiveMessageProperties()
-		{
-			doSendReceiveMessageProperties(false);
-		}
-
-		[Test]
-		public void SendReceiveMessagePropertiesPersistent()
-		{
-			doSendReceiveMessageProperties(true);
-		}
-
-		protected void doSendReceiveMessageProperties(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveMessageProperties(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs Wed Nov 12
09:45:18 2008
@@ -18,36 +18,28 @@
 using System;
 using Apache.NMS.Util;
 using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	abstract public class NMSPropertyTest : NMSTestSupport
+	public class NMSPropertyTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "NMSPropsDestination";
 		protected static string TEST_CLIENT_ID = "NMSPropsClientId";
 
 		// standard NMS properties
-		protected string	expectedText = "Hey this works!";
-		protected string	correlationID = "FooBar";
-		protected byte		priority = 4;
-		protected String	type = "FooType";
-		protected String	groupID = "BarGroup";
-		protected int		groupSeq = 1;
-
-		[Test]
-		public void SendReceiveNMSProperties()
-		{
-			doSendReceiveNMSProperties(false);
-		}
-
-		[Test]
-		public void SendReceiveNMSPropertiesPersistent()
-		{
-			doSendReceiveNMSProperties(true);
-		}
-
-		protected void doSendReceiveNMSProperties(bool persistent)
+		protected string expectedText = "Hey this works!";
+		protected string correlationID = "FooBar";
+		protected byte priority = 4;
+		protected String type = "FooType";
+		protected String groupID = "BarGroup";
+		protected int groupSeq = 1;
+
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveNMSProperties(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{
@@ -62,7 +54,7 @@
 						producer.Persistent = persistent;
 						producer.RequestTimeout = receiveTimeout;
 						ITextMessage request = session.CreateTextMessage(expectedText);
-						ITemporaryQueue	replyTo = session.CreateTemporaryQueue();
+						ITemporaryQueue replyTo = session.CreateTemporaryQueue();
 
 						// Set the headers
 						request.NMSCorrelationID = correlationID;

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs Wed Nov 12
09:45:18 2008
@@ -27,7 +27,6 @@
 	/// <summary>
 	/// useful base class for test cases
 	/// </summary>
-	[TestFixture]
 	public abstract class NMSTestSupport
 	{
 		private NMSConnectionFactory NMSFactory;

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs Wed Nov 12 09:45:18
2008
@@ -15,31 +15,22 @@
  * limitations under the License.
  */
 
-using System;
 using Apache.NMS.Util;
 using NUnit.Framework;
+using NUnit.Framework.Extensions;
 
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	public abstract class TextMessageTest : NMSTestSupport
+	public class TextMessageTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "TextMessageDestination";
 		protected static string TEST_CLIENT_ID = "TextMessageClientId";
-		
-		[Test]
-		public void SendReceiveTextMessage()
-		{
-			doSendReceiveTextMessage(false);
-		}
-
-		[Test]
-		public void SendReceiveTextMessagePersistent()
-		{
-			doSendReceiveTextMessage(true);
-		}
 
-		protected void doSendReceiveTextMessage(bool persistent)
+		[RowTest]
+		[Row(true)]
+		[Row(false)]
+		public void SendReceiveTextMessage(bool persistent)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
 			{

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs?rev=713433&r1=713432&r2=713433&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs Wed Nov 12
09:45:18 2008
@@ -23,7 +23,7 @@
 namespace Apache.NMS.Test
 {
 	[TestFixture]
-	abstract public class TransactionTest : NMSTestSupport
+	public class TransactionTest : NMSTestSupport
 	{
 		protected static string DESTINATION_NAME = "TransactionTestDestination";
 		protected static string TEST_CLIENT_ID = "TransactionTestClientId";



Mime
View raw message