QPID-653 : Updated timeouts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586344 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 28 insertions, 28 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
index 8724c65b61..fe418535d6 100644
--- a/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
@@ -126,7 +126,7 @@ public class AMQQueueDeferredOrderingTest extends TestCase
         _logger.info("Consuming messages");
         for (int i = 0; i < NUM_MESSAGES; i++)
         {
-            Message msg = consumer.receive(1500);
+            Message msg = consumer.receive(3000);
             assertNotNull("Message should not be null", msg);
             assertTrue("Message should be a text message", msg instanceof TextMessage);
             assertEquals("Message content does not match expected", Integer.toString(i), ((TextMessage) msg).getText());
diff --git a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
index 28320d923a..21f3e273aa 100644
--- a/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
@@ -257,7 +257,7 @@ public class ResetMessageListenerTest extends TestCase
 
         try
         {
-            _allSecondMessagesSent.await(1000, TimeUnit.MILLISECONDS);
+            _allSecondMessagesSent.await(5000, TimeUnit.MILLISECONDS);
         }
         catch (InterruptedException e)
         {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index cb030f3bef..03698b2ab2 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -151,7 +151,7 @@ public class LargeMessageTest extends TestCase
 
             producer.send(_session.createTextMessage(_messageText));
 
-            TextMessage result = (TextMessage) consumer.receive(1000);
+            TextMessage result = (TextMessage) consumer.receive(10000);
 
             assertNotNull("Null message recevied", result);
             assertEquals("Message Size", _messageText.length(), result.getText().length());
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index a19687b07c..065b06a87d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -308,15 +308,15 @@ public class TopicSessionTest extends TestCase
         publisher.publish(session1.createTextMessage("hello-new2"));
 
         //test normal subscriber gets message
-        m = (TextMessage) normal.receive(1000);
+        m = (TextMessage) normal.receive(5000);
         assertNotNull(m);
 
         //test selector subscriber doesn't message
-        m = (TextMessage) select.receive(1000);
+        m = (TextMessage) select.receive(2000);
         assertNull(m);
 
         //test nolocal subscriber doesn't message
-        m = (TextMessage) noLocal.receive(1000);
+        m = (TextMessage) noLocal.receive(2000);
         if (m != null)
         {
             System.out.println("Message:" + m.getText());
@@ -330,15 +330,15 @@ public class TopicSessionTest extends TestCase
         publisher.publish(message);
 
         //test normal subscriber gets message
-        m = (TextMessage) normal.receive(1000);
+        m = (TextMessage) normal.receive(5000);
         assertNotNull(m);
 
         //test selector subscriber does get message
-        m = (TextMessage) select.receive(100);
+        m = (TextMessage) select.receive(2000);
         assertNotNull(m);
 
         //test nolocal subscriber doesn't message
-        m = (TextMessage) noLocal.receive(100);
+        m = (TextMessage) noLocal.receive(1000);
         assertNull(m);
 
         AMQConnection con2 = new AMQConnection(BROKER + "?retries='0'", "guest", "guest", "test2", "test");
@@ -352,15 +352,15 @@ public class TopicSessionTest extends TestCase
         publisher2.publish(message);
 
         //test normal subscriber gets message
-        m = (TextMessage) normal.receive(1000);
+        m = (TextMessage) normal.receive(2000);
         assertNotNull(m);
 
         //test selector subscriber does get message
-        m = (TextMessage) select.receive(100);
+        m = (TextMessage) select.receive(2000);
         assertNotNull(m);
 
         //test nolocal subscriber does message
-        m = (TextMessage) noLocal.receive(100);
+        m = (TextMessage) noLocal.receive(2000);
         assertNotNull(m);
 
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index a4c016916e..224463a446 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -201,7 +201,7 @@ public class CommitRollbackTest extends TestCase
 
         _logger.info("getting test message");
 
-        Message msg = _consumer.receive(1000);
+        Message msg = _consumer.receive(5000);
         assertNotNull("retrieved message is null", msg);
 
         _logger.info("closing connection");
@@ -210,7 +210,7 @@ public class CommitRollbackTest extends TestCase
         newConnection();
 
         _logger.info("receiving result");
-        Message result = _consumer.receive(1000);
+        Message result = _consumer.receive(5000);
 
         _session.commit();
 
@@ -237,7 +237,7 @@ public class CommitRollbackTest extends TestCase
 
         _logger.info("getting test message");
 
-        Message msg = _consumer.receive(1000);
+        Message msg = _consumer.receive(5000);
         assertNotNull("retrieved message is null", msg);
         assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText());
 
@@ -248,7 +248,7 @@ public class CommitRollbackTest extends TestCase
         newConnection();
 
         _logger.info("receiving result");
-        Message result = _consumer.receive(1000);
+        Message result = _consumer.receive(5000);
 
         _session.commit();
 
@@ -313,7 +313,7 @@ public class CommitRollbackTest extends TestCase
 
         _logger.info("getting test message");
 
-        Message msg = _consumer.receive(1000);
+        Message msg = _consumer.receive(5000);
 
         assertNotNull("retrieved message is null", msg);
         assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText());
@@ -328,7 +328,7 @@ public class CommitRollbackTest extends TestCase
 
         _consumer = _session.createConsumer(_jmsQueue);
 
-        Message result = _consumer.receive(1000);
+        Message result = _consumer.receive(5000);
 
         _session.commit();
         assertNotNull("test message was consumed and rolled back, but is gone", result);
@@ -363,7 +363,7 @@ public class CommitRollbackTest extends TestCase
             _session.rollback();
 
             _logger.info("receiving result");
-            Message result = _consumer.receive(1000);
+            Message result = _consumer.receive(5000);
 
             assertNotNull("test message was consumed and rolled back, but is gone", result);
 
@@ -451,7 +451,7 @@ public class CommitRollbackTest extends TestCase
         _pubSession.commit();
 
         _logger.info("getting test message");
-        Message result = _consumer.receive(1000);
+        Message result = _consumer.receive(5000);
 
         assertNotNull("Message received should not be null", result);
         assertEquals("1", ((TextMessage) result).getText());
@@ -467,7 +467,7 @@ public class CommitRollbackTest extends TestCase
 
 // NOTE: Both msg 1 & 2 will be marked as redelivered as they have both will have been rejected.
 // Only the occasion where it is not rejected will it mean it hasn't arrived at the client yet.
-        result = _consumer.receive(1000);
+        result = _consumer.receive(5000);
         assertNotNull("test message was consumed and rolled back, but is gone", result);
 
 // The first message back will be either 1 or 2 being redelivered
@@ -481,7 +481,7 @@ public class CommitRollbackTest extends TestCase
             assertEquals("2", ((TextMessage) result).getText());
         }
 
-        Message result2 = _consumer.receive(1000);
+        Message result2 = _consumer.receive(5000);
         assertNotNull("test message was consumed and rolled back, but is gone", result2);
 
         // if this is message 1 then it should be marked as redelivered
@@ -510,7 +510,7 @@ public class CommitRollbackTest extends TestCase
         _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
         _pubSession.commit();
 
-        assertNotNull(_consumer.receive(100));
+        assertNotNull(_consumer.receive(5000));
 
         _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
 
@@ -518,14 +518,14 @@ public class CommitRollbackTest extends TestCase
         _pubSession.rollback();
 
         _logger.info("receiving result");
-        Message result = _consumer.receive(1000);
+        Message result = _consumer.receive(5000);
         assertNull("test message was put and rolled back, but is still present", result);
 
         _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT));
 
         _pubSession.commit();
 
-        assertNotNull(_consumer.receive(100));
+        assertNotNull(_consumer.receive(5000));
 
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java b/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
index fc1043ed55..2957dda869 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
@@ -142,7 +142,7 @@ public class TxnTest extends TestCase implements MessageListener
         _consumer = _clientSession.createConsumer(_queue);

 

         //Receive Message

-        Message received = _consumer.receive(100);

+        Message received = _consumer.receive(1000);

         assertNull("More messages received", received);

 

         _consumer.close();

@@ -174,12 +174,12 @@ public class TxnTest extends TestCase implements MessageListener
         _producer.send(_producerSession.createTextMessage("TxtTestReceive"));

 

         //Receive Message

-        Message received = _consumer.receive(100);

+        Message received = _consumer.receive(1000);

 

         assertEquals("Incorrect Message Received.", "TxtTestReceive", ((TextMessage) received).getText());

         //Receive Message

 

-        received = _consumer.receive(100);

+        received = _consumer.receive(1000);

 

         assertNull("More messages received", received);