[jboss-cvs] JBossAS SVN: r100013 - in branches/Branch_Hornet_Temporary_2: server/src/etc/conf/all/props and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 27 14:36:53 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-01-27 14:36:52 -0500 (Wed, 27 Jan 2010)
New Revision: 100013
Removed:
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
Modified:
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-users.properties
branches/Branch_Hornet_Temporary_2/testsuite/build.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTopicUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java
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/SecurityUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java
Log:
Test changes
Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQAdminFactory.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -1,26 +0,0 @@
-package org.jboss.jms.testintegration;
-
-import javax.management.MBeanServerConnection;
-import javax.naming.InitialContext;
-
-
-public class HornetQAdminFactory extends JMSTestAdminFactory
-{
-
- MBeanServerConnection server;
-
- @Override
- public JMSTestAdmin newAdmin() throws Exception
- {
- if (server == null)
- {
- InitialContext ctx = new InitialContext();
- String adaptorName = System.getProperty("jbosstest.server.name",
- "jmx/invoker/RMIAdaptor");
- server = (MBeanServerConnection) ctx.lookup(adaptorName);
- ctx.close();
- }
- return new HornetQTestAdmin(server);
- }
-
-}
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/HornetQTestAdmin.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -1,56 +1,114 @@
package org.jboss.jms.testintegration;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import javax.naming.InitialContext;
import org.jboss.util.NestedRuntimeException;
-public class HornetQTestAdmin implements JMSTestAdmin
+public class HornetQTestAdmin extends JMSTestAdmin
{
- private final MBeanServerConnection jmx;
+ private final MBeanServerConnection jmx;
- protected static final ObjectName hornetQJMSServerName;
+ protected static final ObjectName hornetQJMSServerName;
- static
- {
- try
- {
- hornetQJMSServerName = new ObjectName("org.hornetq:module=JMS,type=Server");
- } catch (Exception e)
- {
- throw new NestedRuntimeException(e);
- }
- }
+ static
+ {
+ try
+ {
+ hornetQJMSServerName = new ObjectName("org.hornetq:module=JMS,type=Server");
+ }
+ catch (Exception e)
+ {
+ throw new NestedRuntimeException(e);
+ }
+ }
- public HornetQTestAdmin(MBeanServerConnection connection)
- {
- this.jmx = connection;
- }
+ public HornetQTestAdmin() throws Exception
+ {
+ InitialContext ctx = new InitialContext();
+ String adaptorName = System.getProperty("jbosstest.server.name", "jmx/invoker/RMIAdaptor");
+ jmx = (MBeanServerConnection) ctx.lookup(adaptorName);
+ ctx.close();
+ }
- public Object createQueue(String name, TestRole[] securityConfig) throws Exception
- {
- jmx.invoke(hornetQJMSServerName, "createQueue", new Object[]{name, "/queue/" + name}, new String[] {"java.lang.String", "java.lang.String"});
- return name;
- }
+ public Object createQueue(String name, TestRole[] securityConfig) throws Exception
+ {
+ jmx.invoke(hornetQJMSServerName, "createQueue", new Object[] { name, "/queue/" + name }, new String[] { "java.lang.String", "java.lang.String" });
+ deployedQueues.add(name);
+ return name;
+ }
- public Object createTopic(String name, TestRole[] securityConfig) throws Exception
- {
- jmx.invoke(hornetQJMSServerName, "createTopic", new Object[]{name, "/topic/" + name}, new String[] {"java.lang.String", "java.lang.String"});
- return name;
- }
+ public Object createTopic(String name, TestRole[] securityConfig) throws Exception
+ {
+ jmx.invoke(hornetQJMSServerName, "createTopic", new Object[] { name, "/topic/" + name }, new String[] { "java.lang.String", "java.lang.String" });
+ deployedTopics.add(name);
+ return name;
+ }
- public void deleteQueue(Object name) throws Exception
- {
- jmx.invoke(hornetQJMSServerName, "destroyQueue", new Object[]{name}, new String[] {"java.lang.String"});
- }
+ public void deleteQueue(Object name) throws Exception
+ {
+ new Exception("Deleting Queue " + name).printStackTrace();
+ try
+ {
+ invokeDeleteQueue(name);
+ deployedQueues.remove(name);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(System.out);
+ throw e;
+ }
+ }
- public void deleteTopic(Object name) throws Exception
- {
- jmx.invoke(hornetQJMSServerName, "destroyTopic", new Object[]{name}, new String[] {"java.lang.String"});
- }
-
- public void close() throws Exception
- {
- }
+ private void invokeDeleteQueue(Object name) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException
+ {
+ jmx.invoke(hornetQJMSServerName, "destroyQueue", new Object[] { name }, new String[] { "java.lang.String" });
+ }
+ public void deleteTopic(Object name) throws Exception
+ {
+
+ System.out.println("Deleting Topic " + name);
+ try
+ {
+ invokeDeleteTopic(name);
+ deployedTopics.remove(name);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(System.out);
+ throw e;
+ }
+ }
+
+ private void invokeDeleteTopic(Object name) throws InstanceNotFoundException, MBeanException, ReflectionException, IOException
+ {
+ jmx.invoke(hornetQJMSServerName, "destroyTopic", new Object[] { name }, new String[] { "java.lang.String" });
+ }
+
+ @Override
+ public void undeployCreatedDestinations() throws Exception
+ {
+ for (Object queue : deployedQueues)
+ {
+ invokeDeleteQueue(queue);
+ }
+
+ for (Object topic : deployedTopics)
+ {
+ invokeDeleteTopic(topic);
+ }
+
+ deployedQueues.clear();
+ deployedTopics.clear();
+ }
+
}
Modified: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdmin.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -1,12 +1,33 @@
package org.jboss.jms.testintegration;
+import java.util.HashSet;
+import java.util.Set;
+
/**
*
* @author <mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
*
*/
-public interface JMSTestAdmin
+public abstract class JMSTestAdmin
{
+
+ protected Set<Object> deployedTopics = new HashSet<Object>();
+ protected Set<Object> deployedQueues = new HashSet<Object>();
+
+ public static JMSTestAdmin admin;
+
+ public static JMSTestAdmin getAdmin() throws Exception
+ {
+ if (admin == null)
+ {
+ // TODO: make this configurable
+ admin = new HornetQTestAdmin();
+ }
+
+ return admin;
+ }
+
+
/**
*
* @param name
@@ -14,13 +35,13 @@
* @return information about the deployment required to undeploy/remove the topic
* @throws Exception
*/
- Object createTopic(String name, TestRole[] securityConfig) throws Exception;
+ public abstract Object createTopic(String name, TestRole[] securityConfig) throws Exception;
- void deleteTopic(Object topic) throws Exception;
+ public abstract void deleteTopic(Object topic) throws Exception;
- Object createQueue(String name, TestRole[] securityConfig) throws Exception;
+ public abstract Object createQueue(String name, TestRole[] securityConfig) throws Exception;
- void deleteQueue(Object queue) throws Exception;
+ public abstract void deleteQueue(Object queue) throws Exception;
- void close() throws Exception;
+ public abstract void undeployCreatedDestinations() throws Exception;
}
Deleted: branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/hornetq-int/src/main/java/org/jboss/jms/testintegration/JMSTestAdminFactory.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -1,13 +0,0 @@
-package org.jboss.jms.testintegration;
-
-
-public abstract class JMSTestAdminFactory
-{
- public static JMSTestAdminFactory getFactory()
- {
- // TODO: make this configurable
- return new HornetQAdminFactory();
- }
-
- public abstract JMSTestAdmin newAdmin() throws Exception;
-}
Modified: branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-users.properties
===================================================================
--- branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-users.properties 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/server/src/etc/conf/all/props/hornetq-users.properties 2010-01-27 19:36:52 UTC (rev 100013)
@@ -2,3 +2,4 @@
# user=password
#
guest=guest
+john=needle
Modified: branches/Branch_Hornet_Temporary_2/testsuite/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/build.xml 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/build.xml 2010-01-27 19:36:52 UTC (rev 100013)
@@ -959,10 +959,10 @@
<!-- jbossmessaging includes -->
<patternset id="jbossmessaging.includes">
<include name="org/jboss/test/jbossmessaging/**/Jms11UnitTest.class"/>
-<!-- <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
+ <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
<include name="org/jboss/test/jbossmessaging/perf/*StressTestCase.class"/>
<include name="org/jboss/test/jbossmessaging/ra/*UnitTestCase.class"/>
- <include name="org/jboss/test/jms/integration/**/*Test.class"/> -->
+ <include name="org/jboss/test/jms/integration/**/*Test.class"/>
</patternset>
<patternset id="jbossmessaging-clustering.includes">
<include name="org/jboss/test/jbossmessaging/clustertest/*TestCase.class"/>
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -21,19 +21,16 @@
*/
package org.jboss.test.jbossmessaging;
-import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
-import java.util.Properties;
+
import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
-import org.jboss.util.NestedRuntimeException;
import org.jboss.jms.testintegration.JMSTestAdmin;
-import org.jboss.jms.testintegration.JMSTestAdminFactory;
import org.jboss.jms.testintegration.TestRole;
import org.jboss.test.JBossTestCase;
+import org.jboss.util.NestedRuntimeException;
/**
* JBossJMSTestCase. A base test case for all JMS generic test cases.
@@ -48,14 +45,7 @@
public class JBossJMSTestCase extends JBossTestCase
{
/** JBM provider properties resource name */
-
- JMSTestAdmin admin;
-
- private ArrayList<Object> deployedQueues = new ArrayList<Object>();
- private ArrayList<Object> deployedTopics = new ArrayList<Object>();
-
-
/**
* Constructor for JMSTestCase object
@@ -69,18 +59,16 @@
}
- protected void deployTopic(String name, TestRole[] securityConfig) throws Exception
+ protected static Object deployTopic(String name, TestRole[] securityConfig) throws Exception
{
- deployedTopics.add(admin.createTopic(name, securityConfig));
+ return JMSTestAdmin.getAdmin().createTopic(name, securityConfig);
}
- protected void deployQueue(String name, TestRole[] securityConfig) throws Exception
+ protected static Object deployQueue(String name, TestRole[] securityConfig) throws Exception
{
- deployedQueues.add(admin.createQueue(name, securityConfig));
+ return JMSTestAdmin.getAdmin().createQueue(name, securityConfig);
}
-
-
/**
* Create the Admin object to perform all JMS adminsitrative functions in a
* JMS provider-independent manner
@@ -89,42 +77,31 @@
{
// perform any setUp required in the superclass
super.setUp();
-
- admin = JMSTestAdminFactory.getFactory().newAdmin();
}
protected void tearDown() throws Exception
{
- for (Object topic : deployedTopics)
- {
- try
- {
- admin.deleteTopic(topic);
- }
- catch (Throwable e)
- {
- log.warn("Error deleting topic " + topic, e);
- }
- }
+ super.tearDown();
+ }
+
+ protected static void undeployDestinations() throws Exception
+ {
+ JMSTestAdmin.getAdmin().undeployCreatedDestinations();
+ }
- for (Object queue : deployedQueues)
- {
- try
- {
- admin.deleteQueue(queue);
- }
- catch (Throwable e)
- {
- log.warn("Error deleting topic " + queue, e);
- }
- }
- admin.close();
-
- super.tearDown();
- }
+ protected static void undeployQueue(Object queue) throws Exception
+ {
+ JMSTestAdmin.getAdmin().deleteQueue(queue);
+ }
+
+
+ protected static void undeployTopic(Object topic) throws Exception
+ {
+ JMSTestAdmin.getAdmin().deleteTopic(topic);
+ }
- protected void setupBasicDestinations() throws Exception
+ protected static void setupBasicDestinations() throws Exception
{
deployTopic("securedTopic", null);
deployTopic("testDurableTopic", null);
@@ -151,14 +128,7 @@
*/
public Object createQueue(String name) throws Exception
{
- try
- {
- return admin.createQueue(name, null);
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException("createQueue() operation failed", e);
- }
+ return deployQueue(name, null);
}
/**
@@ -174,7 +144,7 @@
{
try
{
- admin.deleteQueue(name);
+ undeployQueue(name);
}
catch (Exception e)
{
@@ -191,16 +161,9 @@
* @param name
* The name of the Topic to be created.
*/
- public Object createTopic(String name)
+ public Object createTopic(String name) throws Exception
{
- try
- {
- return admin.createTopic(name, null);
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException("createTopic() operation failed", e);
- }
+ return deployTopic(name, null);
}
/**
@@ -212,16 +175,9 @@
* @param name
* The name of the Topic to be deleted.
*/
- public void deleteTopic(String name)
+ public void deleteTopic(Object name) throws Exception
{
- try
- {
- admin.deleteTopic(name);
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException("deleteTopic() operation failed", e);
- }
+ undeployTopic(name);
}
protected void dumpJNDIContext(String context)
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -712,6 +712,7 @@
{
// perform any setUp() required by the base class
super.setUp() ;
+ setupBasicDestinations();
if (context == null)
{
@@ -738,6 +739,8 @@
{
try {queueConnection.close();} catch (Throwable ignored){}
try {topicConnection.close();} catch (Throwable ignored){}
+
+ undeployDestinations();
}
@@ -788,12 +791,6 @@
session.close();
}
+
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(JMSPerfStressTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -34,24 +34,24 @@
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.Session;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import org.jboss.test.jbossmessaging.JBossJMSTestCase;
-import org.jboss.util.NestedRuntimeException;
/**
* A stress test for an impatient receiver
- *
- * @author <a href="mailto:richard.achmatowicz at jboss.com">Richard Achmatowicz</a>
- * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
+ *
+ * @author <a href="mailto:richard.achmatowicz at jboss.com">Richard
+ * Achmatowicz</a>
+ * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
*/
-public class ReceiveNackClientStressTestCase extends JBossJMSTestCase implements ExceptionListener
+public class ReceiveNackClientStressTestCase extends JBossJMSTestCase implements
+ ExceptionListener
{
+ private static final String IMPATIENT = "/queue/Impatient";
protected QueueConnection queueConnection;
-
+
public ReceiveNackClientStressTestCase(String name) throws Exception
{
super(name);
@@ -68,31 +68,32 @@
{
}
}
-
- private void drainQueue(String name) throws Exception
- {
- InitialContext context = getInitialContext() ;
- QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- Queue queue = (Queue)context.lookup(name);
+ private void drainQueue(String name) throws Exception
+ {
+ InitialContext context = getInitialContext();
- QueueReceiver receiver = session.createReceiver(queue);
- queueConnection.start();
- Message message = receiver.receive(50);
- int c = 0;
- while (message != null)
- {
- message = receiver.receive(50);
- c++;
- }
+ QueueSession session = queueConnection.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
+ Queue queue = (Queue) context.lookup(name);
- if (c != 0)
- getLog().debug(" Drained " + c + " messages from the queue");
- session.close();
- queueConnection.stop();
+ QueueReceiver receiver = session.createReceiver(queue);
+ queueConnection.start();
+ Message message = receiver.receive(50);
+ int c = 0;
+ while (message != null)
+ {
+ message = receiver.receive(50);
+ c++;
+ }
- }
+ if (c != 0)
+ getLog().debug(" Drained " + c + " messages from the queue");
+ session.close();
+ queueConnection.stop();
+ }
+
public void testImpatient() throws Exception
{
int target = getIterationCount();
@@ -100,13 +101,15 @@
try
{
InitialContext context = getInitialContext();
- QueueConnectionFactory queueFactory = (QueueConnectionFactory) context.lookup("ConnectionFactory");
- Queue queue = (Queue) context.lookup("Impatient");
+ QueueConnectionFactory queueFactory = (QueueConnectionFactory) context
+ .lookup("ConnectionFactory");
+ Queue queue = (Queue) context.lookup(IMPATIENT);
queueConnection = queueFactory.createQueueConnection();
- drainQueue("Impatient") ;
+ drainQueue(IMPATIENT);
try
{
- QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ QueueSession session = queueConnection.createQueueSession(false,
+ Session.AUTO_ACKNOWLEDGE);
QueueSender sender = session.createSender(queue);
QueueReceiver receiver = session.createReceiver(queue);
Serializable payload = new HashMap();
@@ -127,13 +130,13 @@
}
finally
{
- drainQueue("Impatient") ;
+ drainQueue(IMPATIENT);
queueConnection.close();
}
}
finally
{
- deleteQueue("Impatient");
+ undeployDestinations();
}
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -98,6 +98,10 @@
public synchronized void addError(Throwable t)
{
errors.add(t);
+ synchronized (System.out)
+ {
+ t.printStackTrace(System.out);
+ }
}
public synchronized void finished()
{
@@ -136,7 +140,10 @@
sender.send(message);
QueueReceiver receiver = session.createReceiver(temp);
- receiver.receive();
+ if (receiver.receive(2000) == null)
+ {
+ state.addError(new Exception("Didn't receive message"));
+ }
receiver.close();
temp.delete();
@@ -178,7 +185,10 @@
publisher.publish(message);
QueueReceiver receiver = qsession.createReceiver(temp);
- receiver.receive();
+ if (receiver.receive(2000) == null)
+ {
+ state.addError(new Exception("Didn't receive message"));
+ }
receiver.close();
session.close();
@@ -207,8 +217,9 @@
try
{
QueueSession session = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- Queue replyQueue = session.createQueue(((Queue)message.getJMSReplyTo()).getQueueName());
+ Queue replyQueue = (Queue)message.getJMSReplyTo();
QueueSender sender = session.createSender(replyQueue);
+ System.out.println("Sending response");
sender.send(message);
sender.close();
session.close();
@@ -289,6 +300,8 @@
{
// call setUp() of superclass
super.setUp() ;
+
+ setupBasicDestinations();
getLog().info("Starting test: " + getName());
@@ -308,6 +321,8 @@
getLog().info("Ended test: " + getName());
queueConnection.close();
topicConnection.close();
+
+ undeployDestinations();
// call tearDown() of superclass
super.tearDown() ;
@@ -335,12 +350,5 @@
}
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(SendReplyPerfStressTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -66,14 +66,14 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-service.xml").toString());
+ RaJMSSessionUnitTestCase.setupBasicDestinations();
deploy ("jmsra.jar");
}
protected void tearDown() throws Exception
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
undeploy ("jmsra.jar");
- undeploy (loader.getResource("messaging/test-destinations-service.xml").toString());
+ RaJMSSessionUnitTestCase.undeployDestinations();
}
});
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -92,24 +92,13 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
+ RaQueueUnitTestCase.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
super.tearDown();
-
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
+ RaQueueUnitTestCase.undeployDestinations();
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -21,47 +21,47 @@
*/
package org.jboss.test.jbossmessaging.ra;
-import javax.jms.Connection;
-import javax.jms.Message;
-
+import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.jms.Queue;
+import javax.management.ObjectName;
import javax.naming.Context;
-import javax.management.ObjectName;
-
import junit.framework.Assert;
-
import junit.framework.Test;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.jmsra.bean.Publisher;
+import org.jboss.test.jmsra.bean.QueueRec;
+import org.jboss.test.jmsra.bean.QueueRecHome;
-import org.jboss.test.jmsra.bean.*;
-
/**
*
- * <p>Test sync receive.
- *
- * <p>Created: Sat Sep 22 13:31:54 2001.
- *
- * @author <a href="mailto:richard.achmatowicz at jboss.com">Richard Achmatowicz</a>
+ * <p>
+ * Test sync receive.
+ *
+ * <p>
+ * Created: Sat Sep 22 13:31:54 2001.
+ *
+ * @author <a href="mailto:richard.achmatowicz at jboss.com">Richard
+ * Achmatowicz</a>
* @author <a href="mailto:peter.antman at tim.se">Peter Antman</a>
* @version $Revision$
*/
-public class RaSyncRecUnitTestCase extends JBossJMSTestCase {
+public class RaSyncRecUnitTestCase extends JBossJMSTestCase
+{
private final static String BEAN_JNDI = "QueueRec";
private final static String QUEUE_FACTORY = "ConnectionFactory";
private final static String QUEUE = "queue/A";
private final static int MESSAGE_NR = 10;
-
+
/**
* JMS connection
*/
@@ -77,35 +77,39 @@
/**
* Receiving bean
- */
+ */
protected QueueRec rec;
/**
- *
+ *
* Constructor for the RaSyncRecUnitTestCase object
- *
- * @param name Description of Parameter
- * @exception Exception Description of Exception
+ *
+ * @param name
+ * Description of Parameter
+ * @exception Exception
+ * Description of Exception
*/
- public RaSyncRecUnitTestCase(String name) {
+ public RaSyncRecUnitTestCase(String name)
+ {
super(name);
}
-
+
/**
* The JUnit setup method
- *
- * @exception Exception Description of Exception
+ *
+ * @exception Exception
+ * Description of Exception
*/
protected void setUp() throws Exception
{
- // call setUp() in super class
- super.setUp() ;
+ // call setUp() in super class
+ super.setUp();
// Create a receiver
Context context = getInitialContext();
try
{
- QueueRecHome home = (QueueRecHome)context.lookup(BEAN_JNDI);
+ QueueRecHome home = (QueueRecHome) context.lookup(BEAN_JNDI);
rec = home.create();
init(context);
@@ -122,28 +126,30 @@
/**
* #Description of the Method
- *
- * @param context Description of Parameter
- * @exception Exception Description of Exception
+ *
+ * @param context
+ * Description of Parameter
+ * @exception Exception
+ * Description of Exception
*/
protected void init(final Context context) throws Exception
{
- QueueConnectionFactory factory =
- (QueueConnectionFactory)context.lookup(QUEUE_FACTORY);
-
+ QueueConnectionFactory factory = (QueueConnectionFactory) context.lookup(QUEUE_FACTORY);
+
connection = factory.createQueueConnection();
-
- session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-
- Queue queue = (Queue)context.lookup(QUEUE);
-
- sender = ((QueueSession)session).createSender(queue);
+
+ session = ((QueueConnection) connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ Queue queue = (Queue) context.lookup(QUEUE);
+
+ sender = ((QueueSession) session).createSender(queue);
}
/**
* The teardown method for JUnit
- *
- * @exception Exception Description of Exception
+ *
+ * @exception Exception
+ * Description of Exception
*/
protected void tearDown() throws Exception
{
@@ -151,8 +157,9 @@
{
sender.close();
}
- if (session != null) {
- session.close();
+ if (session != null)
+ {
+ session.close();
}
if (connection != null)
{
@@ -160,13 +167,14 @@
}
// call tearDown() in superclass
- super.tearDown() ;
+ super.tearDown();
}
/**
* Test sync receive of message with jms ra.
*/
- public void testSyncRec() throws Exception {
+ public void testSyncRec() throws Exception
+ {
// Send a message to queue
TextMessage message = session.createTextMessage();
message.setText(String.valueOf(MESSAGE_NR));
@@ -187,31 +195,16 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("jbossmessaging/test-destinations-full-service.xml").toString());
+ RaSyncRecUnitTestCase.setupBasicDestinations();
}
- protected void tearDown() throws Exception
- {
- super.tearDown();
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ RaSyncRecUnitTestCase.undeployDestinations();
+ }
+ };
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("jbossmessaging/test-destinations-full-service.xml").toString());
- }
- };
-
}
} // RaSyncRecUnitTestCase
-
-
-
-
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTopicUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTopicUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTopicUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -21,34 +21,28 @@
*/
package org.jboss.test.jbossmessaging.ra;
-import javax.jms.MessageConsumer;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicConnection;
-
import javax.jms.TopicConnectionFactory;
import javax.jms.TopicSession;
-
-import javax.management.ObjectName;
-
import javax.naming.Context;
import junit.framework.Test;
import org.jboss.test.JBossTestSetup;
-
/**
- * Test cases for JMS Resource Adapter using a <em>Topic</em> . <p>
- *
+ * Test cases for JMS Resource Adapter using a <em>Topic</em> .
+ * <p>
+ *
* Created: Mon Apr 23 21:35:25 2001
- *
- * @author <a href="mailto:peter.antman at tim.se">Peter Antman</a>
- * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
- * @version $Revision$
+ *
+ * @author <a href="mailto:peter.antman at tim.se">Peter Antman</a>
+ * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
+ * @version $Revision$
*/
-public class RaTopicUnitTestCase
- extends RaTest
+public class RaTopicUnitTestCase extends RaTest
{
private final static String TOPIC_FACTORY = "ConnectionFactory";
private final static String TOPIC = "topic/testTopic";
@@ -56,9 +50,11 @@
/**
* Constructor for the RaTopicUnitTestCase object
- *
- * @param name Description of Parameter
- * @exception Exception Description of Exception
+ *
+ * @param name
+ * Description of Parameter
+ * @exception Exception
+ * Description of Exception
*/
public RaTopicUnitTestCase(String name) throws Exception
{
@@ -67,52 +63,41 @@
/**
* #Description of the Method
- *
- * @param context Description of Parameter
- * @exception Exception Description of Exception
+ *
+ * @param context
+ * Description of Parameter
+ * @exception Exception
+ * Description of Exception
*/
protected void init(final Context context) throws Exception
{
- TopicConnectionFactory factory =
- (TopicConnectionFactory)context.lookup(TOPIC_FACTORY);
+ TopicConnectionFactory factory = (TopicConnectionFactory) context.lookup(TOPIC_FACTORY);
connection = factory.createTopicConnection();
- session = ((TopicConnection)connection).createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
+ session = ((TopicConnection) connection).createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
- Topic topic = (Topic)context.lookup(TOPIC);
+ Topic topic = (Topic) context.lookup(TOPIC);
- consumer = ((TopicSession)session).createSubscriber(topic);
+ consumer = ((TopicSession) session).createSubscriber(topic);
}
public static Test suite() throws Exception
{
- return new JBossTestSetup(getDeploySetup(RaTopicUnitTestCase.class, "jmsra.jar"))
- {
- protected void setUp() throws Exception
- {
- super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
+ return new JBossTestSetup(getDeploySetup(RaTopicUnitTestCase.class, "jmsra.jar"))
+ {
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ RaTopicUnitTestCase.setupBasicDestinations();
+ }
- protected void tearDown() throws Exception
- {
- super.tearDown();
-
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
- };
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ RaTopicUnitTestCase.undeployDestinations();
+ }
+ };
}
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -67,6 +67,8 @@
{
// call setUp() in superclass
super.setUp() ;
+
+ setupBasicDestinations();
this.getLog().debug("JBossSessionRecoverUnitTestCase, ConnectionFactory started");
}
@@ -74,6 +76,8 @@
protected void tearDown() throws Exception
{
this.getLog().debug("JBossSessionRecoverUnitTestCase, ConnectionFactory done");
+
+ undeployDestinations();
// call tearDown() in superclass
super.tearDown() ;
@@ -551,12 +555,4 @@
queueConnection.close();
getLog().debug("session.recover() receiveNoWait passed");
}
-
- public static junit.framework.Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(JBossSessionRecoverUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -91,6 +91,7 @@
{
super.tearDown();
disconnect();
+ undeployDestinations();
context.close();
context = null;
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -24,7 +24,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import javax.jms.JMSException;
+
import javax.jms.Message;
import javax.jms.ObjectMessage;
import javax.jms.Queue;
@@ -37,9 +37,6 @@
import javax.jms.TextMessage;
import javax.naming.Context;
-import junit.framework.Test;
-
-import org.jboss.logging.Logger;
import org.jboss.test.jbossmessaging.JBossJMSTestCase;
/**
@@ -73,6 +70,8 @@
{
// call setUp() in the superclass
super.setUp() ;
+
+ setupBasicDestinations();
connect();
}
@@ -81,6 +80,8 @@
{
disconnect();
+ undeployDestinations();
+
// call tearDown() in the superclass to cleanup
super.tearDown() ;
}
@@ -292,60 +293,4 @@
for (int i = 0; i < invalid.length; ++i)
message.setStringProperty(valid[i], "whatever");
}
-
- /**
- * Test vendor properties.
- * Test disabled for JBossMessaging
- */
- /*public void testVendorProperties() throws Exception
- {
- TextMessage message = session.createTextMessage();
-
- System.out.println("hello!!!");
-
- try
- {
- message.setStringProperty("JMS_JBOSS_SCHEDULED_DELIVERY", "whenever");
- fail("invalid type");
- }
- catch (JMSException e) {
- e.printStackTrace();
- }
- try
- {
- message.setObjectProperty("JMS_JBOSS_SCHEDULED_DELIVERY", "10234");
- fail("invalid type");
- }
- catch (JMSException e) {
- e.printStackTrace();
- }
- try
- {
- message.setStringProperty("JMS_JBOSS_REDELIVERY_COUNT", "fruity");
- fail("invalid type");
- }
- catch (JMSException e) {
- e.printStackTrace();
- }
- try
- {
- message.setStringProperty("JMS_JBOSS_REDELIVERY_LIMIT", "fruity");
- fail("invalid type");
- }
- catch (JMSException e) {
- e.printStackTrace();
- }
-
- message.setLongProperty("JMS_JBOSS_SCHEDULED_DELIVERY", 10234);
- message.setIntProperty("JMS_JBOSS_REDELIVERY_COUNT", 123);
- message.setShortProperty("JMS_JBOSS_REDELIVERY_LIMIT", (short)1);
- } */
-
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(MessageBodyUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -235,6 +235,8 @@
{
// call setUp() in superclass
super.setUp() ;
+
+ setupBasicDestinations();
context = new InitialContext();
QueueConnectionFactory queueFactory = (QueueConnectionFactory) context.lookup(QUEUE_FACTORY);
@@ -254,6 +256,8 @@
receiver.close();
session.close();
queueConnection.close();
+
+ undeployDestinations();
// call tearDown() in superclass
super.tearDown() ;
@@ -266,11 +270,4 @@
return out;
}
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(MessageTypesUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
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 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -540,6 +540,8 @@
{
super.setUp();
+ setupBasicDestinations();
+
getLog().debug("START TEST " + getName());
context = getInitialContext();
@@ -588,6 +590,10 @@
catch (JMSException ignored)
{
}
+
+ undeployDestinations();
+
+
super.tearDown();
}
@@ -730,11 +736,5 @@
return 5;
}
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(RollBackUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -41,6 +41,18 @@
{
super(name);
}
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ setupBasicDestinations();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ undeployDestinations();
+ super.tearDown();
+ }
public void testLoginTest() throws Exception
{
@@ -1170,11 +1182,4 @@
}
}
}
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(SecurityUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-01-27 19:36:44 UTC (rev 100012)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-01-27 19:36:52 UTC (rev 100013)
@@ -56,6 +56,18 @@
{
super(name);
}
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ setupBasicDestinations();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ undeployDestinations();
+ super.tearDown();
+ }
public void testXAResourceSuspendWorkCommit() throws Exception
{
@@ -200,12 +212,4 @@
return branch;
}
}
-
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(XAResourceUnitTestCase.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
-
}
More information about the jboss-cvs-commits
mailing list