[jboss-svn-commits] JBL Code SVN: r23209 - in labs/jbossesb/workspace/skeagh: runtime/src/main/java/org/jboss/esb/deploy/config/digest and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 30 02:19:59 EDT 2008
Author: beve
Date: 2008-09-30 02:19:59 -0400 (Tue, 30 Sep 2008)
New Revision: 23209
Added:
labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestRunner.java
Removed:
labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JMSTestRunner.java
Modified:
labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java
labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
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/testutil/src/main/java/org/jboss/esb/jms/JmsTestProvider.java
Log:
Updated JMSTestRunner(also renamed to JmsTestRunner) so that it extends JmsTestProvider.
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/commons/src/test/java/org/jboss/esb/jms/MessageSendAndListenTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -55,7 +55,8 @@
private void test_Destination_noselector(final Class<? extends Destination> destType, final String destName) throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
Properties jndiProperties = getJndiProperties();
@@ -109,7 +110,8 @@
private void test_Destination_withselector(final Class<? extends Destination> destType, final String destName) throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
Properties jndiProperties = getJndiProperties();
Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java 2008-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -219,8 +219,19 @@
String resPathString = "/META-INF" + namespace.getPath() + "-smooks.xml";
File resPath = new File(resPathString);
String baseURI = resPath.getParent().replace('\\', '/');
- InputStream configStream = ClassUtil.getResourceAsStream(resPathString, DigestUtil.class);
+ ClassLoader orgClassLoader = Thread.currentThread().getContextClassLoader();
+ InputStream configStream = null;
+ try
+ {
+ Thread.currentThread().setContextClassLoader(DigestUtil.class.getClassLoader());
+ configStream = ClassUtil.getResourceAsStream(resPathString, DigestUtil.class);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(orgClassLoader);
+ }
+
if (configStream != null)
{
try
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/lifecycle/UndeployDispatcherDelayTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
@@ -43,7 +43,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
@@ -78,6 +79,7 @@
final boolean[] messageSent = new boolean[]{false};
new Thread() {
+ @Override
public void run()
{
messageSent[0] = true;
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/DeploymentCoordinatorTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
/**
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -31,7 +31,8 @@
{
public void test_normal() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
DeploymentRuntime deployment1 = DeploymentUtil.createRuntime(getClass().getResourceAsStream("deployment-01.xml"));
@@ -124,7 +125,8 @@
public void test_online_offline() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
DeploymentRuntime deployment1 = DeploymentUtil.createRuntime(getClass().getResourceAsStream("deployment-01.xml"));
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/federate/bus/jms/JMSBus_Standalone_Test.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.properties.ApplicationProperties;
import java.io.IOException;
@@ -40,8 +40,9 @@
{
public void test_send_message() throws Exception
{
- new JMSTestRunner()
+ new JmsTestRunner()
{
+ @Override
public void test() throws Exception
{
JMSBus interface1 = createBusInterfaceInstance("deployment1");
@@ -114,8 +115,9 @@
public void test_send_notification() throws Exception
{
- new JMSTestRunner()
+ new JmsTestRunner()
{
+ @Override
public void test() throws Exception
{
JMSBus interface1 = createBusInterfaceInstance("deployment1");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_001/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -20,9 +20,11 @@
package org.jboss.esb.routing.scenario_001;
import junit.framework.TestCase;
+
+import org.jboss.esb.context.InvocationContext;
import org.jboss.esb.deploy.DeploymentRuntime;
import org.jboss.esb.deploy.DeploymentUtil;
-import org.jboss.esb.jms.JMSTestRunner;
+import org.jboss.esb.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
@@ -40,7 +42,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceA = new ServiceName("Service", "A");
@@ -96,7 +99,8 @@
// Reversing the deployment startup order should be ok... should still work...
public void test_reverse_startup_order() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_002/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
@@ -41,7 +41,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_003/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
@@ -40,7 +40,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_004/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.service.ServiceName;
@@ -39,7 +39,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_005/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.service.ServiceName;
@@ -38,7 +38,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_006/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestOutboundRouter;
import org.jboss.esb.TestService;
@@ -40,7 +40,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
@@ -91,7 +92,7 @@
"\t3. [deployment2-Id:deployment2] ServiceProcessingEvent: service='Service:B'\n" +
"\t4. [deployment2-Id:deployment2] BusRouterProcessingEvent: to='Service:C', targetDeploymentId='deployment3-Id:deployment3', busType='JMSBus'\n" +
"\t5. [deployment3-Id:deployment3] ServiceProcessingEvent: service='Service:C'\n" +
- "\t6. [deployment3-Id:deployment3] OutboundRouterProcessingEvent: config='outrouter'",
+ "\t6. [deployment3-Id:deployment3] OutboundRouterProcessingEvent: config='outrouter'",
outrouter.getEventLog().toString().trim());
}
finally
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_007/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.service.ServiceName;
@@ -38,11 +38,12 @@
* [inrouter_ServiceA -> ServiceA -> ServiceB] -> [ServiceC] -> [ServiceD]
* |
* \|/
- * [ ServiceF ] -> [ServiceE] <-------
+ * [ ServiceF ] -> [ServiceE] <-------
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_008/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
@@ -42,7 +42,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_009/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
@@ -42,7 +42,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
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-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/routing/scenario_010/RoutingTest.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms.JmsTestRunner;
import org.jboss.esb.TestInboundRouter;
import org.jboss.esb.TestService;
import org.jboss.esb.TestOutboundRouter;
@@ -41,7 +41,8 @@
*/
public void test() throws Exception
{
- new JMSTestRunner() {
+ new JmsTestRunner() {
+ @Override
public void test() throws Exception
{
ServiceName serviceNameA = new ServiceName("Service", "A");
Deleted: labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JMSTestRunner.java
===================================================================
--- labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JMSTestRunner.java 2008-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JMSTestRunner.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -1,114 +0,0 @@
-/*
- * 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;
-
-/**
- * Starts a JMS broker and makes sure it gets shutdown.
- * <p/>
- * Search for usages.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public abstract class JMSTestRunner
-{
- /**
- * 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;
-
- /**
- * Public constructor.
- */
- public JMSTestRunner()
- {
- 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 JMSTestRunner(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();
- }
-
- /**
- * Run the test.
- *
- * @throws Exception Error running test.
- */
- public final void run() throws Exception
- {
- BrokerService broker = new BrokerService();
-
- // configure the broker
- broker.setDataDirectory(new File("./target/activeMQData"));
- broker.addConnector(providerUrl);
-
- broker.start();
-
- try
- {
- test();
- }
- finally
- {
- broker.stop();
- }
- }
-
- /**
- * Test method.
- *
- * @throws Exception Test exception.
- */
- public abstract void test() throws Exception;
-}
Modified: labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestProvider.java
===================================================================
--- labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestProvider.java 2008-09-30 05:22:17 UTC (rev 23208)
+++ labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestProvider.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -30,8 +30,9 @@
/**
* Jms Provider that can be uses in funtional/integration tests.
* <p/>
- * Useage:
- * <pre>{@code
+ * <br>
+ * Usage:
+ * <pre>
* private static JmsTestProvider jmsProvider;
*
* @BeforeClass
@@ -52,6 +53,7 @@
* {
* ...
* }
+ * </pre>
*
* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
*/
Copied: labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestRunner.java (from rev 23165, labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JMSTestRunner.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestRunner.java (rev 0)
+++ labs/jbossesb/workspace/skeagh/testutil/src/main/java/org/jboss/esb/jms/JmsTestRunner.java 2008-09-30 06:19:59 UTC (rev 23209)
@@ -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.jms;
+
+
+/**
+ * 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 JmsTestProvider
+{
+ /**
+ * 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;
+}
More information about the jboss-svn-commits
mailing list