From 233cc9184c758702d8fa4a83d1bf8ec7dc0b3474 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 26 Jul 2007 15:47:23 +0000 Subject: * README: Instructions for openais install. * configure.ac: Enable clustering if suitable openais is present. * src/tests/Cluster.cpp, .h, Cluster_child: Updated for 0-10 * src/qpid/sys/ConcurrentQueue.h: Added waitPop() * src/Makefile.am, src/qpid/sys/ThreadSafeQueue.h, ProducerConsumer.h: Removed unused code, ConcurrentQueue provides same functionality. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@559859 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/Cluster_child.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'cpp/src/tests/Cluster_child.cpp') diff --git a/cpp/src/tests/Cluster_child.cpp b/cpp/src/tests/Cluster_child.cpp index c509dc1950..fd4eb42e7b 100644 --- a/cpp/src/tests/Cluster_child.cpp +++ b/cpp/src/tests/Cluster_child.cpp @@ -20,6 +20,8 @@ #include "Cluster.h" #include "test_tools.h" +#include "qpid/framing/SessionPingBody.h" +#include "qpid/framing/SessionPongBody.h" using namespace std; using namespace qpid; @@ -33,17 +35,18 @@ static const ProtocolVersion VER; /** Chlid part of Cluster::clusterTwo test */ void clusterTwo() { TestCluster cluster("clusterTwo", "amqp:child:2"); - BOOST_REQUIRE(cluster.received.waitFor(1)); // Frame from parent. - BOOST_CHECK(cluster.received[0].isIncoming); - BOOST_CHECK_TYPEID_EQUAL(ChannelPingBody, *cluster.received[0].frame.getBody()); + SessionFrame sf; + BOOST_REQUIRE(cluster.received.waitPop(sf)); // Frame from parent. + BOOST_CHECK(sf.isIncoming); + BOOST_CHECK_TYPEID_EQUAL(SessionPingBody, *sf.frame.getBody()); BOOST_CHECK_EQUAL(2u, cluster.size()); // Me and parent - AMQFrame frame(VER, 1, new ChannelOkBody(VER)); - SessionFrame sf(cluster.received[0].uuid, frame, false); - cluster.handle(sf); - BOOST_REQUIRE(cluster.received.waitFor(2)); - BOOST_CHECK(!cluster.received[1].isIncoming); - BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *cluster.received[1].frame.getBody()); + AMQFrame frame(VER, 1, new SessionPongBody(VER)); + SessionFrame sendframe(sf.uuid, frame, false); + cluster.handle(sendframe); + BOOST_REQUIRE(cluster.received.waitPop(sf)); + BOOST_CHECK(!sf.isIncoming); + BOOST_CHECK_TYPEID_EQUAL(SessionPongBody, *sf.frame.getBody()); } int test_main(int, char**) { -- cgit v1.2.1