[jboss-cvs] JBossAS SVN: r100022 - in branches/Branch_Hornet_Temporary_2: testsuite/src/main/org/jboss/test/jbossmessaging/test and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2010-01-27 17:46:55 -0500 (Wed, 27 Jan 2010)
New Revision: 100022

Modified:
   branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-roles.properties
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java
   branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
Log:
test changes

Modified: branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-roles.properties
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-roles.properties	2010-01-27 21:22:47 UTC (rev 100021)
+++ branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-roles.properties	2010-01-27 22:46:55 UTC (rev 100022)
@@ -2,3 +2,4 @@
 # user=role1,role2,...
 #
 guest=guest
+john=guest

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java	2010-01-27 21:22:47 UTC (rev 100021)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java	2010-01-27 22:46:55 UTC (rev 100022)
@@ -551,6 +551,7 @@
       TopicConnectionFactory topicFactory = (TopicConnectionFactory) context.lookup(TOPIC_FACTORY);
       topicConnection = topicFactory.createTopicConnection();
       topicDurableConnection = topicFactory.createTopicConnection("john", "needle");
+      topicDurableConnection.setClientID("someClient");
 
       getLog().debug("Connection to JBossMQ established.");
    }

Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2010-01-27 21:22:47 UTC (rev 100021)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java	2010-01-27 22:46:55 UTC (rev 100022)
@@ -82,9 +82,7 @@
       suite.addTest(new UnackedUnitTestCase("testUnackedDurableTopic"));
       suite.addTest(new UnackedUnitTestCase("testDummyLast"));
       
-      ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
-      return getDeploySetup(suite, loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
+      return suite;
    }
 
 
@@ -574,6 +572,8 @@
    {
        // call setUp() in superclass 
        super.setUp() ;
+       
+       setupBasicDestinations();
 
       if (context == null)
       {
@@ -607,6 +607,8 @@
 		   topicDurableConnection.close();
 		   topicDurableConnection = null;
 	   }
+	   
+	   undeployDestinations();
    }
 
    // Emptys out all the messages in a queue