svn commit: r583546 - /incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java

[ritchiem]

Author: ritchiem
Date: Wed Oct 10 10:14:53 2007
New Revision: 583546

URL: http://svn.apache.org/viewvc?rev=583546&view=rev
Log:
QPID-631 : Patch provided by Aidan Skinner to address the errors in the 
MessageRequeueTest.

Modified:
    
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java

Modified: 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java?rev=583546&r1=583545&r2=583546&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
 Wed Oct 10 10:14:53 2007
@@ -178,7 +178,7 @@
     /** multiple consumers
      * Based on code subbmitted by client FT-304
      */
-    public void testTwoCompetingConsumers()
+    public void testCompetingConsumers()
     {
         Consumer c1 = new Consumer();
         Consumer c2 = new Consumer();
@@ -193,7 +193,7 @@
         t1.start();
         t2.start();
         t3.start();
-        // t4.start();
+        t4.start();
 
         try
         {
@@ -224,7 +224,7 @@
         {
             if ((b == 0) && (index != 0)) // delivery tag of zero shouldn't 
exist (and we don't have msg 0)
             {
-                _logger.error("Index: " + index + " was not received.");
+                fail("Index: " + index + " was not received.");
                 list.append(" ");
                 list.append(index);
                 list.append(":");
@@ -236,7 +236,7 @@
         }
 
         assertEquals(list.toString() + "-" + numTestMessages + "-" + 
totalConsumed, 0, failed);
-        assertEquals("number of consumed messages does not match initial 
data", numTestMessages, totalConsumed);
+        assertTrue("number of consumed messages does not match initial data: " 
+ totalConsumed, numTestMessages <= totalConsumed);
         passed = true;
     }