[jboss-cvs] JBoss Messaging SVN: r3418 - in branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging: tools/container and 1 other directory.

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

Author: ataylor
Date: 2007-12-06 03:48:04 -0500 (Thu, 06 Dec 2007)
New Revision: 3418

Modified:
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
fixes for tests

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java	2007-12-05 23:15:05 UTC (rev 3417)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/JBMServerTestCase.java	2007-12-06 08:48:04 UTC (rev 3418)
@@ -190,7 +190,7 @@
    {
       super.tearDown();
       //this will make sure there arent any connection hanging around
-      assertEquals(0, ResourceManagerFactory.instance.size());
+      assertEquals(0, servers.get(0).getResourceManagerFactorySize());
    }
 
    public void stop() throws Exception

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2007-12-05 23:15:05 UTC (rev 3417)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2007-12-06 08:48:04 UTC (rev 3418)
@@ -818,6 +818,12 @@
       ((ServerPeer) getJmsServer()).getTxRepository().start();
    }
 
+
+   public int getResourceManagerFactorySize()
+   {
+      return ResourceManagerFactory.instance.size();
+   }
+
    public void setDataSource(DataSource dataSource)
    {
       LocalTestServer.dataSource = dataSource;

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-12-05 23:15:05 UTC (rev 3417)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-12-06 08:48:04 UTC (rev 3418)
@@ -607,6 +607,12 @@
       server.clear();
    }
 
+
+   public int getResourceManagerFactorySize()
+   {
+      return server.getResourceManagerFactorySize();
+   }
+
    public InitialContext getInitialContext() throws Exception
    {
       Hashtable env = new Hashtable();

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java	2007-12-05 23:15:05 UTC (rev 3417)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Server.java	2007-12-06 08:48:04 UTC (rev 3418)
@@ -324,4 +324,6 @@
    void setDefaultRedeliveryDelay(long delay) throws Exception;
 
    void clear() throws Exception;
+
+   int getResourceManagerFactorySize() throws Exception;
 }