Author: jlmonteiro
Date: Wed Jul 20 15:54:24 2011
New Revision: 1148821
URL: http://svn.apache.org/viewvc?rev=1148821&view=rev
Log:
Seems like we have a lot of issues during our builds due to a port problem.
Adding the ability to dynamically get one free and refactor a bit JMS tests to
avoid duplicate code
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java?rev=1148821&r1=1148820&r2=1148821&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/AmqXmlTest.java
Wed Jul 20 15:54:24 2011
@@ -21,6 +21,7 @@ public class AmqXmlTest extends JmsProxy
@Override
protected void setUp() throws Exception {
+ brokerXmlConfig = "xbean:org/apache/openejb/core/mdb/activemq.xml";
super.setUp();
}
@@ -28,10 +29,4 @@ public class AmqXmlTest extends JmsProxy
public void testProxy() throws Exception {
// TODO move so there is not a build time dependency on spring in the
openejb-core module
}
-
- @Override
- protected String getBrokerXmlConfig() {
- // note activemq uses classpath xml loader
- return "xbean:org/apache/openejb/core/mdb/activemq.xml";
- }
}
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java?rev=1148821&r1=1148820&r2=1148821&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsProxyTest.java
Wed Jul 20 15:54:24 2011
@@ -37,56 +37,7 @@ import javax.resource.spi.work.WorkManag
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
-public class JmsProxyTest extends TestCase {
- private static final String REQUEST_QUEUE_NAME = "request";
- private ConnectionFactory connectionFactory;
- private ActiveMQResourceAdapter ra;
- private String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // create a transaction manager
- GeronimoTransactionManager transactionManager = new
GeronimoTransactionManager();
-
- // create the ActiveMQ resource adapter instance
- ra = new ActiveMQResourceAdapter();
-
- // initialize properties
- ra.setServerUrl(brokerAddress);
- ra.setBrokerXmlConfig(getBrokerXmlConfig());
-
- // create a thead pool for ActiveMQ
- Executor threadPool = Executors.newFixedThreadPool(30);
-
- // create a work manager which ActiveMQ uses to dispatch message
delivery jobs
- WorkManager workManager = new GeronimoWorkManager(threadPool,
threadPool, threadPool, transactionManager);
-
- // wrap the work mananger and transaction manager in a bootstrap
context (connector spec thing)
- BootstrapContext bootstrapContext = new
GeronimoBootstrapContext(workManager, transactionManager);
-
- // start the resource adapter
- try {
- ra.start(bootstrapContext);
- } catch (ResourceAdapterInternalException e) {
- throw new OpenEJBException(e);
- }
- // Create a ConnectionFactory
- connectionFactory = new ActiveMQConnectionFactory(brokerAddress);
- }
-
- protected String getBrokerXmlConfig() {
- return "broker:(" + brokerAddress + ")?useJmx=false";
- }
-
- protected void tearDown() throws Exception {
- connectionFactory = null;
- if (ra != null) {
- ra.stop();
- ra = null;
- }
- super.tearDown();
- }
+public class JmsProxyTest extends JmsTest {
public void testProxy() throws Exception {
// create reciever object
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1148821&r1=1148820&r2=1148821&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
Wed Jul 20 15:54:24 2011
@@ -17,11 +17,15 @@
*/
package org.apache.openejb.core.mdb;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.geronimo.connector.GeronimoBootstrapContext;
+import org.apache.geronimo.connector.work.GeronimoWorkManager;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
+import org.apache.openejb.util.NetworkUtil;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -35,21 +39,18 @@ import javax.jms.Session;
import javax.resource.spi.BootstrapContext;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.work.WorkManager;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
-import org.apache.openejb.util.NetworkUtil;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
public class JmsTest extends TestCase {
protected static final String REQUEST_QUEUE_NAME = "request";
protected ConnectionFactory connectionFactory;
protected ActiveMQResourceAdapter ra;
protected String brokerAddress = NetworkUtil.getLocalAddress("tcp://", "");
+ protected String brokerXmlConfig = "broker:(" + brokerAddress +
")?useJmx=false";
protected void setUp() throws Exception {
super.setUp();
@@ -62,7 +63,7 @@ public class JmsTest extends TestCase {
// initialize properties
ra.setServerUrl(brokerAddress);
- ra.setBrokerXmlConfig("broker:(" + brokerAddress + ")?useJmx=false");
+ ra.setBrokerXmlConfig(brokerXmlConfig);
// create a thead pool for ActiveMQ
@@ -153,7 +154,7 @@ public class JmsTest extends TestCase {
}
}
-
+
private Destination createListener(Connection connection) throws
JMSException {
final Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java?rev=1148821&r1=1148820&r2=1148821&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
Wed Jul 20 15:54:24 2011
@@ -17,12 +17,9 @@
*/
package org.apache.openejb.core.mdb;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ra.ActiveMQActivationSpec;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -34,23 +31,14 @@ import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.resource.ResourceException;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.UnavailableException;
import javax.resource.spi.endpoint.MessageEndpoint;
import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.WorkManager;
import javax.transaction.xa.XAResource;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ra.ActiveMQActivationSpec;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
-import org.apache.openejb.util.NetworkUtil;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.TreeMap;
public class MdbTest extends JmsTest {
@@ -68,7 +56,7 @@ public class MdbTest extends JmsTest {
connection = connectionFactory.createConnection();
connection.start();
- // create request
+ // create request
Map<String, Object> request = new TreeMap<String, Object>();
request.put("args", new Object[]{"cheese"});
@@ -144,11 +132,11 @@ public class MdbTest extends JmsTest {
return false;
}
- public MessageEndpoint createEndpoint(XAResource arg0, long
arg1)
- throws UnavailableException {
- //TODO: next openejb version
- throw new UnsupportedOperationException("Method not
implemented: MessageEndpoint createEndpoint(XAResource arg0, long arg1)");
- }
+ public MessageEndpoint createEndpoint(XAResource arg0, long arg1)
+ throws UnavailableException {
+ //TODO: next openejb version
+ throw new UnsupportedOperationException("Method not implemented:
MessageEndpoint createEndpoint(XAResource arg0, long arg1)");
+ }
}
public static class JmsEndpoint implements MessageEndpoint,
MessageListener {
@@ -169,7 +157,7 @@ public class MdbTest extends JmsTest {
try {
// process request
ObjectMessage requestMessage = (ObjectMessage) message;
- Map<String, Object[]> request = (Map<String, Object[]>)
requestMessage.getObject();
+ Map<String, Object[]> request = (Map<String, Object[]>)
requestMessage.getObject();
Object[] args = (Object[]) request.get("args");
String returnValue = "test-" + args[0];
Modified:
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java?rev=1148821&r1=1148820&r2=1148821&view=diff
==============================================================================
---
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
(original)
+++
openejb/branches/openejb-3.2.x/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/SimpleJmsTest.java
Wed Jul 20 15:54:24 2011
@@ -17,24 +17,10 @@
*/
package org.apache.openejb.core.mdb;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.Session;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.ResourceAdapterInternalException;
-import javax.resource.spi.work.WorkManager;
-
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.geronimo.connector.GeronimoBootstrapContext;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
-import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.resource.activemq.ActiveMQResourceAdapter;
public class SimpleJmsTest extends JmsTest {
