You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2010/07/16 19:14:15 UTC
svn commit: r964863 [1/3] - in /activemq/activemq-dotnet:
Apache.NMS.ActiveMQ/trunk/ Apache.NMS.ActiveMQ/trunk/src/test/csharp/
Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/
Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/ Apache.NMS.ActiveMQ/...
Author: jgomes
Date: Fri Jul 16 17:14:12 2010
New Revision: 964863
URL: http://svn.apache.org/viewvc?rev=964863&view=rev
Log:
Upgrade NUnit to 2.5.5.
Fixes [AMQNET-263]. (See https://issues.apache.org/activemq/browse/AMQNET-263)
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQQueueTransactionTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQRedeliveryPolicyTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTopicTransactionTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTransactionTestSupport.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ConnectionFactoryTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/IndividualAckTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NMSConnectionFactoryTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/MaxInactivityDurationTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/PrefetchSizeZeroTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/RollbackRedeliveryTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Transport/Mock/MockTransportFactoryTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ZeroPrefetchConsumerTest.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/vs2008-ems-test.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/AsyncConsumeTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/BytesMessageTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/ConnectionTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/ConsumerTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/ExclusiveConsumerTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/IndividualAckTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/MapMessageTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/MessageTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/NMSConnectionFactoryTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/NMSPropertyTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/ProducerTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/Protocol/XmlPrimitiveMapMarshalerTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/StompQueueTransactionTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/StompRedeliveryPolicyTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/StompTopicTransactionTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/StompTransactionTestSupport.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/TempDestinationTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/TextMessageTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/TransactionTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/Util/MessageDispatchChannelTest.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/vs2008-stomp-test.csproj
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.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/MessageSelectorTest.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/StreamMessageTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/URISupportTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Fri Jul 16 17:14:12 2010
@@ -323,6 +323,7 @@
output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
<nowarn>
<warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+ <warning number="3016" /> <!-- do not report warnings for array parameters -->
</nowarn>
<sources failonempty="true">
<include name="src/test/csharp/**.cs" />
@@ -334,6 +335,7 @@
output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
<nowarn>
<warning number="1591" /> <!-- do not report warnings for missing XML comments -->
+ <warning number="3016" /> <!-- do not report warnings for array parameters -->
</nowarn>
<sources failonempty="true">
<include name="src/test/csharp/**.cs" />
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Fri Jul 16 17:14:12 2010
@@ -29,7 +29,6 @@
<!-- Lib organized as: module/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
@@ -62,8 +61,8 @@
<!-- Property grouping for 'vendor.nunit.org' -->
<property name="vendor.nunit.org.name" value="NUnit" />
<property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ <property name="vendor.nunit.org.version" value="2.5.5" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll" />
</target>
<target name="dependency-init" description="Initializes build dependencies">
@@ -82,7 +81,6 @@
<include name="${Apache.NMS.Test.dll}" />
<include name="${build.bin.dir}/${project.name}.dll" />
<include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
</assemblyfileset>
<fileset id="content.filenames">
@@ -94,7 +92,6 @@
<include name="${Apache.NMS.Test.dll}" />
<include name="${Apache.NMS.Test.pdb}" />
<include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
<include name="${NUnit.Projectfile}" />
</fileset>
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQQueueTransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQQueueTransactionTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQQueueTransactionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQQueueTransactionTest.cs Fri Jul 16 17:14:12 2010
@@ -18,7 +18,7 @@
using System;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class AMQQueueTransactionTest : AMQTransactionTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQRedeliveryPolicyTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQRedeliveryPolicyTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQRedeliveryPolicyTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQRedeliveryPolicyTest.cs Fri Jul 16 17:14:12 2010
@@ -16,11 +16,11 @@
*/
using System;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using Apache.NMS.ActiveMQ.Commands;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class AMQRedeliveryPolicyTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTopicTransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTopicTransactionTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTopicTransactionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTopicTransactionTest.cs Fri Jul 16 17:14:12 2010
@@ -18,7 +18,7 @@
using System;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class AMQTopicTransactionTest : AMQTransactionTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTransactionTestSupport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTransactionTestSupport.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTransactionTestSupport.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/AMQTransactionTestSupport.cs Fri Jul 16 17:14:12 2010
@@ -18,10 +18,10 @@
using System;
using System.Collections.Generic;
using System.Threading;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
public abstract class AMQTransactionTestSupport : NMSTestSupport
{
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Commands/MessageCompressionTest.cs Fri Jul 16 17:14:12 2010
@@ -17,11 +17,11 @@
using System;
using System.IO;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using Apache.NMS.ActiveMQ.Commands;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class MessageCompressionTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ConnectionFactoryTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ConnectionFactoryTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ConnectionFactoryTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ConnectionFactoryTest.cs Fri Jul 16 17:14:12 2010
@@ -21,7 +21,6 @@ using Apache.NMS.Test;
using Apache.NMS.ActiveMQ;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
namespace Apache.NMS.ActiveMQ.Test
{
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/IndividualAckTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/IndividualAckTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/IndividualAckTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/IndividualAckTest.cs Fri Jul 16 17:14:12 2010
@@ -16,9 +16,10 @@
*/
using System;
+using Apache.NMS.Test;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class IndividualAckTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/MessageListenerRedeliveryTest.cs Fri Jul 16 17:14:12 2010
@@ -16,11 +16,11 @@
*/
using System.Threading;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using Apache.NMS.Policies;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class MessageListenerRedeliveryTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NMSConnectionFactoryTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NMSConnectionFactoryTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NMSConnectionFactoryTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NMSConnectionFactoryTest.cs Fri Jul 16 17:14:12 2010
@@ -22,7 +22,6 @@ using Apache.NMS.ActiveMQ.Transport;
using Apache.NMS.ActiveMQ.Transport.Mock;
using Apache.NMS.Test;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
namespace Apache.NMS.ActiveMQ.Test
{
@@ -33,47 +32,47 @@ namespace Apache.NMS.ActiveMQ.Test
private static String password = "guest";
private ConnectionInfo info = null;
- [RowTest]
- [Row("tcp://${activemqhost}:61616")]
- [Row("activemq:tcp://${activemqhost}:61616")]
- [Row("activemq:tcp://${activemqhost}:61616/0.0.0.0:0")]
- [Row("activemq:tcp://${activemqhost}:61616?connection.asyncclose=false")]
- [Row("activemq:failover:tcp://${activemqhost}:61616")]
- [Row("activemq:failover:(tcp://${activemqhost}:61616)")]
- [Row("activemq:failover:(tcp://${activemqhost}:61616,tcp://${activemqhost}:61616)")]
- [Row("activemq:failover://(tcp://${activemqhost}:61616)?initialReconnectDelay=100")]
- [Row("activemq:failover:(tcp://${activemqhost}:61616)?connection.asyncSend=true")]
- [Row("activemq:failover:(tcp://${activemqhost}:61616)?timeout=100&connection.asyncSend=true")]
+ [Test]
+ [TestCase("tcp://${activemqhost}:61616")]
+ [TestCase("activemq:tcp://${activemqhost}:61616")]
+ [TestCase("activemq:tcp://${activemqhost}:61616/0.0.0.0:0")]
+ [TestCase("activemq:tcp://${activemqhost}:61616?connection.asyncclose=false")]
+ [TestCase("activemq:failover:tcp://${activemqhost}:61616")]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616)")]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616,tcp://${activemqhost}:61616)")]
+ [TestCase("activemq:failover://(tcp://${activemqhost}:61616)?initialReconnectDelay=100")]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616)?connection.asyncSend=true")]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616)?timeout=100&connection.asyncSend=true")]
#if false
- [Row("activemq:discovery:multicast://default")]
- [Row("activemq:discovery:(multicast://default)")]
- [Row("activemq:failover:discovery:multicast://default")]
- [Row("activemq:failover:discovery:(multicast://default)")]
- [Row("activemq:failover:(discovery:(multicast://default))")]
+ [TestCase("activemq:discovery:multicast://default")]
+ [TestCase("activemq:discovery:(multicast://default)")]
+ [TestCase("activemq:failover:discovery:multicast://default")]
+ [TestCase("activemq:failover:discovery:(multicast://default)")]
+ [TestCase("activemq:failover:(discovery:(multicast://default))")]
#endif
-
- [Row("activemq:tcp://${activemqhost}:61616/InvalidHost:0", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:tcp://${activemqhost}:61616/0.0.0.0:-1", ExpectedException = typeof(NMSConnectionException))]
- [Row("tcp://InvalidHost:61616", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:tcp://InvalidHost:61616", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:tcp://InvalidHost:61616?connection.asyncclose=false", ExpectedException = typeof(NMSConnectionException))]
-
- [Row("tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:failover:tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:failover:(tcp://${activemqhost}:61616)?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:failover:(tcp://${activemqhost}:61616,tcp://${activemqbackuphost}:61616)?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
-
- [Row("ftp://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
- [Row("http://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
- [Row("discovery://${activemqhost}:6155", ExpectedException = typeof(NMSConnectionException))]
- [Row("sms://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:multicast://${activemqhost}:6155", ExpectedException = typeof(NMSConnectionException))]
- [Row("activemq:(tcp://${activemqhost}:61616)?connection.asyncClose=false", ExpectedException = typeof(NMSConnectionException))]
- [Row("(tcp://${activemqhost}:61616,tcp://${activemqhost}:61616)", ExpectedException = typeof(UriFormatException))]
- [Row("tcp://${activemqhost}:61616,tcp://${activemqhost}:61616", ExpectedException = typeof(UriFormatException))]
+ [TestCase("activemq:tcp://${activemqhost}:61616/InvalidHost:0", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:tcp://${activemqhost}:61616/0.0.0.0:-1", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("tcp://InvalidHost:61616", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:tcp://InvalidHost:61616", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:tcp://InvalidHost:61616?connection.asyncclose=false", ExpectedException = typeof(NMSConnectionException))]
+
+ [TestCase("tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:failover:tcp://${activemqhost}:61616?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616)?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:failover:(tcp://${activemqhost}:61616,tcp://${activemqbackuphost}:61616)?connection.InvalidParameter=true", ExpectedException = typeof(NMSConnectionException))]
+
+ [TestCase("ftp://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("http://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("discovery://${activemqhost}:6155", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("sms://${activemqhost}:61616", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:multicast://${activemqhost}:6155", ExpectedException = typeof(NMSConnectionException))]
+ [TestCase("activemq:(tcp://${activemqhost}:61616)?connection.asyncClose=false", ExpectedException = typeof(NMSConnectionException))]
+
+ [TestCase("(tcp://${activemqhost}:61616,tcp://${activemqhost}:61616)", ExpectedException = typeof(UriFormatException))]
+ [TestCase("tcp://${activemqhost}:61616,tcp://${activemqhost}:61616", ExpectedException = typeof(UriFormatException))]
public void TestURI(string connectionURI)
{
NMSConnectionFactory factory = new NMSConnectionFactory(NMSTestSupport.ReplaceEnvVar(connectionURI));
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/MaxInactivityDurationTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/MaxInactivityDurationTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/MaxInactivityDurationTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/MaxInactivityDurationTest.cs Fri Jul 16 17:14:12 2010
@@ -17,10 +17,11 @@
using System;
using System.Threading;
+using Apache.NMS.Test;
using Apache.NMS.Util;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class MaxInactivityDurationTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/PrefetchSizeZeroTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/PrefetchSizeZeroTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/PrefetchSizeZeroTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/OpenWire/PrefetchSizeZeroTest.cs Fri Jul 16 17:14:12 2010
@@ -16,11 +16,11 @@
*/
using System;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using Apache.NMS.Util;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class PrefetchSizeZeroTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/RollbackRedeliveryTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/RollbackRedeliveryTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/RollbackRedeliveryTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/RollbackRedeliveryTest.cs Fri Jul 16 17:14:12 2010
@@ -18,11 +18,11 @@
using System;
using System.Collections;
using System.Threading;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using Apache.NMS.Policies;
using NUnit.Framework;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class RollbackRedeliveryTest : NMSTestSupport
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Transport/Mock/MockTransportFactoryTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Transport/Mock/MockTransportFactoryTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Transport/Mock/MockTransportFactoryTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Transport/Mock/MockTransportFactoryTest.cs Fri Jul 16 17:14:12 2010
@@ -35,9 +35,7 @@ namespace Apache.NMS.ActiveMQ.Test
ITransport transport = factory.CreateTransport(location);
Assert.IsNotNull(transport);
-
- Assert.IsInstanceOfType(typeof(MockTransport), transport.Narrow(typeof(MockTransport)));
-
+ Assert.IsInstanceOf<MockTransport>(transport.Narrow(typeof(MockTransport)));
MockTransport mock = (MockTransport) transport.Narrow(typeof(MockTransport));
Assert.IsTrue( mock.IsConnected );
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs Fri Jul 16 17:14:12 2010
@@ -16,11 +16,10 @@
*/
using System.Threading;
-using Apache.NMS.ActiveMQ;
+using Apache.NMS.Test;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class VirtualTopicTest : NMSTestSupport
@@ -33,16 +32,13 @@ namespace Apache.NMS.Test
protected const int totalMsgs = 5;
- [RowTest]
- [Row(AcknowledgementMode.AutoAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.AutoAcknowledge, MsgDeliveryMode.Persistent)]
- [Row(AcknowledgementMode.ClientAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.ClientAcknowledge, MsgDeliveryMode.Persistent)]
- [Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.Persistent)]
- [Row(AcknowledgementMode.Transactional, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.Transactional, MsgDeliveryMode.Persistent)]
- public void SendReceiveVirtualTopicMessage(AcknowledgementMode ackMode, MsgDeliveryMode deliveryMode)
+ [Test]
+ public void SendReceiveVirtualTopicMessage(
+ [Values(AcknowledgementMode.AutoAcknowledge, AcknowledgementMode.ClientAcknowledge,
+ AcknowledgementMode.DupsOkAcknowledge, AcknowledgementMode.Transactional)]
+ AcknowledgementMode ackMode,
+ [Values(MsgDeliveryMode.NonPersistent, MsgDeliveryMode.Persistent)]
+ MsgDeliveryMode deliveryMode)
{
using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
{
@@ -109,15 +105,13 @@ namespace Apache.NMS.Test
protected int receivedA;
protected int receivedB;
- [RowTest]
- [Row(AcknowledgementMode.AutoAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.AutoAcknowledge, MsgDeliveryMode.Persistent)]
- [Row(AcknowledgementMode.ClientAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.ClientAcknowledge, MsgDeliveryMode.Persistent)]
- [Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.NonPersistent)]
- [Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.Persistent)]
+ [Test]
// Do not use listeners with transactional processing.
- public void AsyncSendReceiveVirtualTopicMessage(AcknowledgementMode ackMode, MsgDeliveryMode deliveryMode)
+ public void AsyncSendReceiveVirtualTopicMessage(
+ [Values(AcknowledgementMode.AutoAcknowledge, AcknowledgementMode.ClientAcknowledge, AcknowledgementMode.DupsOkAcknowledge)]
+ AcknowledgementMode ackMode,
+ [Values(MsgDeliveryMode.NonPersistent, MsgDeliveryMode.Persistent)]
+ MsgDeliveryMode deliveryMode)
{
receivedA = 0;
receivedB = 0;
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ZeroPrefetchConsumerTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ZeroPrefetchConsumerTest.cs?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ZeroPrefetchConsumerTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/ZeroPrefetchConsumerTest.cs Fri Jul 16 17:14:12 2010
@@ -16,11 +16,11 @@
*/
using System;
+using Apache.NMS.Test;
using Apache.NMS.ActiveMQ.Commands;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
-namespace Apache.NMS.Test
+namespace Apache.NMS.ActiveMQ.Test
{
[TestFixture]
public class ZeroPrefetchConsumerTest : NMSTestSupport
@@ -67,10 +67,10 @@ namespace Apache.NMS.Test
Assert.IsNull(answer, "Should have not received a message!");
}
- [RowTest]
- [Row(AcknowledgementMode.AutoAcknowledge)]
- [Row(AcknowledgementMode.Transactional)]
- public void TestIdleConsumer(AcknowledgementMode ackMode)
+ [Test]
+ public void TestIdleConsumer(
+ [Values(AcknowledgementMode.AutoAcknowledge, AcknowledgementMode.Transactional)]
+ AcknowledgementMode ackMode)
{
ISession session = connection.CreateSession(ackMode);
@@ -105,10 +105,10 @@ namespace Apache.NMS.Test
Assert.IsNull(answer, "Should have not received a message!");
}
- [RowTest]
- [Row(AcknowledgementMode.AutoAcknowledge)]
- [Row(AcknowledgementMode.Transactional)]
- public void TestRecvRecvCommit(AcknowledgementMode ackMode)
+ [Test]
+ public void TestRecvRecvCommit(
+ [Values(AcknowledgementMode.AutoAcknowledge, AcknowledgementMode.Transactional)]
+ AcknowledgementMode ackMode)
{
ISession session = connection.CreateSession(ackMode);
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj?rev=964863&r1=964862&r2=964863&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj Fri Jul 16 17:14:12 2010
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{EB943C69-2C9B-45E7-B95B-FB916E7057ED}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -31,6 +31,7 @@
<OutputPath>build\net-2.0\debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <NoWarn>3016</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,6 +40,7 @@
<DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<DebugType>full</DebugType>
+ <NoWarn>3016</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -53,10 +55,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework.extensions, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>lib\NUnit\net-2.0\nunit.framework.extensions.dll</HintPath>
- </Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>