Author: ritchiem
Date: Fri Oct 19 02:46:45 2007
New Revision: 586351
URL: http://svn.apache.org/viewvc?rev=586351&view=rev
Log:
Merged revisions
573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583549-
583774,583777-583807,583809-583881,583883-584107,584109-584112,584114-584123,584125-585564,585566-585569,585571-585574,585576-585641,585643-585905,585907-585911,585913-586344
via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r586344 | rgodfrey | 2007-10-19 10:29:50 +0100 (Fri, 19 Oct 2007) | 1 line
QPID-653 : Updated timeouts
........
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 19 02:46:45 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-585914
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-586344
Modified:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
Fri Oct 19 02:46:45 2007
@@ -126,7 +126,7 @@
_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());
Modified:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/ResetMessageListenerTest.java
Fri Oct 19 02:46:45 2007
@@ -257,7 +257,7 @@
try
{
- _allSecondMessagesSent.await(1000, TimeUnit.MILLISECONDS);
+ _allSecondMessagesSent.await(5000, TimeUnit.MILLISECONDS);
}
catch (InterruptedException e)
{
Modified:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
Fri Oct 19 02:46:45 2007
@@ -151,7 +151,7 @@
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());
Modified:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
Fri Oct 19 02:46:45 2007
@@ -308,15 +308,15 @@
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 @@
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 @@
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);
Modified:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
Fri Oct 19 02:46:45 2007
@@ -201,7 +201,7 @@
_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 @@
newConnection();
_logger.info("receiving result");
- Message result = _consumer.receive(1000);
+ Message result = _consumer.receive(5000);
_session.commit();
@@ -237,7 +237,7 @@
_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 @@
newConnection();
_logger.info("receiving result");
- Message result = _consumer.receive(1000);
+ Message result = _consumer.receive(5000);
_session.commit();
@@ -313,7 +313,7 @@
_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 @@
_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 @@
_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 @@
_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 @@
// 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 @@
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 @@
_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 @@
_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));
}
Modified:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java?rev=586351&r1=586350&r2=586351&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
(original)
+++
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/txn/TxnTest.java
Fri Oct 19 02:46:45 2007
@@ -142,7 +142,7 @@
_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 @@
_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);
