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

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

Author: timfox
Date: 2007-02-09 11:12:51 -0500 (Fri, 09 Feb 2007)
New Revision: 2243

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
Log:
A few more fixes/tweaks


Modified: trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java	2007-02-09 15:37:38 UTC (rev 2242)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java	2007-02-09 16:12:51 UTC (rev 2243)
@@ -97,7 +97,11 @@
          try
          {
             c2 = cf.createConnection("john", "needle");
-            fail("JBossMessaging is allowing duplicate clients!");
+            
+            if (c1 != null & c2 != null && c1.getClientID().equals(c2.getClientID()))
+            {            
+               fail("JBossMessaging is allowing duplicate clients!");
+            }
          }
          catch (InvalidClientIDException e)
          {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java	2007-02-09 15:37:38 UTC (rev 2242)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XATestBase.java	2007-02-09 16:12:51 UTC (rev 2243)
@@ -120,7 +120,8 @@
             sc = new ServiceContainer("transaction");
          }
          
-         sc.start();
+         //Don't drop the tables again!
+         sc.start(false);
       }
       
       initialContext = new InitialContext(ServerManagement.getJNDIEnvironment());

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-02-09 15:37:38 UTC (rev 2242)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-02-09 16:12:51 UTC (rev 2243)
@@ -245,6 +245,8 @@
          // Now close the connection
          conn.close();
          
+         Thread.sleep(1000);
+         
          count = ((Integer)ServerManagement.getAttribute(destObjectName, "AllMessageCount")).intValue();
          
          assertEquals(0, count);