QPID-1089: Changed to use coountdownlatch

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@659477 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 14 insertions, 25 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index efc9195c53..e8d3497bdb 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
@@ -44,6 +44,8 @@ import javax.jms.MessageProducer;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class FieldTableMessageTest extends QpidTestCase implements MessageListener
 {
@@ -56,6 +58,7 @@ public class FieldTableMessageTest extends QpidTestCase implements MessageListen
     private FieldTable _expected;
     private int _count = 10;
     public String _connectionString = "vm://:1";
+    private CountDownLatch _waitForCompletion;
 
     protected void setUp() throws Exception
     {
@@ -102,8 +105,9 @@ public class FieldTableMessageTest extends QpidTestCase implements MessageListen
     public void test() throws Exception
     {
         int count = _count;
-        send(count);
-        waitFor(count);
+        _waitForCompletion = new CountDownLatch(_count);
+        send(count);        
+        _waitForCompletion.await(20, TimeUnit.SECONDS);
         check();
         _logger.info("Completed without failure");
         _connection.close();
@@ -121,16 +125,6 @@ public class FieldTableMessageTest extends QpidTestCase implements MessageListen
         }
     }
 
-    void waitFor(int count) throws InterruptedException
-    {
-        synchronized (received)
-        {
-            while (received.size() < count)
-            {
-                received.wait();
-            }
-        }
-    }
 
     void check() throws JMSException, AMQFrameDecodingException
     {
@@ -150,7 +144,7 @@ public class FieldTableMessageTest extends QpidTestCase implements MessageListen
         synchronized (received)
         {
             received.add((JMSBytesMessage) message);
-            received.notify();
+            _waitForCompletion.countDown();
         }
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index ba9963db41..1453e1b014 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -43,6 +43,8 @@ import javax.jms.Session;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class TextMessageTest extends QpidTestCase implements MessageListener
 {
@@ -55,6 +57,7 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
     private final List<String> messages = new ArrayList<String>();
     private int _count = 100;
     public String _connectionString = "vm://:1";
+    private CountDownLatch _waitForCompletion;
 
     protected void setUp() throws Exception
     {
@@ -102,8 +105,9 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
     public void test() throws Exception
     {
         int count = _count;
+        _waitForCompletion = new CountDownLatch(_count);
         send(count);
-        waitFor(count);
+        _waitForCompletion.await(20, TimeUnit.SECONDS);
         check();
         _logger.info("Completed without failure");
         _connection.close();
@@ -126,16 +130,6 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
         _logger.info("sent " + count  + " mesages");
     }
 
-    void waitFor(int count) throws InterruptedException
-    {
-        synchronized (received)
-        {
-            while (received.size() < count)
-            {
-                received.wait();
-            }
-        }
-    }
 
     void check() throws JMSException
     {
@@ -236,7 +230,7 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
         {
             _logger.info("===== received one message");
             received.add((JMSTextMessage) message);
-            received.notify();
+            _waitForCompletion.countDown();
         }
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties b/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
index 32ed16a392..2fd961a078 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
@@ -30,6 +30,7 @@ connectionfactory.local =  amqp://username:password@clientid/test?brokerlist='tc
 # register some queues in JNDI using the form
 # queue.[jndiName] = [physicalName]
 queue.MyQueue = example.MyQueue
+queue.queue = example.queue
 queue.xaQueue =  xaQueue
 
 # register some topics in JNDI using the form