[jboss-cvs] JBossAS SVN: r101305 - in branches/Branch_Hornet_Temporary_2/testsuite: imports/sections and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 22 23:03:48 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-22 23:03:47 -0500 (Mon, 22 Feb 2010)
New Revision: 101305
Added:
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/build.xml
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/jca.xml
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/web.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/BmpUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CmpUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CtsCmp2OptionDUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/IndependentJarsUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LocalEjbTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionBrokenCreateUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/AbstractLifeCycleTestWrapper.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.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/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/JBossJMSUnitTest.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/SessionCloseStressTestCase.java
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/XAResourceUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml
Log:
Fixing tests
Modified: branches/Branch_Hornet_Temporary_2/testsuite/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/build.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/build.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -411,7 +411,7 @@
<fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
<fileset refid="org.jboss.javaee:jboss-ejb-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-jacc-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jad-api:jar"/>
+ <!-- <fileset refid="org.jboss.javaee:jboss-jad-api:jar"/> -->
<fileset refid="org.jboss.javaee:jboss-jca-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-jms-api:jar"/>
<fileset refid="org.jboss.javaee:jboss-transaction-api:jar"/>
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -19,8 +19,7 @@
</jar>
<!-- build cts.jar -->
- <mkdir dir="${build.lib}/dest-free"/>
- <jar destfile="${build.lib}/dest-free/cts.jar">
+ <jar destfile="${build.lib}/cts.jar">
<metainf dir="${build.resources}/cts/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
@@ -43,10 +42,6 @@
<patternset refid="jboss.test.set"/>
</zipfileset>
</jar>
- <jar destfile="${build.lib}/cts.jar">
- <zipfileset src="${build.lib}/dest-free/cts.jar"/>
- <fileset dir="${source.resources}/hornetq"/>
- </jar>
<!-- build a duplicate cts.jar with new home bindings -->
<jar destfile="${build.lib}/cts2.jar">
<metainf dir="${build.resources}/cts/metainf2">
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/invokers.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -27,7 +27,6 @@
<fileset dir="${build.lib}">
<include name="invokers.sar"/>
</fileset>
- <fileset dir="${source.resources}/hornetq"/>
</jar>
</target>
</project>
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/jca.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/jca.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/jca.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -246,7 +246,6 @@
<fileset dir="${build.resources}/jca/test">
<include name="**/*.*"/>
</fileset>
- <fileset dir="${build.resources}/hornetq"/>
<fileset dir="${build.resources}/jca/executejmsrollback">
<include name="**/*.*"/>
</fileset>
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/web.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/web.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/web.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -230,7 +230,7 @@
<include name="lib/util.jar"/>
<include name="websubdir/relative.jar"/>
</fileset>
- <fileset dir="${build.lib}/dest-free">
+ <fileset dir="${build.lib}">
<include name="cts.jar"/>
</fileset>
<fileset dir="${build.resources}/web">
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/BmpUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/BmpUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/BmpUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -23,36 +23,33 @@
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
-
import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
+import javax.ejb.EJBMetaData;
import javax.ejb.Handle;
import javax.ejb.HomeHandle;
-import javax.ejb.EJBMetaData;
-
import javax.naming.InitialContext;
-
import javax.rmi.PortableRemoteObject;
-
import javax.transaction.UserTransaction;
-import org.jboss.test.cts.jms.ContainerMBox;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
+import org.jboss.test.cts.interfaces.CtsBmp;
import org.jboss.test.cts.interfaces.CtsBmpHome;
-import org.jboss.test.cts.interfaces.CtsBmp;
import org.jboss.test.cts.interfaces.UserTransactionTester;
-import org.jboss.test.cts.interfaces.StatelessSession;
+import org.jboss.test.cts.jms.ContainerMBox;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
-import junit.framework.Test;
-import org.jboss.test.JBossTestCase;
-
-
/**
* Class BmpTest
*
@@ -791,7 +788,24 @@
//deploy the cts.jar once for the suite.
public static Test suite() throws Exception
{
- return getDeploySetup(BmpUnitTestCase.class, "cts.jar");
+
+ return new JBossTestSetup(new TestSuite(BmpUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CmpUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CmpUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CmpUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -23,15 +23,19 @@
import java.util.Properties;
+
import javax.naming.InitialContext;
import javax.rmi.PortableRemoteObject;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.CtsCmp;
import org.jboss.test.cts.interfaces.CtsCmpHome;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Basic conformance tests for stateless sessions
*
@@ -115,7 +119,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(CmpUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(CmpUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CtsCmp2OptionDUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CtsCmp2OptionDUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/CtsCmp2OptionDUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,10 +25,13 @@
import javax.naming.InitialContext;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.CtsCmpHome;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Tests OptionD.
@@ -64,6 +67,22 @@
public static Test suite() throws Exception
{
- return getDeploySetup(CtsCmp2OptionDUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(CtsCmp2OptionDUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/IndependentJarsUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/IndependentJarsUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/IndependentJarsUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,11 +25,14 @@
import javax.rmi.PortableRemoteObject;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.CallerSession;
import org.jboss.test.cts.interfaces.CallerSessionHome;
import org.jboss.test.cts.interfaces.CalleeException;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Tests of ejbs in seperate jars interacting
*
@@ -109,7 +112,24 @@
public static Test suite() throws Exception
{
- return getDeploySetup(IndependentJarsUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(IndependentJarsUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LocalEjbTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LocalEjbTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LocalEjbTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,7 +25,9 @@
import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.ejb.LocalEjbTests;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Basic conformance tests for stateless sessions
*
@@ -44,7 +46,24 @@
{
TestSuite testSuite = new TestSuite("LocalEjbTestCase");
testSuite.addTestSuite(LocalEjbTests.class);
- return getDeploySetup(testSuite, "cts.jar");
+ return new JBossTestSetup(testSuite)
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,9 +25,12 @@
import org.jboss.test.cts.interfaces.StatefulSession;
import org.jboss.test.cts.interfaces.StatefulSessionHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import junit.framework.Test;
+import junit.framework.TestSuite;
/**
* Long wait test
@@ -61,7 +64,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(LongWaitStatefulSessionUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(LongWaitStatefulSessionUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -30,7 +30,11 @@
import EDU.oswego.cs.dl.util.concurrent.CountDown;
import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Basic conformance tests for MDBs
*
@@ -82,7 +86,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(MDBUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(MDBUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/NestedUserTransactionTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -28,11 +28,14 @@
import javax.transaction.UserTransaction;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.CtsCmpHome;
import org.jboss.test.cts.interfaces.CtsCmp;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Tests of accessing the UserTransaction interface.
*
@@ -71,6 +74,22 @@
public static Test suite() throws Exception
{
- return getDeploySetup(NestedUserTransactionTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(NestedUserTransactionTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,10 +25,13 @@
import javax.naming.InitialContext;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.StatelessSession;
import org.jboss.test.cts.interfaces.StatelessSessionHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Tests of stateful session beans
*
@@ -66,6 +69,22 @@
public static Test suite() throws Exception
{
- return getDeploySetup(StatefulSessionLocalUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(StatefulSessionLocalUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatefulSessionUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -42,14 +42,17 @@
import javax.transaction.UserTransaction;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.BeanContextInfo;
import org.jboss.test.cts.interfaces.StatefulSession;
import org.jboss.test.cts.interfaces.StatefulSessionHome;
import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -822,7 +825,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(StatefulSessionUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(StatefulSessionUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionBrokenCreateUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionBrokenCreateUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionBrokenCreateUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -28,10 +28,13 @@
import javax.rmi.PortableRemoteObject;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.StatelessSession;
import org.jboss.test.cts.interfaces.StatelessSessionHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Simple test to assert the correct exception when
@@ -73,6 +76,21 @@
public static Test suite() throws Exception
{
- return getDeploySetup(StatelessSessionBrokenCreateUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(StatelessSessionBrokenCreateUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionStressTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionStressTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -22,17 +22,18 @@
package org.jboss.test.cts.test;
-import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
+
import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-import org.jboss.test.cts.interfaces.ClientCallback;
-import org.jboss.test.cts.interfaces.StatelessSession;
-import org.jboss.test.cts.interfaces.StatelessSessionHome;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
+import org.jboss.test.cts.interfaces.StatelessSession;
+import org.jboss.test.cts.interfaces.StatelessSessionHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Class StatelessSessionStressTestCase
@@ -107,7 +108,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(StatelessSessionStressTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(StatelessSessionStressTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/StatelessSessionUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -34,12 +34,16 @@
import javax.ejb.CreateException;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.StatelessSession;
import org.jboss.test.cts.interfaces.StatelessSessionHome;
import org.jboss.test.cts.interfaces.StrictlyPooledSessionHome;
import org.jboss.test.cts.interfaces.StrictlyPooledSession;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
+
import EDU.oswego.cs.dl.util.concurrent.CountDown;
/** Basic conformance tests for stateless sessions
@@ -265,7 +269,24 @@
public static Test suite() throws Exception
{
- return getDeploySetup(StatelessSessionUnitTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(StatelessSessionUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/cts/test/UserTransactionLookupTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -27,11 +27,14 @@
import javax.transaction.UserTransaction;
import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
import org.jboss.test.cts.interfaces.CtsCmpHome;
import org.jboss.test.cts.interfaces.CtsCmp;
import org.jboss.test.cts.keys.AccountPK;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/** Tests of accessing the UserTransaction interface.
*
@@ -110,7 +113,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(UserTransactionLookupTestCase.class, "cts.jar");
+ return new JBossTestSetup(new TestSuite(UserTransactionLookupTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/AbstractLifeCycleTestWrapper.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/AbstractLifeCycleTestWrapper.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/ejb/lifecycle/test/AbstractLifeCycleTestWrapper.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -40,6 +40,7 @@
import org.jboss.logging.Logger;
import org.jboss.system.ServiceControllerMBean;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Base TestCase for lifecycle tests. This test overrides the run method of the JUnit test
@@ -159,9 +160,9 @@
*/
protected void deploy() throws Exception
{
- super.setUp();
try
{
+ JMSDestinationsUtil.setupBasicDestinations();
redeploy(getPackage());
}
catch(Exception e)
@@ -179,6 +180,7 @@
protected void undeploy() throws Exception
{
undeploy(getPackage());
+ JMSDestinationsUtil.destroyDestinations();
}
/**
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -25,14 +25,19 @@
import javax.naming.InitialContext;
import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.jboss.proxy.IClientContainer;
import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
+import org.jboss.test.cts.test.BmpUnitTestCase;
import org.jboss.test.invokers.interfaces.SimpleBMP;
import org.jboss.test.invokers.interfaces.SimpleBMPHome;
import org.jboss.test.invokers.interfaces.StatelessSession;
import org.jboss.test.invokers.interfaces.StatelessSessionHome;
import org.jboss.test.invokers.interfaces.BusinessObjectHome;
import org.jboss.test.invokers.interfaces.BusinessObject;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test use of multiple invokers per container
@@ -129,7 +134,23 @@
public static Test suite() throws Exception
{
- return getDeploySetup(MultiInvokersUnitTestCase.class, "invokers.jar");
+ return new JBossTestSetup(new TestSuite(MultiInvokersUnitTestCase.class))
+ {
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ JMSDestinationsUtil.setupBasicDestinations();
+ deploy("cts.jar");
+
+ }
+
+ public void tearDown() throws Exception
+ {
+ undeploy("cts.jar");
+ JMSDestinationsUtil.destroyDestinations();
+ }
+ };
+
}
}
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -43,10 +43,9 @@
import javax.jms.TopicSubscriber;
import javax.naming.Context;
-import junit.framework.TestSuite;
-
import org.jboss.logging.Logger;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* JMSPerfStressTestCase.java Some simple tests of JMS provider
*
@@ -729,7 +728,7 @@
{
// perform any setUp() required by the base class
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
if (context == null)
{
@@ -757,7 +756,7 @@
try {queueConnection.close();} catch (Throwable ignored){}
try {topicConnection.close();} catch (Throwable ignored){}
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -23,8 +23,10 @@
import java.util.ArrayList;
import java.util.Iterator;
+
import javax.jms.Message;
import javax.jms.MessageListener;
+import javax.jms.Queue;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueReceiver;
@@ -38,12 +40,10 @@
import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
-import javax.jms.Queue;
import javax.naming.Context;
-import junit.framework.Test;
-
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* SendReplyPerfStressTestCase.java
@@ -301,7 +301,7 @@
// call setUp() of superclass
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
getLog().info("Starting test: " + getName());
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -21,18 +21,15 @@
*/
package org.jboss.test.jbossmessaging.ra;
-import javax.jms.*;
-import javax.naming.InitialContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
-import org.jboss.test.client.test.AppClientUnitTestCase;
+import org.jboss.test.jmsra.bean.JMSSession;
+import org.jboss.test.jmsra.bean.JMSSessionHome;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
-import org.jboss.test.jmsra.bean.*;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test for jmsra.
*
@@ -66,14 +63,14 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- RaJMSSessionUnitTestCase.setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
deploy ("jmsra.jar");
}
protected void tearDown() throws Exception
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
undeploy ("jmsra.jar");
- RaJMSSessionUnitTestCase.undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
});
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaQueueUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -21,21 +21,17 @@
*/
package org.jboss.test.jbossmessaging.ra;
-import javax.jms.MessageConsumer;
import javax.jms.Queue;
import javax.jms.QueueConnection;
-
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueSession;
import javax.jms.Session;
-
-import javax.management.ObjectName;
-
import javax.naming.Context;
import junit.framework.Test;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
@@ -92,13 +88,13 @@
protected void setUp() throws Exception
{
super.setUp();
- RaQueueUnitTestCase.setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
super.tearDown();
- RaQueueUnitTestCase.undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
};
}
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -28,17 +28,17 @@
import javax.jms.QueueSession;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.ObjectName;
import javax.naming.Context;
import junit.framework.Assert;
import junit.framework.Test;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
-import org.jboss.test.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.util.jms.JMSDestinationsUtil;
/**
*
@@ -195,13 +195,13 @@
protected void setUp() throws Exception
{
super.setUp();
- RaSyncRecUnitTestCase.setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
super.tearDown();
- RaSyncRecUnitTestCase.undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
};
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTopicUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -31,6 +31,7 @@
import junit.framework.Test;
import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test cases for JMS Resource Adapter using a <em>Topic</em> .
@@ -89,13 +90,13 @@
protected void setUp() throws Exception
{
super.setUp();
- RaTopicUnitTestCase.setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
super.tearDown();
- RaTopicUnitTestCase.undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -53,6 +53,7 @@
import org.jboss.logging.Logger;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -86,7 +87,7 @@
protected void setUp() throws Exception
{
super.setUp();
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
@@ -94,7 +95,7 @@
{
super.tearDown();
disconnect();
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
}
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -36,6 +36,7 @@
import javax.naming.InitialContext;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* JBossSessionRecoverUnitTestCase.java
@@ -68,7 +69,7 @@
// call setUp() in superclass
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
this.getLog().debug("JBossSessionRecoverUnitTestCase, ConnectionFactory started");
}
@@ -77,7 +78,7 @@
{
this.getLog().debug("JBossSessionRecoverUnitTestCase, ConnectionFactory done");
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
// call tearDown() in superclass
super.tearDown() ;
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -49,6 +49,7 @@
import org.jboss.logging.Logger;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -78,7 +79,7 @@
{
super.setUp();
context = new InitialContext();
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
@@ -91,7 +92,7 @@
{
super.tearDown();
disconnect();
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -38,6 +38,7 @@
import javax.naming.Context;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Tests message bodies.
@@ -71,7 +72,7 @@
// call setUp() in the superclass
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
connect();
}
@@ -80,7 +81,7 @@
{
disconnect();
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
// call tearDown() in the superclass to cleanup
super.tearDown() ;
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -43,6 +43,7 @@
import junit.framework.Test;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Tests of sending/receiving all jms message types to/from a queue
@@ -236,7 +237,7 @@
// call setUp() in superclass
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
context = new InitialContext();
QueueConnectionFactory queueFactory = (QueueConnectionFactory) context.lookup(QUEUE_FACTORY);
@@ -257,7 +258,7 @@
session.close();
queueConnection.close();
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
// call tearDown() in superclass
super.tearDown() ;
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -47,6 +47,7 @@
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Rollback tests
@@ -540,7 +541,7 @@
{
super.setUp();
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
getLog().debug("START TEST " + getName());
context = getInitialContext();
@@ -592,7 +593,7 @@
{
}
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -24,6 +24,7 @@
import junit.framework.Assert;
import org.jboss.test.jbossmessaging.JMSBase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Test of security features in JMS providers
*
@@ -41,12 +42,12 @@
protected void setUp() throws Exception
{
super.setUp();
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SessionCloseStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SessionCloseStressTestCase.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SessionCloseStressTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -38,6 +38,7 @@
import junit.framework.Test;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Tests for receiving while closing the session
@@ -325,7 +326,13 @@
public void setUp() throws Exception
{
super.setUp();
- this.setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
+
+ public void tearDown() throws Exception
+ {
+ JMSDestinationsUtil.destroyDestinations();
+ super.tearDown();
+ }
}
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -45,6 +45,7 @@
import org.jboss.logging.Logger;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Rollback tests
@@ -573,7 +574,7 @@
// call setUp() in superclass
super.setUp() ;
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
if (context == null)
{
@@ -608,7 +609,9 @@
topicDurableConnection = null;
}
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
+
+ super.tearDown();
}
// Emptys out all the messages in a queue
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-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -37,6 +37,7 @@
import junit.framework.Test;
import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* XAResource tests
@@ -60,12 +61,12 @@
protected void setUp() throws Exception
{
super.setUp();
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void tearDown() throws Exception
{
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -41,6 +41,7 @@
import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.jms.JMSTestAdmin;
import org.jboss.test.messagedriven.mbeans.TestMessageDrivenManagementMBean;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
/**
* Basic tests of message driven beans
@@ -66,7 +67,7 @@
protected static ObjectName testDurableTopic = JMSTestAdmin.getAdmin().createTopicJMXName("testDurableTopic");
protected static Properties testDurableTopicProps = new Properties();
- protected static ObjectName dlqJMXDestination = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=DLQ");
+ protected static ObjectName dlqJMXDestination = JMSTestAdmin.getAdmin().createQueueJMXName("DLQ");
protected static boolean isJBossMessaging()
{
@@ -82,16 +83,6 @@
static
{
-
-
- if (isJBossMessaging())
- {
- testQueue = ObjectNameFactory.create("jboss.messaging.destination:service=Queue,name=testQueue");
- testTopic = ObjectNameFactory.create("jboss.messaging.destination:service=Topic,name=testTopic");
- testDurableTopic = ObjectNameFactory.create("jboss.messaging.destination:service=Topic,name=testDurableTopic");
- dlqJMXDestination = ObjectNameFactory.create("jboss.messaging.destination:service=Queue,name=DLQ");
- }
-
testQueueProps.put("destination", "queue/testQueue");
testQueueProps.put("destinationType", "javax.jms.Queue");
@@ -251,7 +242,7 @@
protected void deployDestinations() throws Exception
{
- setupBasicDestinations();
+ JMSDestinationsUtil.setupBasicDestinations();
}
protected void setUp() throws Exception
@@ -282,7 +273,7 @@
getLog().error("Error undeploying: " + mbeansar, t);
}
if (isDeployDestinations())
- undeployDestinations();
+ JMSDestinationsUtil.destroyDestinations();
super.tearDown();
}
Added: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java (rev 0)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java 2010-02-23 04:03:47 UTC (rev 101305)
@@ -0,0 +1,51 @@
+package org.jboss.test.util.jms;
+
+import org.jboss.logging.Logger;
+import org.jboss.test.jms.JMSTestAdmin;
+import org.jboss.test.jms.TestRole;
+
+public class JMSDestinationsUtil
+{
+
+ private static final Logger log = Logger.getLogger(JMSDestinationsUtil.class);
+
+ /**
+ * Historically at jboss, lots of tests will use these destinations since JBoss 3.
+ * This method is a tool to create the basic setting that most tests will use.
+ * @throws Exception
+ */
+ public static void setupBasicDestinations() throws Exception
+ {
+ JMSTestAdmin admin = JMSTestAdmin.getAdmin();
+ admin.createTopic("securedTopic", new TestRole[]{
+ new TestRole("publisher", true, true, false)});
+ admin.createTopic("testTopic", new TestRole[]{
+ new TestRole("guest", true, true, true),
+ new TestRole("publisher", true, true, true),
+ new TestRole("durpublisher", true, true, true)});
+ admin.createTopic("testDurableTopic", new TestRole[]{
+ new TestRole("guest", true, true, true),
+ new TestRole("publisher", true, true, true),
+ new TestRole("durpublisher", true, true, true)});
+
+ admin.createQueue("testQueue", new TestRole[]{
+ new TestRole("guest", true, true, true),
+ new TestRole("publisher", true, true, true),
+ new TestRole("durpublisher", true, true, true)});
+
+ admin.createQueue("A", new TestRole("guest", true, true, true));
+ admin.createQueue("B", new TestRole("guest", true, true, true));
+ admin.createQueue("C", new TestRole("guest", true, true, true));
+ admin.createQueue("D", new TestRole("guest", true, true, true));
+ admin.createQueue("ex", new TestRole("guest", true, true, true));
+ }
+
+ /** This will remove all destinations created during the test */
+ public static void destroyDestinations() throws Exception
+ {
+ JMSTestAdmin.getAdmin().destroyCreatedDestinations();
+ }
+
+
+
+}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml 2010-02-23 03:30:28 UTC (rev 101304)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/resources/cts/META-INF/jboss.xml 2010-02-23 04:03:47 UTC (rev 101305)
@@ -101,12 +101,10 @@
<ejb-name>StrictlyPooledMDB</ejb-name>
<destination-jndi-name>queue/A</destination-jndi-name>
<configuration-name>Strictly Pooled Message Driven Bean</configuration-name>
- <depends>org.hornetq:module=JMS,name="A",type=DeployedQueue</depends>
</message-driven>
<message-driven>
<ejb-name>SubclassMDB</ejb-name>
<destination-jndi-name>queue/C</destination-jndi-name>
- <depends>org.hornetq:module=JMS,name="C",type=DeployedQueue</depends>
</message-driven>
</enterprise-beans>
More information about the jboss-cvs-commits
mailing list