You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/05/23 10:55:15 UTC
svn commit: r659477 - in
/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit:
basic/FieldTableMessageTest.java basic/TextMessageTest.java tests.properties
Author: arnaudsimon
Date: Fri May 23 01:55:14 2008
New Revision: 659477
URL: http://svn.apache.org/viewvc?rev=659477&view=rev
Log:
QPID-1089: Changed to use coountdownlatch
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java?rev=659477&r1=659476&r2=659477&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java Fri May 23 01:55:14 2008
@@ -44,6 +44,8 @@
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 @@
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 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 @@
}
}
- void waitFor(int count) throws InterruptedException
- {
- synchronized (received)
- {
- while (received.size() < count)
- {
- received.wait();
- }
- }
- }
void check() throws JMSException, AMQFrameDecodingException
{
@@ -150,7 +144,7 @@
synchronized (received)
{
received.add((JMSBytesMessage) message);
- received.notify();
+ _waitForCompletion.countDown();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?rev=659477&r1=659476&r2=659477&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Fri May 23 01:55:14 2008
@@ -43,6 +43,8 @@
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 @@
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 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 @@
_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 @@
{
_logger.info("===== received one message");
received.add((JMSTextMessage) message);
- received.notify();
+ _waitForCompletion.countDown();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties?rev=659477&r1=659476&r2=659477&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/tests.properties Fri May 23 01:55:14 2008
@@ -30,6 +30,7 @@
# 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