From da6e2b9f62966ef7d0cb69f58ffe1365af98d676 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 29 Oct 2007 21:14:44 +0000 Subject: client/BlockingQueue.h, sys/ConcurrentQueue.h: merged to sys/BlockingQueue.h - updated all users qpid/Exception.h: Removed unimplemented clone() function. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@589857 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/Cluster.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'cpp/src/tests/Cluster.cpp') diff --git a/cpp/src/tests/Cluster.cpp b/cpp/src/tests/Cluster.cpp index 531a74b0c2..ee13bdd72a 100644 --- a/cpp/src/tests/Cluster.cpp +++ b/cpp/src/tests/Cluster.cpp @@ -36,8 +36,7 @@ BOOST_AUTO_TEST_CASE(testClusterOne) { TestCluster cluster("clusterOne", "amqp:one:1"); AMQFrame send(1, SessionOpenBody(VER)); cluster.handle(send); - AMQFrame received; - BOOST_REQUIRE(cluster.received.waitPop(received)); + AMQFrame received = cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); BOOST_CHECK_EQUAL(1u, cluster.size()); Cluster::MemberList members = cluster.getMembers(); @@ -62,11 +61,10 @@ BOOST_AUTO_TEST_CASE(testClusterTwo) { // Exchange frames with child. AMQFrame send(1, SessionOpenBody(VER)); cluster.handle(send); - AMQFrame received; - BOOST_REQUIRE(cluster.received.waitPop(received)); + AMQFrame received = cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); - BOOST_REQUIRE(cluster.received.waitPop(received)); + received=cluster.received.pop(); BOOST_CHECK_TYPEID_EQUAL(SessionAttachedBody, *received.getBody()); if (!nofork) { -- cgit v1.2.1