[jboss-cvs] JBossAS SVN: r100290 - in branches/Branch_Hornet_Temporary_2/testsuite: src/main/org/jboss/test/client/test and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 2 14:35:13 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-02 14:35:09 -0500 (Tue, 02 Feb 2010)
New Revision: 100290
Removed:
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java
Modified:
branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jacc/test/WebIntegrationUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.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/JMSReconnectStressTestCase.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/RaSyncRecUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConcurrentDeliveryUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConnectionConsumerUnitTestCase.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/TemporarySessionConnectionUnitTestCase.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/jbossmessaging/test/XAResourceWrapperSmokeUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/joram/JoramTestAdminDelegate.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTest.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmx/test/RedeployStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
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/naming/test/ENCUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/NamingStressTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/refs/test/ResourceResolutionUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java
branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
Log:
test fixes
Modified: branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/imports/sections/cts.xml 2010-02-02 19:35:09 UTC (rev 100290)
@@ -43,12 +43,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}/messaging">
- <include name="test-destinations-full-service.xml"/>
- </fileset>
- </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/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/client/test/AppClientUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -148,7 +148,6 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
deploy ("app-client.ear");
}
protected void tearDown() throws Exception
@@ -156,7 +155,6 @@
super.tearDown();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
undeploy ("app-client.ear");
- undeploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
}
});
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jacc/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jacc/test/WebIntegrationUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jacc/test/WebIntegrationUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -75,32 +75,12 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
redeploy("jbosstest-web.ear");
flushAuthCache("jbosstest-web");
}
protected void tearDown() throws Exception
{
undeploy("jbosstest-web.ear");
-
- try
- {
- // Remove all the messages created during this test
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- }
- catch(Exception e)
- {
- }
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
super.tearDown();
}
};
Deleted: 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-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JBossJMSTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -1,206 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.jbossmessaging;
-
-import java.util.ArrayList;
-
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NamingEnumeration;
-
-import org.jboss.jms.testintegration.JMSTestAdmin;
-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.
- *
- * Warning: If you override setUp() or tearDown(), rememeber to call the
- * superclass versions of these methods within your overriding methods.
- * AbstractTestCase uses setUp() and tearDown() to initialise logging.
- *
- * @author <a href="richard.achmatowicz at jboss.com">Richard Achmatowicz</a>
- * @version $Revision$
- */
-public class JBossJMSTestCase extends JBossTestCase
-{
- /** JBM provider properties resource name */
-
-
- /**
- * Constructor for JMSTestCase object
- *
- * @param name
- * test case name
- */
- public JBossJMSTestCase(String name)
- {
- super(name);
- }
-
-
- protected static Object deployTopic(String name, TestRole[] securityConfig) throws Exception
- {
- return JMSTestAdmin.getAdmin().createTopic(name, securityConfig);
- }
-
- protected static Object deployQueue(String name, TestRole[] securityConfig) throws Exception
- {
- return JMSTestAdmin.getAdmin().createQueue(name, securityConfig);
- }
-
- /**
- * Create the Admin object to perform all JMS adminsitrative functions in a
- * JMS provider-independent manner
- */
- protected void setUp() throws Exception
- {
- // perform any setUp required in the superclass
- super.setUp();
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- protected static void undeployDestinations() throws Exception
- {
- JMSTestAdmin.getAdmin().undeployCreatedDestinations();
- }
-
-
- 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 static void setupBasicDestinations() throws Exception
- {
- deployTopic("securedTopic", null);
- deployTopic("testDurableTopic", null);
- deployTopic("testTopic", null);
-
- deployQueue("testQueue", null);
- deployQueue("A", null);
- deployQueue("B", null);
- deployQueue("C", null);
- deployQueue("D", null);
- deployQueue("ex", null);
- }
-
-
-
- /**
- * Create a JMS Queue.
- *
- * The Queue is created dynamically, in a JMS provider-specific manner,
- * according to the instance of the Admin interface currently in use.
- *
- * @param name
- * The name of the Queue to be created.
- */
- public Object createQueue(String name) throws Exception
- {
- return deployQueue(name, null);
- }
-
- /**
- * Delete a JMS Queue.
- *
- * The Queue is deleted dynamically, in a JMS provider-specific manner,
- * according to the instance of the Admin interface currently in use.
- *
- * @param name
- * The name of the Queue to be deleted.
- */
- public void deleteQueue(Object name)
- {
- try
- {
- undeployQueue(name);
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException("deleteQueue() operation failed", e);
- }
- }
-
- /**
- * Create a JMS Topic.
- *
- * The Topic is created dynamically, in a JMS provider-specific manner,
- * according to the instance of the Admin interface currently in use.
- *
- * @param name
- * The name of the Topic to be created.
- */
- public Object createTopic(String name) throws Exception
- {
- return deployTopic(name, null);
- }
-
- /**
- * Delete a JMS Topic.
- *
- * The Topic is deleted dynamically, in a JMS provider-specific manner,
- * according to the instance of the Admin interface currently in use.
- *
- * @param name
- * The name of the Topic to be deleted.
- */
- public void deleteTopic(Object name) throws Exception
- {
- undeployTopic(name);
- }
-
- protected void dumpJNDIContext(String context)
- {
- try
- {
- log.info("Dumping JNDI context:" + context);
-
- // dump out the context name-value bindings
- InitialContext ic = getInitialContext();
- NamingEnumeration list = ic.list(context);
-
- while (list.hasMore())
- {
- NameClassPair nc = (NameClassPair) list.next();
- log.info(nc.toString());
- }
- log.info("Dumped JNDI context");
- }
- catch (Exception e)
- {
- throw new NestedRuntimeException("error dumping JNDI context", e);
- }
- }
-
-}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -48,6 +48,7 @@
import javax.naming.NamingException;
import org.jboss.logging.Logger;
+import org.jboss.test.JBossJMSTestCase;
/**
* JMS tests base class.
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSPerfStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -44,7 +44,7 @@
import junit.framework.Test;
import org.jboss.logging.Logger;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* JMSPerfStressTestCase.java Some simple tests of JMS provider
*
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSReconnectStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSReconnectStressTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/JMSReconnectStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -25,7 +25,7 @@
import javax.jms.QueueConnectionFactory;
import javax.naming.InitialContext;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Reconnect stress
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-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -36,7 +36,7 @@
import javax.jms.Session;
import javax.naming.InitialContext;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* A stress test for an impatient receiver
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/perf/SendReplyPerfStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -43,7 +43,7 @@
import junit.framework.Test;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* SendReplyPerfStressTestCase.java
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -24,7 +24,7 @@
import javax.jms.*;
import javax.naming.InitialContext;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
import org.jboss.test.client.test.AppClientUnitTestCase;
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -35,7 +35,7 @@
import junit.framework.Test;
import org.jboss.test.JBossTestSetup;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+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;
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -33,7 +33,7 @@
import junit.framework.TestCase;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.jmsra.bean.*;
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConcurrentDeliveryUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConcurrentDeliveryUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConcurrentDeliveryUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -32,7 +32,7 @@
import javax.jms.TemporaryQueue;
import javax.naming.Context;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Concurrent delivery tests
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConnectionConsumerUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConnectionConsumerUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/ConnectionConsumerUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -35,7 +35,7 @@
import javax.jms.TopicSession;
import javax.naming.InitialContext;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.jbossmessaging.MockServerSessionPool;
/**
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossJMSUnitTest.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -52,7 +52,7 @@
import javax.naming.InitialContext;
import org.jboss.logging.Logger;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
@@ -82,6 +82,21 @@
{
super(name);
}
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ setupBasicDestinations();
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ disconnect();
+ undeployDestinations();
+ }
+
// Emptys out all the messages in a queue
protected void drainQueue() throws Exception
@@ -137,12 +152,6 @@
topicConnection = null;
}
}
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- disconnect();
- }
/**
* Test that messages are ordered by message arrival and priority.
@@ -1352,12 +1361,5 @@
}
}
}
-
- public static junit.framework.Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(JBossJMSUnitTest.class,
- loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
- }
}
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/JBossSessionRecoverUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -35,7 +35,7 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* JBossSessionRecoverUnitTestCase.java
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/Jms11UnitTest.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -48,7 +48,7 @@
import javax.naming.InitialContext;
import org.jboss.logging.Logger;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import EDU.oswego.cs.dl.util.concurrent.CountDown;
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageBodyUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -37,7 +37,7 @@
import javax.jms.TextMessage;
import javax.naming.Context;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Tests message bodies.
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/MessageTypesUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -42,7 +42,7 @@
import junit.framework.Test;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Tests of sending/receiving all jms message types to/from a queue
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/RollBackUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -46,7 +46,7 @@
import org.jboss.logging.Logger;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Rollback tests
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -26,7 +26,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.test.JBossTestSetup;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.jbossmessaging.JMSBase;
/**
* Test of security features in JMS providers
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/SessionCloseStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -37,7 +37,7 @@
import junit.framework.Test;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Tests for receiving while closing the session
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/TemporarySessionConnectionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/TemporarySessionConnectionUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/TemporarySessionConnectionUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -29,7 +29,7 @@
import javax.jms.TemporaryQueue;
import javax.naming.Context;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Tests for temporaries and session/connection consumer construction
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/UnackedUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -44,7 +44,7 @@
import junit.framework.TestSuite;
import org.jboss.logging.Logger;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* Rollback tests
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -36,7 +36,7 @@
import junit.framework.Test;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
/**
* XAResource tests
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceWrapperSmokeUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceWrapperSmokeUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/XAResourceWrapperSmokeUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -27,7 +27,7 @@
import junit.framework.Test;
import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.test.jbossmessaging.JBossJMSTestCase;
+import org.jboss.test.JBossJMSTestCase;
import org.jboss.test.JBossTestSetup;
/**
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/joram/JoramTestAdminDelegate.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/joram/JoramTestAdminDelegate.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jbossmessaging/test/joram/JoramTestAdminDelegate.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -26,7 +26,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.jms.testintegration.JMSTestAdmin;
+import org.jboss.test.jms.JMSTestAdmin;
import org.jboss.logging.Logger;
import org.jboss.util.NestedRuntimeException;
import org.objectweb.jtests.jms.admin.Admin;
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaJMSSessionUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -65,14 +65,12 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-service.xml").toString());
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());
}
});
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -90,24 +90,11 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-service.xml").toString());
}
protected void tearDown() throws Exception
{
super.tearDown();
-
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("messaging/test-destinations-service.xml").toString());
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -173,24 +173,11 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
}
protected void tearDown() throws Exception
{
super.tearDown();
-
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTest.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTest.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTest.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -284,12 +284,5 @@
// getLog().debug(" > Flushed");
}
- public static junit.framework.Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- return getDeploySetup(RaTest.class,
- loader.getResource("messaging/test-destinations-service.xml").toString());
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -90,24 +90,11 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-service.xml").toString());
}
protected void tearDown() throws Exception
{
super.tearDown();
-
- // Remove the messages
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("messaging/test-destinations-service.xml").toString());
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmx/test/RedeployStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmx/test/RedeployStressTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/jmx/test/RedeployStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.jmx.test;
-import javax.management.ObjectName;
-
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -53,27 +51,9 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy(loader.getResource("messaging/test-destinations-full-service.xml").toString());
}
protected void tearDown() throws Exception
{
- try
- {
- // Remove all the messages created during this test
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- }
- catch(Exception e)
- {
- }
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy(loader.getResource("messaging/test-destinations-full-service.xml").toString());
super.tearDown();
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -274,28 +274,12 @@
{
super.setUp();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
deploy("mdb.jar");
}
protected void tearDown() throws Exception
{
super.tearDown();
-
- // Remove the DLQ messages created by the TxTimeout test
- try
- {
- getServer().invoke(
- new ObjectName(
- "jboss.messaging.destination:service=Queue,name=DLQ"),
- "removeAllMessages", new Object[0], new String[0]);
- }
- catch (Exception ignored)
- {
- getLog().warn("unable to clear dlq", ignored);
- }
-
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try
{
@@ -305,39 +289,6 @@
{
getLog().warn("Unable to undeploy mdb.jar", ignored);
}
-
- try
- {
- // Remove the durable subscription
- TopicConnectionFactory topicFactory = (TopicConnectionFactory) getInitialContext()
- .lookup(TOPIC_FACTORY);
- TopicConnection topicConnection = topicFactory
- .createTopicConnection("john", "needle");
- try
- {
- TopicSession session = topicConnection.createTopicSession(false,
- Session.AUTO_ACKNOWLEDGE);
- session.unsubscribe("DurableSubscriberExample");
- }
- finally
- {
- topicConnection.close();
- }
- }
- catch (Exception ignored)
- {
- getLog().warn("Unable to unsubscribe", ignored);
- }
-
- try
- {
- undeploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
- }
- catch (Exception ignored)
- {
- getLog().warn("Unable to remove destinations", ignored);
- }
}
};
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-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.messagedriven.support;
-import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Properties;
@@ -31,17 +30,16 @@
import javax.jms.Destination;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
-import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.management.Attribute;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.naming.Util;
-import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossJMSTestCase;
+import org.jboss.test.jms.JMSTestAdmin;
import org.jboss.test.messagedriven.mbeans.TestMessageDrivenManagementMBean;
/**
@@ -50,27 +48,25 @@
* @author <a href="mailto:adrian at jboss.com>Adrian Brock</a>
* @version <tt>$Revision: 1.4</tt>
*/
-public abstract class BasicMessageDrivenUnitTest extends JBossTestCase implements ExceptionListener
+public abstract class BasicMessageDrivenUnitTest extends JBossJMSTestCase implements ExceptionListener
{
protected static final long WAIT_TIME = 5000L;
protected static final long REPEATED_WAIT = 4;
protected static ObjectName ejbParsingDeployer = ObjectNameFactory.create("jboss.ejb:service=EjbParsingDeployer");
- protected static ObjectName testQueue = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=testQueue");
+ protected static ObjectName testQueue = JMSTestAdmin.getAdmin().createQueueJMXName("testQueue");
protected static Properties testQueueProps = new Properties();
protected static Properties testQueueNoDestinationTypeProps = new Properties();
- protected static ObjectName testTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testTopic");
+ protected static ObjectName testTopic = JMSTestAdmin.getAdmin().createTopicJMXName("testTopic");
protected static Properties testTopicProps = new Properties();
protected static Properties testTopicNoDestinationTypeProps = new Properties();
- protected static ObjectName testDurableTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testDurableTopic");
+ 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 String destinations = "messaging/test-destinations-full-service.xml";
protected static boolean isJBossMessaging()
{
@@ -94,7 +90,6 @@
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");
- destinations = "jbossmessaging/test-destinations-full-service.xml";
}
testQueueProps.put("destination", "queue/testQueue");
@@ -256,29 +251,9 @@
protected void deployDestinations() throws Exception
{
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- URL url = classLoader.getResource(destinations);
- if (url == null)
- throw new Error(destinations + " not found");
- deploy(url.toString());
+ setupBasicDestinations();
}
- protected void undeployDestinations() throws Exception
- {
- try
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- URL url = classLoader.getResource(destinations);
- if (url == null)
- throw new Error(destinations + " not found");
- undeploy(url.toString());
- }
- catch (Throwable t)
- {
- getLog().error("Error undeploying: " + destinations, t);
- }
- }
-
protected void setUp() throws Exception
{
super.setUp();
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/ENCUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/ENCUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/ENCUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -93,13 +93,4 @@
bean.remove();
}
- public static Test suite() throws Exception
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- URL url = loader.getResource("messaging/test-destinations-full-service.xml");
- if (url == null)
- throw new RuntimeException("test queues not found");
- return getDeploySetup(ENCUnitTestCase.class, url.toString() + ",naming.jar");
- }
-
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/NamingStressTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/NamingStressTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/naming/test/NamingStressTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.naming.test;
-import java.net.URL;
import java.util.Properties;
+
import junit.framework.Test;
import org.jboss.test.JBossTestCase;
@@ -44,9 +44,6 @@
public static Test suite() throws Exception
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
- URL url = loader.getResource("messaging/test-destinations-full-service.xml");
- if (url == null)
- throw new RuntimeException("test queues not found");
Properties props = new Properties();
props.setProperty("ejbRunnerJndiName", "EJBTestRunnerHome");
@@ -54,7 +51,7 @@
props.setProperty("encIterations", "1000");
JBossTestSuite testSuite = new JBossTestSuite(props);
testSuite.addTestSuite(NamingTests.class);
- return getDeploySetup(testSuite, url+",naming.jar");
+ return getDeploySetup(testSuite, "naming.jar");
}
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/refs/test/ResourceResolutionUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/refs/test/ResourceResolutionUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/refs/test/ResourceResolutionUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -106,15 +106,11 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
}
protected void tearDown() throws Exception
{
super.tearDown();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy (loader.getResource("jbossmessaging/test-destinations-service.xml").toString());
}
};
}
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/timer/test/BasicTimerUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -77,8 +77,6 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
deploy (EJB_TIMER_XAR);
}
protected void tearDown() throws Exception
@@ -86,7 +84,6 @@
super.tearDown();
ClassLoader loader = Thread.currentThread().getContextClassLoader();
undeploy (EJB_TIMER_XAR);
- undeploy (loader.getResource("messaging/test-destinations-full-service.xml").toString());
}
});
Modified: branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-02-02 19:33:34 UTC (rev 100289)
+++ branches/Branch_Hornet_Temporary_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2010-02-02 19:35:09 UTC (rev 100290)
@@ -509,33 +509,12 @@
protected void setUp() throws Exception
{
super.setUp();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- deploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
redeploy("jbosstest-web.ear");
flushAuthCache("jbosstest-web");
}
protected void tearDown() throws Exception
{
undeploy("jbosstest-web.ear");
-
- try
- {
- // Remove all the messages created during this test
- getServer().invoke
- (
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
- "removeAllMessages",
- new Object[0],
- new String[0]
- );
- }
- catch(Exception e)
- {
- }
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- undeploy(loader.getResource(
- "messaging/test-destinations-full-service.xml").toString());
super.tearDown();
}
More information about the jboss-cvs-commits
mailing list