[jboss-cvs] JBoss Messaging SVN: r2992 - in trunk: tests and 1 other directories.

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

Author: timfox
Date: 2007-08-09 10:08:42 -0400 (Thu, 09 Aug 2007)
New Revision: 2992

Modified:
   trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
Log:
Tests speedup


Modified: trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java	2007-08-09 12:46:41 UTC (rev 2991)
+++ trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java	2007-08-09 14:08:42 UTC (rev 2992)
@@ -22,6 +22,7 @@
 package org.jboss.jms.tx;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.jboss.logging.Logger;
@@ -155,6 +156,19 @@
          holders.put(new Integer(newServerID), h);
       }
    }
+   
+   public void dump()
+   {
+   	log.info("Dumping " + this);
+   	Iterator iter = holders.entrySet().iterator();
+   	while (iter.hasNext())
+   	{
+   		Map.Entry entry = (Map.Entry)iter.next();
+   		
+   		log.info(entry.getKey() + "--->" + entry.getValue());
+   	}
+   	log.info("End dump");
+   }
 
    // Package protected ----------------------------------------------------------------------------
 

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-08-09 12:46:41 UTC (rev 2991)
+++ trunk/tests/build.xml	2007-08-09 14:08:42 UTC (rev 2992)
@@ -750,39 +750,8 @@
             <formatter classname="org.jboss.test.messaging.tools.ant.JUnitTestSuiteListener"/>
 
             <fileset dir="${build.tests.classes}">
-<!--
               <include name="**/jms/clustering/${test-mask}.class"/>
--->
               <exclude name="**/jms/clustering/ClusterLeakTest.class"/>
-              <exclude name="**/jms/clustering/NoFailoverTest.class"/>
-
-<!--
-<include name="**/jms/clustering/ChangeFailoverNodeTest.class"/> 
-<include name="**/jms/clustering/ClusteredConnectionFactoryTest.class"/>
-<include name="**/jms/clustering/ClusterViewUpdateTest.class"/>
-<include name="**/jms/clustering/DisableLoadBalancingAndFailoverTest.class"/>
-<include name="**/jms/clustering/DistributedQueueDontUseXATest.class"/>
-<include name="**/jms/clustering/DistributedQueueUseXATest.class"/>
-<include name="**/jms/clustering/HATest.class"/>
-<include name="**/jms/clustering/MergeQueueTest.class"/>
-<include name="**/jms/clustering/MultipleFailoverTest.class"/>
-<include name="**/jms/clustering/MultiThreadFailoverTest.class"/>
-<include name="**/jms/clustering/NoFailoverTest.class"/>
-<include name="**/jms/clustering/PreserveOrderingTest.class"/>
-<include name="**/jms/clustering/RecoverDeliveriesTest.class"/>
-<include name="**/jms/clustering/XAFailoverTest.class"/>
-<include name="**/jms/clustering/ClusterConnectionManagerTest.class"/>
-<include name="**/jms/clustering/ClusteringAspectInternalTest.class"/>
-<include name="**/jms/clustering/DistributedRequestResponseTest.class"/>
-<include name="**/jms/clustering/LoadBalancingTest.class"/>
-<include name="**/jms/clustering/TemporaryDestinationTest.class"/>
--->
-<include name="**/jms/clustering/DistributedTopicTest.class"/>
-<include name="**/jms/clustering/FailoverTest.class"/>
-<!--
-<include name="**/jms/clustering/GroupManagementTest.class"/>
-<include name="**/jms/clustering/LargeClusterTest.class"/>
--->
            </fileset>
          </batchtest>
       </junit>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-08-09 12:46:41 UTC (rev 2991)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-08-09 14:08:42 UTC (rev 2992)
@@ -120,9 +120,7 @@
    protected void setUp() throws Exception
    {
       super.setUp();            
-      
-      assertEquals(0, ResourceManagerFactory.instance.size());	
-            
+             
       log.info("node count is " + nodeCount);
       
       if (ic != null && ic.length < nodeCount)
@@ -259,8 +257,12 @@
    {
       super.tearDown();
                  
-      // This will tell us if any connections have been left open
-		assertEquals(0, ResourceManagerFactory.instance.size());	
+      if (ResourceManagerFactory.instance.size() != 0)
+      {
+      	ResourceManagerFactory.instance.dump();
+      	
+      	fail("Connection(s) have been left open");
+      }
    }
 
    protected String getLocatorURL(Connection conn)

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java	2007-08-09 12:46:41 UTC (rev 2991)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java	2007-08-09 14:08:42 UTC (rev 2992)
@@ -34,6 +34,7 @@
 
 import org.jboss.jms.client.JBossConnectionFactory;
 import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
+import org.jboss.jms.tx.ResourceManagerFactory;
 import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
 import org.jboss.test.messaging.tools.container.ServiceContainer;
@@ -71,8 +72,14 @@
       try
       {
          assertFalse(((ClientClusteredConnectionFactoryDelegate)((JBossConnectionFactory)cf).getDelegate()).isSupportsFailover());
+         
+         log.info("dump 1");
+         ResourceManagerFactory.instance.dump();
 
          conn = createConnectionOnServer(cf, 1);
+         
+         log.info("dump 2");
+         ResourceManagerFactory.instance.dump();
 
       	MyListener listener = new MyListener();
 
@@ -93,6 +100,9 @@
          log.info("KILLED SERVER 1");
 
          JMSException e = listener.waitForException(20000);
+         
+         log.info("dump 3");
+         ResourceManagerFactory.instance.dump();
 
          assertNotNull(e);
 
@@ -106,7 +116,6 @@
          conn.close();
 
          conn = createConnectionOnServer(cf, 2); 
-            cf.createConnection();
 
          sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
@@ -151,6 +160,8 @@
          rm = (TextMessage) cons.receive(1000);
 
          assertEquals(rm.getText(), "Before Crash");
+         
+         log.info("Got to end");
       }
       finally
       {