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 2010/05/20 17:20:21 UTC
svn commit: r946670 - in
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit:
ack/RecoverTest.java topic/DurableSubscriptionTest.java
Author: ritchiem
Date: Thu May 20 15:20:21 2010
New Revision: 946670
URL: http://svn.apache.org/viewvc?rev=946670&view=rev
Log:
Improved the asserts so we can see from the message what the failure condition was
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java?rev=946670&r1=946669&r2=946670&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java Thu May 20 15:20:21 2010
@@ -240,8 +240,7 @@ public class RecoverTest extends Failove
{
if (message.getJMSRedelivered())
{
- setError(
- new Exception("Message marked as redilvered on what should be first delivery attempt"));
+ setError(new Exception("Message marked as redelivered on what should be first delivery attempt"));
}
consumerSession.recover();
@@ -251,8 +250,7 @@ public class RecoverTest extends Failove
if (!message.getJMSRedelivered())
{
setError(
- new Exception(
- "Message not marked as redilvered on what should be second delivery attempt"));
+ new Exception("Message not marked as redelivered on what should be second delivery attempt"));
}
}
else
@@ -293,19 +291,13 @@ public class RecoverTest extends Failove
Thread.sleep(1000);
- if (count.get() != 2)
- {
- System.err.println("Count != 2 : " + count);
- }
-
- assertTrue(count.get() == 2);
-
- con.close();
-
if (_error != null)
{
throw _error;
}
+
+ assertEquals("Message not received the correct number of times.",
+ 2, count.get());
}
private void setError(Exception e)
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=946670&r1=946669&r2=946670&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu May 20 15:20:21 2010
@@ -545,16 +545,17 @@ public class DurableSubscriptionTest ext
TopicSubscriber subB = session.createDurableSubscriber(topic,
"testResubscribeWithChangedSelector","Match = False", false);
- // Check messages are recieved properly
+ // Check messages are received properly
sendMatchingAndNonMatchingMessage(session, producer);
- rMsg = subB.receive(NEGATIVE_RECEIVE_TIMEOUT);
- assertNotNull(rMsg);
+ rMsg = subB.receive(POSITIVE_RECEIVE_TIMEOUT);
+
+ assertNotNull("Message should not be received", rMsg);
assertEquals("Content was wrong",
"testResubscribeWithChangedSelector2",
((TextMessage) rMsg).getText());
rMsg = subB.receive(NEGATIVE_RECEIVE_TIMEOUT);
- assertNull(rMsg);
+ assertNull("Message should be received",rMsg);
session.unsubscribe("testResubscribeWithChangedSelector");
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org