[jboss-svn-commits] JBL Code SVN: r23297 - in labs/jbossesb/workspace/skeagh: commons and 26 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 3 12:36:39 EDT 2008
Author: tfennelly
Date: 2008-10-03 12:36:38 -0400 (Fri, 03 Oct 2008)
New Revision: 23297
Added:
labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/JmsProvider.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestBusProvider.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestRunner.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/TestBusProvider.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/package.html
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/DeployRedeployTest.java
Removed:
labs/jbossesb/workspace/skeagh/testutil/
Modified:
labs/jbossesb/workspace/skeagh/commons/pom.xml
labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java
labs/jbossesb/workspace/skeagh/performance/pom.xml
labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/SimpleSoakTest.java
labs/jbossesb/workspace/skeagh/pom.xml
labs/jbossesb/workspace/skeagh/routing/jms/pom.xml
labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java
labs/jbossesb/workspace/skeagh/routing/pom.xml
labs/jbossesb/workspace/skeagh/runtime/osgi.bnd
labs/jbossesb/workspace/skeagh/runtime/pom.xml
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentCoordinatorTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java
labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java
Log:
Removed test utils and moved into the runtime module
Modified: labs/jbossesb/workspace/skeagh/commons/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/commons/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,13 +22,18 @@
<version>${jboss.eap.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>jboss.jbossesb</groupId>
- <artifactId>jbossesb-testutil</artifactId>
- <version>${jboss.esb.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.2</version>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
Added: labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/JmsProvider.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/JmsProvider.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/JmsProvider.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.jms;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+
+import javax.naming.Context;
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * Jms Provider that can be uses in funtional/integration tests.
+ * <p/>
+ * <br>
+ * Usage:
+ * <pre>
+ * private static JmsTestProvider jmsProvider;
+ *
+ * @BeforeClass
+ * public static void startProvider() throws Exception
+ * {
+ * jmsProvider = new JmsTestProvider();
+ * jmsProvider.start();
+ * }
+ *
+ * @AfterClass
+ * public static void stopProvider() throws Exception
+ * {
+ * jmsProvider.stop();
+ * }
+ *
+ * @Test
+ * public void testSomething()
+ * {
+ * ...
+ * }
+ * </pre>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class JmsProvider
+{
+ /**
+ * Default provider URL.
+ */
+ public static final String DEFAULT_PROVIDER_URL = "tcp://localhost:61717";
+
+ /**
+ * JNDI properties.
+ */
+ private Properties jndiProperties;
+
+ /**
+ * Default JNDI Provider URL.
+ */
+ private String providerUrl = DEFAULT_PROVIDER_URL;
+
+ /**
+ * Jms broker
+ */
+ private BrokerService broker;
+
+ /**
+ * Public constructor.
+ */
+ public JmsProvider()
+ {
+ jndiProperties = new Properties();
+ jndiProperties.setProperty(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getName());
+ jndiProperties.setProperty(Context.PROVIDER_URL, DEFAULT_PROVIDER_URL);
+ }
+
+ /**
+ * Public constructor.
+ *
+ * @param providerUrl Provider URL.
+ */
+ public JmsProvider(final String providerUrl)
+ {
+ this();
+ jndiProperties.setProperty(Context.PROVIDER_URL, providerUrl);
+ this.providerUrl = providerUrl;
+ }
+
+ /**
+ * Get the JNDI properties in use by this test runner instance.
+ *
+ * @return The JNDI properties.
+ */
+ public final Properties getJndiProperties()
+ {
+ return (Properties) jndiProperties.clone();
+ }
+
+ /**
+ * Start the JMS Broker
+ *
+ * @throws Exception Error starting the broker.
+ */
+ public final void start() throws Exception
+ {
+ broker = new BrokerService();
+
+ // configure the broker
+ broker.setDataDirectory(new File("./target/activeMQData"));
+ broker.addConnector(providerUrl);
+
+ broker.start();
+
+ }
+
+ /**
+ * Stop the JMS Broker
+ *
+ * @throws Exception Error stopping the broker.
+ */
+ public final void stop() throws Exception
+ {
+ if (broker !=null)
+ {
+ broker.stop();
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/JmsProvider.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -55,127 +55,129 @@
private void test_Destination_noselector(final Class<? extends Destination> destType, final String destName) throws Exception
{
- new JmsTestRunner() {
- @Override
- public void test() throws Exception
+ JmsProvider jmsProvider = new JmsProvider();
+ jmsProvider.start();
+
+ try {
+ Properties jndiProperties = jmsProvider.getJndiProperties();
+ JMSSession jmsSession1 = new JMSSession(destType, jndiProperties);
+ JMSSession jmsSession2 = new JMSSession(destType, jndiProperties);
+
+ jmsSession1.connect();
+ jmsSession2.connect();
+ try
{
- Properties jndiProperties = getJndiProperties();
- JMSSession jmsSession1 = new JMSSession(destType, jndiProperties);
- JMSSession jmsSession2 = new JMSSession(destType, jndiProperties);
+ if(destType == Topic.class) {
+ jndiProperties.setProperty("topic." + destName, destName);
+ } else {
+ jndiProperties.setProperty("queue." + destName, destName);
+ }
- jmsSession1.connect();
- jmsSession2.connect();
- try
- {
- if(destType == Topic.class) {
- jndiProperties.setProperty("topic." + destName, destName);
- } else {
- jndiProperties.setProperty("queue." + destName, destName);
- }
+ MockMessageListener<TextMessage> listener = new MockMessageListener<TextMessage>(destName, jmsSession1, null);
- MockMessageListener<TextMessage> listener = new MockMessageListener<TextMessage>(destName, jmsSession1, null);
+ listener.connect();
+ assertTrue(destType.isAssignableFrom(listener.getDestination().getClass()));
+ try {
+ MessageSender sender = new MessageSender(destName, jmsSession2);
+ List<String> messagesSent = Arrays.asList(new String[] {"message 1", "message 2", "message 3"});
- listener.connect();
- assertTrue(destType.isAssignableFrom(listener.getDestination().getClass()));
+ sender.connect();
+ assertTrue(destType.isAssignableFrom(sender.getDestination().getClass()));
try {
- MessageSender sender = new MessageSender(destName, jmsSession2);
- List<String> messagesSent = Arrays.asList(new String[] {"message 1", "message 2", "message 3"});
-
- sender.connect();
- assertTrue(destType.isAssignableFrom(sender.getDestination().getClass()));
- try {
- for (String message : messagesSent)
- {
- sender.send(sender.getSession().createTextMessage(message));
- }
- } finally {
- sender.close();
+ for (String message : messagesSent)
+ {
+ sender.send(sender.getSession().createTextMessage(message));
}
-
- Thread.sleep(1000);
- assertEquals(3, listener.getMessages().size());
- assertTrue(messagesSent.contains(listener.getMessages().get(0).getText()));
- assertTrue(messagesSent.contains(listener.getMessages().get(1).getText()));
- assertTrue(messagesSent.contains(listener.getMessages().get(2).getText()));
} finally {
- listener.close();
+ sender.close();
}
+
+ Thread.sleep(1000);
+ assertEquals(3, listener.getMessages().size());
+ assertTrue(messagesSent.contains(listener.getMessages().get(0).getText()));
+ assertTrue(messagesSent.contains(listener.getMessages().get(1).getText()));
+ assertTrue(messagesSent.contains(listener.getMessages().get(2).getText()));
} finally {
- jmsSession1.close();
- jmsSession2.close();
+ listener.close();
}
+ } finally {
+ jmsSession1.close();
+ jmsSession2.close();
}
- }.run();
+ } finally {
+ jmsProvider.stop();
+ }
}
private void test_Destination_withselector(final Class<? extends Destination> destType, final String destName) throws Exception
{
- new JmsTestRunner() {
- @Override
- public void test() throws Exception
+ JmsProvider jmsProvider = new JmsProvider();
+ jmsProvider.start();
+
+ try {
+ Properties jndiProperties = jmsProvider.getJndiProperties();
+ JMSSession jmsSession1 = new JMSSession(destType, jndiProperties);
+ JMSSession jmsSession2 = new JMSSession(destType, jndiProperties);
+
+ jmsSession1.connect();
+ jmsSession2.connect();
+ try
{
- Properties jndiProperties = getJndiProperties();
- JMSSession jmsSession1 = new JMSSession(destType, jndiProperties);
- JMSSession jmsSession2 = new JMSSession(destType, jndiProperties);
+ if(destType == Topic.class) {
+ jndiProperties.setProperty("topic." + destName, destName);
+ } else {
+ jndiProperties.setProperty("queue." + destName, destName);
+ }
- jmsSession1.connect();
- jmsSession2.connect();
- try
- {
- if(destType == Topic.class) {
- jndiProperties.setProperty("topic." + destName, destName);
- } else {
- jndiProperties.setProperty("queue." + destName, destName);
- }
+ MockMessageListener<TextMessage> service1 = new MockMessageListener<TextMessage>(destName, jmsSession1, "serviceId='service1'");
+ MockMessageListener<TextMessage> service2 = new MockMessageListener<TextMessage>(destName, jmsSession1, "serviceId='service2'");
+ List<String> service1Messages = Arrays.asList(new String[] {"message 1", "message 2", "message 3"});
+ List<String> service2Messages = Arrays.asList(new String[] {"message 4", "message 5", "message 6"});
- MockMessageListener<TextMessage> service1 = new MockMessageListener<TextMessage>(destName, jmsSession1, "serviceId='service1'");
- MockMessageListener<TextMessage> service2 = new MockMessageListener<TextMessage>(destName, jmsSession1, "serviceId='service2'");
- List<String> service1Messages = Arrays.asList(new String[] {"message 1", "message 2", "message 3"});
- List<String> service2Messages = Arrays.asList(new String[] {"message 4", "message 5", "message 6"});
+ service1.connect();
+ try {
+ service2.connect();
+ try {
+ MessageSender sender = new MessageSender(destName, jmsSession2);
- service1.connect();
- try {
- service2.connect();
+ sender.connect();
try {
- MessageSender sender = new MessageSender(destName, jmsSession2);
-
- sender.connect();
- try {
- for (String message : service1Messages)
- {
- send(sender, message, "service1");
- }
- for (String message : service2Messages)
- {
- send(sender, message, "service2");
- }
- } finally {
- sender.close();
+ for (String message : service1Messages)
+ {
+ send(sender, message, "service1");
}
+ for (String message : service2Messages)
+ {
+ send(sender, message, "service2");
+ }
+ } finally {
+ sender.close();
+ }
- Thread.sleep(1000);
+ Thread.sleep(1000);
- assertEquals(3, service1.getMessages().size());
- assertTrue(service1Messages.contains(service1.getMessages().get(0).getText()));
- assertTrue(service1Messages.contains(service1.getMessages().get(1).getText()));
- assertTrue(service1Messages.contains(service1.getMessages().get(2).getText()));
+ assertEquals(3, service1.getMessages().size());
+ assertTrue(service1Messages.contains(service1.getMessages().get(0).getText()));
+ assertTrue(service1Messages.contains(service1.getMessages().get(1).getText()));
+ assertTrue(service1Messages.contains(service1.getMessages().get(2).getText()));
- assertEquals(3, service2.getMessages().size());
- assertTrue(service2Messages.contains(service2.getMessages().get(0).getText()));
- assertTrue(service2Messages.contains(service2.getMessages().get(1).getText()));
- assertTrue(service2Messages.contains(service2.getMessages().get(2).getText()));
- } finally {
- service2.close();
- }
+ assertEquals(3, service2.getMessages().size());
+ assertTrue(service2Messages.contains(service2.getMessages().get(0).getText()));
+ assertTrue(service2Messages.contains(service2.getMessages().get(1).getText()));
+ assertTrue(service2Messages.contains(service2.getMessages().get(2).getText()));
} finally {
- service1.close();
+ service2.close();
}
} finally {
- jmsSession1.close();
- jmsSession2.close();
+ service1.close();
}
+ } finally {
+ jmsSession1.close();
+ jmsSession2.close();
}
- }.run();
+ } finally {
+ jmsProvider.stop();
+ }
}
private void send(MessageSender sender, String message, String service)
Modified: labs/jbossesb/workspace/skeagh/performance/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/performance/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/performance/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -21,22 +21,10 @@
</dependency>
<dependency>
- <groupId>jboss.jbossesb</groupId>
- <artifactId>jbossesb-testutil</artifactId>
- <version>${jboss.esb.version}</version>
- </dependency>
-
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/SimpleSoakTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/SimpleSoakTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/performance/src/test/java/org/jboss/esb/SimpleSoakTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -19,30 +19,41 @@
*/
package org.jboss.esb;
-import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentException;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestProvider;
import org.jboss.esb.service.ServiceName;
+import org.jboss.esb.test.JBossESBTestCase;
+import org.jboss.esb.test.JmsTestBusProvider;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class SimpleSoakTest extends TestCase {
+public class SimpleSoakTest extends JBossESBTestCase {
+
+ public SimpleSoakTest() {
+ // Use the JMS Bus Provider...
+ super(new JmsTestBusProvider());
+ }
- private JmsTestProvider jmsProvider = new JmsTestProvider();
- private List<DeploymentRuntime> deployments = new ArrayList<DeploymentRuntime>();
+ protected void setUp() throws Exception {
+ initialize();
+ }
+ protected void tearDown() throws Exception {
+ uninitialize();
+ }
+
public void test() throws DeploymentException, IOException, InterruptedException {
- DeploymentRuntime deployment1 = startDeployment("deployment-01.xml");
- DeploymentRuntime deployment2 = startDeployment("deployment-02.xml");
- DeploymentRuntime deployment3 = startDeployment("deployment-03.xml");
+ DeploymentRuntime deployment1;
+ DeploymentRuntime deployment3;
+ deployment1 = startDeployment("deployment-01.xml");
+ startDeployment("deployment-02.xml");
+ deployment3 = startDeployment("deployment-03.xml");
+
// Allow deployments to sync up...
Thread.sleep(500);
@@ -83,7 +94,7 @@
}
public void run() {
- for(int i = 0; i < 10000; i++) {
+ for(int i = 0; i < 100; i++) {
inrouter.sendMessage(message, true);
try {
Thread.sleep(1000);
@@ -95,35 +106,6 @@
}
}
- private DeploymentRuntime startDeployment(String config) throws DeploymentException, IOException {
- DeploymentRuntime deployment = DeploymentUtil.createRuntime(getClass().getResourceAsStream(config));
-
- deployment.setDeploymentId(config);
- deployment.setDeploymentName(config);
- deployment.deploy();
- deployments.add(deployment);
-
- return deployment;
- }
-
- protected void setUp() throws Exception {
- jmsProvider.start();
- }
-
- protected void tearDown() throws Exception {
- try {
- for (DeploymentRuntime deployment : deployments) {
- try {
- deployment.undeploy();
- } catch(Throwable t) {
- t.printStackTrace();
- }
- }
- } finally {
- jmsProvider.stop();
- }
- }
-
private static final String EXPECTED_F_PROCLOG = "Message Processing Event Log:\n" +
"\t1. [deployment-01.xml:deployment-01.xml] ServiceProcessingEvent: service='Service:A'\n" +
"\t2. [deployment-01.xml:deployment-01.xml] ServiceProcessingEvent: service='Service:B'\n" +
Modified: labs/jbossesb/workspace/skeagh/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,12 +22,11 @@
</properties>
<modules>
- <module>testutil</module>
<module>commons</module>
<module>api</module>
<module>runtime</module>
<module>routing</module>
- <module>examples</module>
+ <!-- module>examples</module -->
</modules>
<dependencies>
Modified: labs/jbossesb/workspace/skeagh/routing/jms/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/routing/jms/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
<version>${jboss.eap.version}</version>
<scope>provided</scope>
</dependency>
-
+
<!-- Test Dependencies - can we embed JBM for testing ?? -->
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -30,14 +30,14 @@
<version>4.1.2</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.1.0</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -20,22 +20,21 @@
*/
package org.jboss.esb.jms;
+import org.jboss.esb.deploy.DeploymentRuntime;
+import org.jboss.esb.deploy.DeploymentUtil;
+import org.jboss.esb.test.JmsTestBusProvider;
+import org.junit.AfterClass;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import java.util.Properties;
-
import javax.jms.JMSException;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
+import java.util.Properties;
-import org.jboss.esb.deploy.DeploymentRuntime;
-import org.jboss.esb.deploy.DeploymentUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
/**
* Test for {@link JmsInboundRouter}.
*
@@ -45,12 +44,12 @@
{
private static final String DESTINATION_NAME = "jbossesb.TestQueue";
- private static JmsTestProvider jmsProvider;
+ private static JmsTestBusProvider jmsProvider;
@BeforeClass
public static void startProvider() throws Exception
{
- jmsProvider = new JmsTestProvider();
+ jmsProvider = new JmsTestBusProvider();
jmsProvider.start();
}
Modified: labs/jbossesb/workspace/skeagh/routing/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/routing/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -26,13 +26,6 @@
<version>${jboss.esb.version}</version>
<scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>jboss.jbossesb</groupId>
- <artifactId>jbossesb-testutil</artifactId>
- <version>${jboss.esb.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: labs/jbossesb/workspace/skeagh/runtime/osgi.bnd
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/osgi.bnd 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/osgi.bnd 2008-10-03 16:36:38 UTC (rev 23297)
@@ -9,6 +9,7 @@
org.jboss.esb.routing.*,\
org.jboss.esb.schedule.*,\
org.jboss.esb.serialization.*,\
+org.jboss.esb.test.*,\
org.apache.log4j.*
Import-Package: *;resolution:=optional
Modified: labs/jbossesb/workspace/skeagh/runtime/pom.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/pom.xml 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/pom.xml 2008-10-03 16:36:38 UTC (rev 23297)
@@ -55,12 +55,26 @@
<!--
Test dependencies...
-->
+
+ <!-- Test Dependencies - can we embed JBM for testing ?? -->
<dependency>
- <groupId>jboss.jbossesb</groupId>
- <artifactId>jbossesb-testutil</artifactId>
- <version>${jboss.esb.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.1.2</version>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<repositories>
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.test;
+
+import junit.framework.TestCase;
+import org.jboss.esb.deploy.DeploymentException;
+import org.jboss.esb.deploy.DeploymentRuntime;
+import org.jboss.esb.deploy.DeploymentUtil;
+import org.jboss.esb.util.AssertArgument;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility class for writing JBossESB tests using JUnit.
+ * <p/>
+ * Makes it easier to:
+ * <ol>
+ * <li>Start the underlying bus provider (e.g. a JMS Bus).</li>
+ * <li>Start multiple ESB deployments. So you can execute "distributed"
+ * tests across multiple ESB deployments.</li>
+ * <li>Guarantee all deployments are undeployed and all resources are cleaned up.</li>
+ * </ol>
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class JBossESBTestCase extends TestCase
+{
+ /**
+ * Bus provider.
+ */
+ private TestBusProvider testBusProvider;
+ /**
+ * Active deployments.
+ */
+ private List<DeploymentRuntime> deployments = new ArrayList<DeploymentRuntime>();
+ /**
+ * The test it initialized.
+ */
+ private boolean initialize;
+
+ /**
+ * Constructor.
+ *
+ * @param busProvider The Bus provider.
+ */
+ public JBossESBTestCase(final TestBusProvider busProvider)
+ {
+ AssertArgument.isNotNull(busProvider, "testBusProvider");
+ this.testBusProvider = busProvider;
+ }
+
+ /**
+ * Start a deployment whose configuration is in the same package as the test implementation.
+ * <p/>
+ * Records a reference to the deployment and ensures it is undeployed on {@link #tearDown()}.
+ *
+ * @param config The configuration file name. Must be in the same package as the test implementation.
+ * @return The Deployment Rntime instance.
+ * @throws DeploymentException Error starting deployment.
+ * @throws IOException Error reading config.
+ */
+ protected final DeploymentRuntime startDeployment(final String config) throws DeploymentException, IOException
+ {
+ assertIsInitialized();
+
+ DeploymentRuntime deployment = DeploymentUtil.createRuntime(getClass().getResourceAsStream(config));
+
+ deployment.setDeploymentId(config);
+ deployment.setDeploymentName(config);
+ deployment.deploy();
+ deployments.add(deployment);
+
+ return deployment;
+ }
+
+ /**
+ * Assert that the test class is initialized.
+ */
+ private void assertIsInitialized()
+ {
+ if (!initialize)
+ {
+ fail("The test class is not initialized. Be sure to call eht 'initialize()' method.");
+ }
+ }
+
+ /**
+ * Setup.
+ * <p/>
+ * Force setup so as to initialize the test. Implementations should call
+ * the {@link #initialize()} method.
+ *
+ * @throws Exception Exception in setup.
+ */
+ protected abstract void setUp() throws Exception;
+
+ /**
+ * Tear down.
+ * <p/>
+ * Force tear down. Implementations should call
+ * the {@link #uninitialize()} method.
+ *
+ * @throws Exception Exception in tear down.
+ */
+ protected abstract void tearDown() throws Exception;
+
+ /**
+ * Initialize.
+ *
+ * @throws Exception Exception in setup.
+ */
+ protected final void initialize() throws Exception
+ {
+ initialize = true;
+ testBusProvider.start();
+ }
+
+ /**
+ * Uninitialize.
+ *
+ * @throws Exception Exception in tear down.
+ */
+ protected final void uninitialize() throws Exception
+ {
+ try
+ {
+ for (DeploymentRuntime deployment : deployments)
+ {
+ try
+ {
+ deployment.undeploy();
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ }
+ deployments.clear();
+ }
+ finally
+ {
+ testBusProvider.stop();
+ }
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JBossESBTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestBusProvider.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestBusProvider.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestBusProvider.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,143 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.test;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+
+import javax.naming.Context;
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * Jms Provider that can be uses in funtional/integration tests.
+ * <p/>
+ * <br>
+ * Usage:
+ * <pre>
+ * private static JmsTestProvider jmsProvider;
+ *
+ * @BeforeClass
+ * public static void startProvider() throws Exception
+ * {
+ * jmsProvider = new JmsTestProvider();
+ * jmsProvider.start();
+ * }
+ *
+ * @AfterClass
+ * public static void stopProvider() throws Exception
+ * {
+ * jmsProvider.stop();
+ * }
+ *
+ * @Test
+ * public void testSomething()
+ * {
+ * ...
+ * }
+ * </pre>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public class JmsTestBusProvider implements TestBusProvider
+{
+ /**
+ * Default provider URL.
+ */
+ public static final String DEFAULT_PROVIDER_URL = "tcp://localhost:61717";
+
+ /**
+ * JNDI properties.
+ */
+ private Properties jndiProperties;
+
+ /**
+ * Default JNDI Provider URL.
+ */
+ private String providerUrl = DEFAULT_PROVIDER_URL;
+
+ /**
+ * Jms broker
+ */
+ private BrokerService broker;
+
+ /**
+ * Public constructor.
+ */
+ public JmsTestBusProvider()
+ {
+ jndiProperties = new Properties();
+ jndiProperties.setProperty(Context.INITIAL_CONTEXT_FACTORY, ActiveMQInitialContextFactory.class.getName());
+ jndiProperties.setProperty(Context.PROVIDER_URL, DEFAULT_PROVIDER_URL);
+ }
+
+ /**
+ * Public constructor.
+ *
+ * @param providerUrl Provider URL.
+ */
+ public JmsTestBusProvider(final String providerUrl)
+ {
+ this();
+ jndiProperties.setProperty(Context.PROVIDER_URL, providerUrl);
+ this.providerUrl = providerUrl;
+ }
+
+ /**
+ * Get the JNDI properties in use by this test runner instance.
+ *
+ * @return The JNDI properties.
+ */
+ public final Properties getJndiProperties()
+ {
+ return (Properties) jndiProperties.clone();
+ }
+
+ /**
+ * Start the JMS Broker
+ *
+ * @throws Exception Error starting the broker.
+ */
+ public final void start() throws Exception
+ {
+ broker = new BrokerService();
+
+ // configure the broker
+ broker.setDataDirectory(new File("./target/activeMQData"));
+ broker.addConnector(providerUrl);
+
+ broker.start();
+
+ }
+
+ /**
+ * Stop the JMS Broker
+ *
+ * @throws Exception Error stopping the broker.
+ */
+ public final void stop() throws Exception
+ {
+ if (broker !=null)
+ {
+ broker.stop();
+ }
+ }
+
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestBusProvider.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestRunner.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestRunner.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestRunner.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.test;
+
+
+/**
+ * Starts a JMS broker and makes sure it gets shutdown.
+ * <p/>
+ * <br>
+ * Usage:
+ * <pre>
+ * new JMSTestRunner() {
+ * public void test() throws Exception {
+ * ...
+ * }
+ * }.run();
+ * </pre>
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class JmsTestRunner extends JmsTestBusProvider
+{
+ /**
+ * Public constructor.
+ */
+ public JmsTestRunner()
+ {
+ super();
+ }
+
+ /**
+ * Public constructor.
+ *
+ * @param providerUrl Provider URL.
+ */
+ public JmsTestRunner(final String providerUrl)
+ {
+ super(providerUrl);
+ }
+
+ /**
+ * Run the test.
+ *
+ * @throws Exception Error running test.
+ */
+ public final void run() throws Exception
+ {
+ start();
+ try
+ {
+ test();
+ }
+ finally
+ {
+ stop();
+ }
+ }
+
+ /**
+ * Test method.
+ *
+ * @throws Exception Test exception.
+ */
+ public abstract void test() throws Exception;
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/JmsTestRunner.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/TestBusProvider.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/TestBusProvider.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/TestBusProvider.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.test;
+
+/**
+ * Bus provider for testing.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public interface TestBusProvider
+{
+ /**
+ * Start the JMS Broker.
+ *
+ * @throws Exception Error starting the broker.
+ */
+ void start() throws Exception;
+
+ /**
+ * Stop the JMS Broker.
+ *
+ * @throws Exception Error stopping the broker.
+ */
+ void stop() throws Exception;
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/TestBusProvider.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/package.html
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/package.html (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/test/package.html 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,8 @@
+<html>
+<head></head>
+<body>
+JMS test utilities.
+
+<h2>Package Specification</h2>
+</body>
+</html>
\ No newline at end of file
Added: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/DeployRedeployTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/DeployRedeployTest.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/DeployRedeployTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.deploy.lifecycle;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class DeployRedeployTest extends TestCase
+{
+
+ public void test() {
+
+ }
+}
Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/DeployRedeployTest.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentCoordinatorTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentCoordinatorTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentCoordinatorTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -26,7 +26,7 @@
import org.jboss.esb.federate.notify.NotificationListener;
import org.jboss.esb.federate.notify.AbstractDeploymentNotification;
import org.jboss.esb.federate.notify.DeploymentHeartbeatNotification;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.properties.ApplicationProperties;
import java.io.IOException;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -23,9 +23,9 @@
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
import org.jboss.esb.service.ServiceName;
/**
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.service.ServiceName;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.service.ServiceName;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.service.ServiceName;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_011/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -23,10 +23,10 @@
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.jms.JmsTestRunner;
import org.jboss.esb.service.ServiceException;
import org.jboss.esb.service.ServiceName;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_012/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -22,12 +22,12 @@
import junit.framework.TestCase;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
import org.jboss.esb.failure.DeadLetterPersistanceService;
import org.jboss.esb.failure.MockDeadLetterService;
import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.jms.JmsTestRunner;
import org.jboss.esb.service.ServiceName;
/**
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_013/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -27,7 +27,7 @@
import org.jboss.esb.failure.DeadLetterPersistanceService;
import org.jboss.esb.failure.MockDeadLetterService;
import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.jms.JmsTestRunner;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.service.ServiceName;
import org.jboss.esb.service.ServiceException;
Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java 2008-10-03 13:02:47 UTC (rev 23296)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_014/RoutingTest.java 2008-10-03 16:36:38 UTC (rev 23297)
@@ -23,12 +23,12 @@
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
+import org.jboss.esb.test.JmsTestRunner;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
import org.jboss.esb.failure.DeadLetterPersistanceService;
import org.jboss.esb.failure.MockDeadLetterService;
import org.jboss.esb.federate.bus.BusMessage;
-import org.jboss.esb.jms.JmsTestRunner;
import org.jboss.esb.routing.RoutingException;
import org.jboss.esb.service.ServiceName;
More information about the jboss-svn-commits
mailing list