svn commit: r1396231 - in /openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb: JmsTest.java MdbProxy.java

[rmannibucau]

Author: rmannibucau
Date: Tue Oct  9 19:45:19 2012
New Revision: 1396231

URL: http://svn.apache.org/viewvc?rev=1396231&view=rev
Log:
some more timeout

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbProxy.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java?rev=1396231&r1=1396230&r2=1396231&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/JmsTest.java
 Tue Oct  9 19:45:19 2012
@@ -19,6 +19,7 @@ package org.apache.openejb.core.mdb;
 
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQSession;
 import org.apache.geronimo.connector.GeronimoBootstrapContext;
 import org.apache.geronimo.connector.work.GeronimoWorkManager;
 import org.apache.geronimo.connector.work.TransactionContextHandler;
@@ -30,14 +31,22 @@ import org.apache.openejb.resource.activ
 import org.apache.openejb.util.Duration;
 import org.apache.openejb.util.NetworkUtil;
 
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
 import javax.resource.spi.BootstrapContext;
 import javax.resource.spi.ResourceAdapterInternalException;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.UUID;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -53,8 +62,6 @@ public class JmsTest extends TestCase {
     protected void setUp() throws Exception {
         super.setUp();
 
-        ActiveMQ5Factory.clear();
-
         // create a transaction manager
         final GeronimoTransactionManager transactionManager = new 
GeronimoTransactionManager();
 
@@ -93,6 +100,7 @@ public class JmsTest extends TestCase {
             ra.stop();
             ra = null;
         }
+        ActiveMQ5Factory.clear();
         super.tearDown();
     }
 
@@ -128,7 +136,6 @@ public class JmsTest extends TestCase {
             final ObjectMessage requestMessage = session.createObjectMessage();
             requestMessage.setJMSReplyTo(responseQueue);
             requestMessage.setObject((Serializable) request);
-            requestMessage.setJMSCorrelationID(UUID.randomUUID().toString());
 
             // Send the request message
             producer = session.createProducer(requestQueue);
@@ -136,7 +143,7 @@ public class JmsTest extends TestCase {
 
             // wait for the response message
             consumer = session.createConsumer(responseQueue);
-            final Message message = consumer.receive(1000);
+            final Message message = consumer.receive(5000);
 
             // verify message
             assertNotNull("Did not get a response message", message);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbProxy.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbProxy.java?rev=1396231&r1=1396230&r2=1396231&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbProxy.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbProxy.java
 Tue Oct  9 19:45:19 2012
@@ -56,7 +56,7 @@ public class MdbProxy {
     }
 
     private static class MdbInvocationHandler implements InvocationHandler {
-        private static final int MAX_RESPONSE_WAIT = 1000;
+        private static final int MAX_RESPONSE_WAIT = 5000;
         private Connection connection;
         private Session session;
         private MessageProducer producer;