You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/10/05 17:06:40 UTC
svn commit: r821829 - in /qpid/trunk/qpid/java:
systests/src/main/java/org/apache/qpid/test/unit/ack/ test-profiles/
Author: ritchiem
Date: Mon Oct 5 15:06:40 2009
New Revision: 821829
URL: http://svn.apache.org/viewvc?rev=821829&view=rev
Log:
QPID-1816 : Update to AOMT based tests, Test now continues as long as messages are received.
If there has been no message received for 5 seconds then it counts the test as failed.
Excluded AutoAck failover tests due to QPID-143
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
qpid/trunk/qpid/java/test-profiles/Excludes
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java?rev=821829&r1=821828&r2=821829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java Mon Oct 5 15:06:40 2009
@@ -51,7 +51,7 @@
// not the one we are connected to.
// The test will still pass but it will not be exactly
// as described.
- NUM_MESSAGES = 10;
+ NUM_MESSAGES = 6;
}
/**
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java?rev=821829&r1=821828&r2=821829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java Mon Oct 5 15:06:40 2009
@@ -22,6 +22,8 @@
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.JMSAMQException;
+import org.apache.qpid.client.failover.FailoverException;
import javax.jms.Message;
import javax.jms.MessageListener;
@@ -62,7 +64,24 @@
_connection.start();
- if (!_receviedAll.await(10000L, TimeUnit.MILLISECONDS))
+ int lastCount = (int) _receviedAll.getCount();
+
+ boolean complete = _receviedAll.await(5000L, TimeUnit.MILLISECONDS);
+
+ while (!complete)
+ {
+ int currentCount = (int) _receviedAll.getCount();
+
+ // make sure we have received a message in the last cycle.
+ if (lastCount == currentCount)
+ {
+ break;
+ }
+
+ complete = _receviedAll.await(5000L, TimeUnit.MILLISECONDS);
+ }
+
+ if (!complete)
{
// Check to see if we ended due to an exception in the onMessage handler
Exception cause = _causeOfFailure.get();
@@ -73,7 +92,7 @@
}
else
{
- fail("All messages not received:" + _receviedAll.getCount() + "/" + NUM_MESSAGES);
+ fail("All messages not received missing:" + _receviedAll.getCount() + "/" + NUM_MESSAGES);
}
}
@@ -85,7 +104,20 @@
fail(cause.getMessage());
}
- _consumer.close();
+ try
+ {
+ _consumer.close();
+ }
+ catch (JMSAMQException amqe)
+ {
+ if (amqe.getLinkedException() instanceof FailoverException)
+ {
+ fail("QPID-143 : Auto Ack can acknowledge message from previous session after failver. If failover occurs between deliver and ack.");
+ }
+ // else Rethrow for TestCase to catch.
+ throw amqe;
+ }
+
_consumerSession.close();
assertEquals("Wrong number of messages on queue", 0,
@@ -113,6 +145,7 @@
}
catch (Exception e)
{
+ // This will end the test run by counting down _receviedAll
fail(e);
}
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=821829&r1=821828&r2=821829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java Mon Oct 5 15:06:40 2009
@@ -46,7 +46,7 @@
protected void setUp() throws Exception
{
super.setUp();
- NUM_MESSAGES = 10;
+ NUM_MESSAGES = 5;
_queue = getTestQueue();
Modified: qpid/trunk/qpid/java/test-profiles/Excludes
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/Excludes?rev=821829&r1=821828&r2=821829&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/Excludes (original)
+++ qpid/trunk/qpid/java/test-profiles/Excludes Mon Oct 5 15:06:40 2009
@@ -23,5 +23,10 @@
// QPID-1816 : Client Ack has not been addressed
org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testDirtyClientAck
org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testClientAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testDirtyClientAck
org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#testClientAck
-// testDirtyClientAck is ok as it fails as expected.. problem is it always fails :)
+
+
+// QPID-143 : Failover can occur between receive and ack but we don't stop the ack.
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testAutoAck
+org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#testDupsOk
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org