[jboss-cvs] JBoss Messaging SVN: r3450 - branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms.

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

Author: ataylor
Date: 2007-12-10 04:55:07 -0500 (Mon, 10 Dec 2007)
New Revision: 3450

Modified:
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
   branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
Log:
test fixes

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java	2007-12-09 14:38:13 UTC (rev 3449)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java	2007-12-10 09:55:07 UTC (rev 3450)
@@ -305,8 +305,7 @@
       }
    }
 
-   //todo this test needs replacing
-   /*public void testStopWhileProcessing() throws Exception
+   public void testStopWhileProcessing() throws Exception
    {
       if (ServerManagement.isRemote()) return;
 
@@ -338,7 +337,7 @@
       {
          if (connConsumer != null) connConsumer.close();
       }
-   }*/
+   }
 
 
    class SimpleMessageListener implements MessageListener

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2007-12-09 14:38:13 UTC (rev 3449)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2007-12-10 09:55:07 UTC (rev 3450)
@@ -183,10 +183,11 @@
 
    }
 
-  /* public void testSlowConsumers() throws Exception
+   /*public void testSlowConsumers() throws Exception
    {
-      ObjectName cf1 = deployConnectionFactory("jboss.messaging.destination:service=TestConnectionFactorySlowConsumers",
-      		                                   ServiceContainer.REMOTING_OBJECT_NAME.getCanonicalName(), "/TestSlowConsumersCF", null, true);
+     // ObjectName cf1 = deployConnectionFactory("jboss.messaging.destination:service=TestConnectionFactorySlowConsumers",
+      		                                   //ServiceContainer.REMOTING_OBJECT_NAME.getCanonicalName(), "/TestSlowConsumersCF", null, true);
+      deployConnectionFactory(null, "TestSlowConsumersCF", new String[]{"TestSlowConsumersCF"});
 
       Connection conn = null;
 
@@ -327,7 +328,7 @@
 
          try
          {
-            stopService(cf1);
+            undeployConnectionFactory("TestSlowConsumersCF");
          }
          catch (Exception e)
          {

Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java	2007-12-09 14:38:13 UTC (rev 3449)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java	2007-12-10 09:55:07 UTC (rev 3450)
@@ -33,20 +33,6 @@
       String[] args = new String[]{"invm-beans.xml", "jbm-beans.xml"};
       ic = getInitialContext();
       cf = getConnectionFactory();
-      //ServerManagement.create();
-      //ServerManagement.startServerPeer(0, "invm-beans.xml");
-      //deployAdministeredObjects();
-      
-      /*checkEmpty(queue1);
-      checkEmpty(queue2);
-      checkEmpty(queue3);
-      checkEmpty(queue4);*/
-
-      // Check no subscriptions left lying around
-
-      /*checkNoSubscriptions(topic1);
-      checkNoSubscriptions(topic2);
-      checkNoSubscriptions(topic3);*/
    }
 
    protected void tearDown() throws Exception