[jboss-cvs] JBoss Messaging SVN: r2965 - in trunk/tests/src/org/jboss/test/messaging: jms/clustering and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-08-07 05:40:25 -0400 (Tue, 07 Aug 2007)
New Revision: 2965

Modified:
   trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
Log:
A few tweaks


Modified: trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-06 19:52:21 UTC (rev 2964)
+++ trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-08-07 09:40:25 UTC (rev 2965)
@@ -499,7 +499,7 @@
    	while (true)
    	{
    		if (count++>10)
-   			return null;
+   			throw new IllegalStateException("Cannot make connection to node " + serverId);
 
    		Connection connection = factory.createConnection();
 
@@ -522,7 +522,7 @@
    	while (true)
    	{
    		if (count++>10)
-   			return null;
+   			throw new IllegalStateException("Cannot make connection to node " + serverId);
 
    		Connection connection = factory.createConnection(user, password);
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java	2007-08-06 19:52:21 UTC (rev 2964)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java	2007-08-07 09:40:25 UTC (rev 2965)
@@ -59,7 +59,7 @@
       super.setUp();
 
       for (int i = 0; i < nodeCount; i++)
-      {
+      {      	
       	ServerManagement.getServer(i).setUseXAForMessagePull(true);
       }      
    }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-08-06 19:52:21 UTC (rev 2964)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-08-07 09:40:25 UTC (rev 2965)
@@ -95,7 +95,7 @@
 
          Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         MessageProducer producer1 = session1.createProducer(this.queue[1]);
+         MessageProducer producer1 = session1.createProducer(queue[1]);
 
          producer1.setDeliveryMode(DeliveryMode.PERSISTENT);
 
@@ -197,7 +197,7 @@
 
          Session session1 = conn1.createSession(true, Session.SESSION_TRANSACTED);
 
-         MessageProducer producer1 = session1.createProducer(this.queue[1]);
+         MessageProducer producer1 = session1.createProducer(queue[1]);
 
          producer1.setDeliveryMode(DeliveryMode.PERSISTENT);