[jboss-cvs] JBoss Messaging SVN: r2053 - in trunk: tests and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 25 10:21:00 EST 2007
Author: timfox
Date: 2007-01-25 10:21:00 -0500 (Thu, 25 Jan 2007)
New Revision: 2053
Modified:
trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
trunk/tests/build.xml
trunk/tests/etc/log4j.xml
trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MessageBodyTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MessagePropertyConversionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
Log:
More test fixes
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -51,8 +51,7 @@
private int bufferSize;
private int maxDeliveries;
private long channelID;
- private boolean usePriorityConsumerQueue;
-
+
// Static ---------------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/build.xml 2007-01-25 15:21:00 UTC (rev 2053)
@@ -350,16 +350,19 @@
<!-- ======================================================================================== -->
<target name="tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
- <antcall target="crash-tests"/>
+ <antcall target="crash-tests"/>
<antcall target="invm-tests"/>
<!--
default remoting configuration (socket)
-->
<antcall target="remote-tests"/>
+
+ <!--
<antcall target="remote-tests">
<param name="test.remoting" value="http"/>
</antcall>
<antcall target="clustering-tests"/>
+ -->
</target>
<target name="http-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
@@ -415,6 +418,7 @@
<exclude name="**/jms/stress/**"/>
<exclude name="**/jms/crash/*Test.class"/>
<exclude name="**/*LeakTest.class"/>
+ <exclude name="**/jms/bridge/**/*Test.class"/>
<exclude name="**/jms/manual/**/*Test.class"/>
<exclude name="**/jms/clustering/*Test.class"/>
<exclude name="**/jms/RemotingConnectionConfigurationTest.class"/>
@@ -465,6 +469,7 @@
<exclude name="**/jms/stress/**"/>
<exclude name="**/jms/crash/*Test.class"/>
<exclude name="**/*LeakTest.class"/>
+ <exclude name="**/jms/bridge/**/*Test.class"/>
<exclude name="**/jms/manual/**/*Test.class"/>
<exclude name="**/jms/clustering/*Test.class"/>
<exclude name="**/jms/RemotingConnectionConfigurationTest.class"/>
Modified: trunk/tests/etc/log4j.xml
===================================================================
--- trunk/tests/etc/log4j.xml 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/etc/log4j.xml 2007-01-25 15:21:00 UTC (rev 2053)
@@ -47,7 +47,7 @@
</category>
<category name="org.jboss.remoting">
- <priority value="DEBUG"/>
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
</category>
<category name="org.jboss">
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -365,18 +365,18 @@
{
ObjectName serverPeerObjectName = ServerManagement.getServerPeerObjectName();
- String queueObjectName = "jboss.messaging.destination:service=Queue,name=Queue";
+ String queueObjectName = "jboss.messaging.destination:service=Queue,name=Queue";
- ServerManagement.setAttribute(new ObjectName(queueObjectName), "RedeliveryDelay", String.valueOf(0));
+ Connection conn = null;
- final long delay = 3000;
-
- ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", String.valueOf(delay));
-
- Connection conn = null;
-
try
{
+ ServerManagement.setAttribute(new ObjectName(queueObjectName), "RedeliveryDelay", String.valueOf(0));
+
+ final long delay = 3000;
+
+ ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", String.valueOf(delay));
+
conn = cf.createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -440,6 +440,9 @@
{
conn.close();
}
+
+ ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", "0");
+
}
}
@@ -449,16 +452,17 @@
String queueObjectName = "jboss.messaging.destination:service=Queue,name=Queue";
- final long delay = 3000;
-
- ServerManagement.setAttribute(new ObjectName(queueObjectName), "RedeliveryDelay", String.valueOf(delay));
-
- ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", String.valueOf(delay * 3));
-
+
Connection conn = null;
try
{
+ final long delay = 3000;
+
+ ServerManagement.setAttribute(new ObjectName(queueObjectName), "RedeliveryDelay", String.valueOf(delay));
+
+ ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", String.valueOf(delay * 3));
+
conn = cf.createConnection();
Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -522,6 +526,9 @@
{
conn.close();
}
+
+ ServerManagement.setAttribute(serverPeerObjectName, "DefaultRedeliveryDelay", "0");
+
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -61,6 +61,11 @@
protected void setUp() throws Exception
{
+ if (!ServerManagement.isRemote())
+ {
+ fail("Test should only be run in a remote configuration");
+ }
+
nodeCount = 3;
useArjuna = true;
@@ -76,11 +81,6 @@
public void testStopStartPauseResume() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
ServerManagement.deployQueue("sourceQueue", 1);
ServerManagement.deployQueue("targetQueue", 2);
@@ -272,11 +272,6 @@
public void testDeploy() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
ServerManagement.deployQueue("sourceQueue", 1);
ServerManagement.deployQueue("targetQueue", 2);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -21,25 +21,17 @@
*/
package org.jboss.test.messaging.jms.bridge;
-import java.util.Hashtable;
-
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
-import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.jboss.jms.server.bridge.Bridge;
-import org.jboss.jms.server.bridge.ConnectionFactoryFactory;
-import org.jboss.jms.server.bridge.JNDIConnectionFactoryFactory;
import org.jboss.logging.Logger;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.tm.TransactionManagerLocator;
@@ -64,6 +56,11 @@
protected void setUp() throws Exception
{
+ if (!ServerManagement.isRemote())
+ {
+ fail("Test should only be run in a remote configuration");
+ }
+
super.setUp();
}
@@ -77,55 +74,31 @@
public void testNoMaxBatchTime_AtMostOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testNoMaxBatchTime_DuplicatesOk_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_DUPLICATES_OK, true);
}
public void testNoMaxBatchTime_OnceAndOnlyOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testNoMaxBatchTime_AtMostOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_AT_MOST_ONCE, false);
}
public void testNoMaxBatchTime_DuplicatesOk_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_DUPLICATES_OK, false);
}
public void testNoMaxBatchTime_OnceAndOnlyOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTime(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -135,55 +108,31 @@
public void testNoMaxBatchTimeSameServer_AtMostOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testNoMaxBatchTimeSameServer_DuplicatesOk_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_DUPLICATES_OK, true);
}
public void testNoMaxBatchTimeSameServer_OnceAndOnlyOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testNoMaxBatchTimeSameServer_AtMostOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_AT_MOST_ONCE, false);
}
public void testNoMaxBatchTimeSameServer_DuplicatesOk_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_DUPLICATES_OK, false);
}
public void testNoMaxBatchTimeSameServer_OnceAndOnlyOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testNoMaxBatchTimeSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -192,55 +141,31 @@
public void testMaxBatchTime_AtMostOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTime(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testMaxBatchTime_DuplicatesOk_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTime(Bridge.QOS_DUPLICATES_OK, true);
}
public void testMaxBatchTime_OnceAndOnlyOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testMaxBatchTime(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testMaxBatchTime_AtMostOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTime(Bridge.QOS_AT_MOST_ONCE, false);
}
public void testMaxBatchTime_DuplicatesOk_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTime(Bridge.QOS_DUPLICATES_OK, false);
}
public void testMaxBatchTime_OnceAndOnlyOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testMaxBatchTime(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -250,55 +175,31 @@
public void testMaxBatchTimeSameServer_AtMostOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTimeSameServer(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testMaxBatchTimeSameServer_DuplicatesOk_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTimeSameServer(Bridge.QOS_DUPLICATES_OK, true);
}
public void testMaxBatchTimeSameServer_OnceAndOnlyOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testMaxBatchTimeSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testMaxBatchTimeSameServer_AtMostOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTimeSameServer(Bridge.QOS_AT_MOST_ONCE, false);
}
public void testMaxBatchTimeSameServer_DuplicatesOk_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
this.testMaxBatchTimeSameServer(Bridge.QOS_DUPLICATES_OK, false);
}
public void testMaxBatchTimeSameServer_OnceAndOnlyOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testMaxBatchTimeSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -306,55 +207,31 @@
public void testStress_AtMostOnce_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_AT_MOST_ONCE, true, 50);
}
public void testStress_DuplicatesOk_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_DUPLICATES_OK, true, 50);
}
public void testStress_OnceAndOnlyOnce_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_ONCE_AND_ONLY_ONCE, true, 50);
}
public void testStress_AtMostOnce_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_AT_MOST_ONCE, false, 50);
}
public void testStress_DuplicatesOk_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_DUPLICATES_OK, false, 50);
}
public void testStress_OnceAndOnlyOnce_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_ONCE_AND_ONLY_ONCE, false, 50);
}
@@ -362,55 +239,31 @@
public void testStress_AtMostOnce_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_AT_MOST_ONCE, true, 1);
}
public void testStress_DuplicatesOk_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_DUPLICATES_OK, true, 1);
}
public void testStress_OnceAndOnlyOnce_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_ONCE_AND_ONLY_ONCE, true, 1);
}
public void testStress_AtMostOnce_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_AT_MOST_ONCE, false, 1);
}
public void testStress_DuplicatesOk_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_DUPLICATES_OK, false, 1);
}
public void testStress_OnceAndOnlyOnce_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_ONCE_AND_ONLY_ONCE, false, 1);
}
@@ -420,55 +273,31 @@
public void testStressSameServer_AtMostOnce_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_AT_MOST_ONCE, true, 50);
}
public void testStressSameServer_DuplicatesOk_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_DUPLICATES_OK, true, 50);
}
public void testStressSameServer_OnceAndOnlyOnce_P_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStress(Bridge.QOS_ONCE_AND_ONLY_ONCE, true, 50);
}
public void testStressSameServer_AtMostOnce_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_AT_MOST_ONCE, false, 50);
}
public void testStressSameServer_DuplicatesOk_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_DUPLICATES_OK, false, 50);
}
public void testStressSameServer_OnceAndOnlyOnce_NP_50() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, false, 50);
}
@@ -476,65 +305,36 @@
public void testStressSameServer_AtMostOnce_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_AT_MOST_ONCE, true, 1);
}
public void testStressSameServer_DuplicatesOk_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_DUPLICATES_OK, true, 1);
}
public void testStressSameServer_OnceAndOnlyOnce_P_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, true, 1);
}
public void testStressSameServer_AtMostOnce_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_AT_MOST_ONCE, false, 1);
}
public void testStressSameServer_DuplicatesOk_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_DUPLICATES_OK, false, 1);
}
public void testStressSameServer_OnceAndOnlyOnce_NP_1() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testStressSameServer(Bridge.QOS_ONCE_AND_ONLY_ONCE, false, 1);
}
public void testParams() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
Bridge bridge = null;
try
@@ -705,12 +505,7 @@
}
public void testSelector() throws Exception
- {
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
+ {
Bridge bridge = null;
Connection connSource = null;
@@ -829,12 +624,7 @@
}
public void testStartBridgeWithJTATransactionAlreadyRunning() throws Exception
- {
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
+ {
Bridge bridge = null;
Transaction toResume = null;
@@ -904,12 +694,7 @@
}
public void testNonDurableSubscriber() throws Exception
- {
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
+ {
Bridge bridge = null;
try
@@ -944,11 +729,6 @@
public void testDurableSubscriber() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
-
Bridge bridge = null;
try
@@ -982,7 +762,7 @@
}
public void testTimeout() throws Exception
- {
+ {
Bridge bridge = null;
try
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -47,7 +47,12 @@
}
protected void setUp() throws Exception
- {
+ {
+ if (!ServerManagement.isRemote())
+ {
+ fail("Test should only be run in a remote configuration");
+ }
+
useArjuna = true;
super.setUp();
@@ -64,19 +69,11 @@
public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -84,19 +81,11 @@
public void testCrashAndReconnectDestBasic_DuplicatesOk_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_DUPLICATES_OK, true);
}
public void testCrashAndReconnectDestBasic_DuplicatesOk_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_DUPLICATES_OK, false);
}
@@ -104,19 +93,11 @@
public void testCrashAndReconnectDestBasic_AtMostOnce_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testCrashAndReconnectDestBasic_AtMostOnce_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestBasic(Bridge.QOS_AT_MOST_ONCE, false);
}
@@ -125,19 +106,11 @@
public void testCrashAndReconnectDestCrashBeforePrepare_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestCrashBeforePrepare(true);
}
public void testCrashAndReconnectDestCrashBeforePrepare_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestCrashBeforePrepare(false);
}
@@ -146,20 +119,12 @@
// Note this test will fail until http://jira.jboss.com/jira/browse/JBTM-192 is complete
public void x_testCrashAndReconnectDestCrashOnCommit_P() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestCrashOnCommit(true);
}
// Note this test will fail until http://jira.jboss.com/jira/browse/JBTM-192 is complete
public void x_testCrashAndReconnectDestCrashOnCommit_NP() throws Exception
{
- if (!ServerManagement.isRemote())
- {
- return;
- }
testCrashAndReconnectDestCrashOnCommit(false);
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -74,8 +74,6 @@
ServerManagement.deployQueue("Queue");
queue = (Queue)initialContext.lookup("/queue/Queue");
- drainDestination(cf, queue);
-
}
public void tearDown() throws Exception
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageBodyTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageBodyTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageBodyTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -96,7 +96,7 @@
InitialContext ic = new InitialContext(ServerManagement.getJNDIEnvironment());
ConnectionFactory cf = (ConnectionFactory) ic.lookup("/ConnectionFactory");
queue = (Destination) ic.lookup("/queue/Queue");
-
+
producerConnection = cf.createConnection();
consumerConnection = cf.createConnection();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessagePropertyConversionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessagePropertyConversionTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessagePropertyConversionTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -75,7 +75,7 @@
InitialContext ic = new InitialContext(ServerManagement.getJNDIEnvironment());
ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ConnectionFactory");
queue = (Destination)ic.lookup("/queue/Queue");
-
+
producerConnection = cf.createConnection();
consumerConnection = cf.createConnection();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java 2007-01-25 11:19:00 UTC (rev 2052)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java 2007-01-25 15:21:00 UTC (rev 2053)
@@ -475,8 +475,6 @@
queue = (Destination)ic.lookup("/queue/Queue");
topic = (Destination)ic.lookup("/topic/Topic");
- drainDestination(cf, queue);
-
producerConnection = cf.createConnection();
consumerConnection = cf.createConnection();
More information about the jboss-cvs-commits
mailing list