svn commit: r478444 - /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java

[vinoski]

Author: vinoski
Date: Wed Nov 22 18:54:50 2006
New Revision: 478444

URL: http://svn.apache.org/viewvc?view=rev&rev=478444
Log:
speed up test

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?view=diff&rev=478444&r1=478443&r2=478444
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
 Wed Nov 22 18:54:50 2006
@@ -31,9 +31,6 @@
 
 import junit.framework.TestCase;
 
-/**
- * This is a slow test.
- */
 public class MultipleConnectionTest extends TestCase
 {
     public static final String _defaultBroker = "vm://:1";
@@ -118,13 +115,15 @@
         synchronized boolean waitUntil(int expected, long maxWait) throws 
InterruptedException
         {
             long start = System.currentTimeMillis();
-            long timeLeft = maxWait;
-            do
+            while (expected > _count)
             {
+                long timeLeft = maxWait - timeSince(start);
+                if (timeLeft < 0)
+                {
+                    break;
+                }
                 wait(timeLeft);
-                timeLeft = maxWait - timeSince(start);
             }
-            while (expected > _count && timeLeft > 0);
             return expected <= _count;
         }