diff options
Diffstat (limited to 'cpp/src/tests/Cluster.cpp')
| -rw-r--r-- | cpp/src/tests/Cluster.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/cpp/src/tests/Cluster.cpp b/cpp/src/tests/Cluster.cpp index ed50cc5d7b..008575140b 100644 --- a/cpp/src/tests/Cluster.cpp +++ b/cpp/src/tests/Cluster.cpp @@ -24,46 +24,44 @@ #include "qpid/framing/BasicGetOkBody.h" - static const ProtocolVersion VER; /** Verify membership ind a cluster with one member. */ BOOST_AUTO_TEST_CASE(clusterOne) { - VectorFrameHandler received; - Cluster cluster("Test", "amqp:one:1", received, VER); + Cluster cluster("Test", "amqp:one:1"); + TestClusterHandler handler(cluster); AMQFrame frame(VER, 1, new ChannelOkBody(VER)); - cluster.handle(frame); - BOOST_REQUIRE(received.waitFor(1)); + BOOST_REQUIRE(handler.waitFrames(1)); BOOST_CHECK_EQUAL(1u, cluster.size()); Cluster::MemberList members = cluster.getMembers(); BOOST_CHECK_EQUAL(1u, members.size()); BOOST_REQUIRE_EQUAL(members.front()->url, "amqp:one:1"); - BOOST_CHECK_EQUAL(1u, received.size()); - BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody()); + BOOST_CHECK_EQUAL(1u, handler.size()); + BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *handler[0].getBody()); } /** Fork a process to verify membership in a cluster with two members */ BOOST_AUTO_TEST_CASE(clusterTwo) { - VectorFrameHandler received; pid_t pid=fork(); BOOST_REQUIRE(pid >= 0); - if (pid) { // Parent - TestCluster cluster("Test", "amqp::1", received, VER); - BOOST_REQUIRE(cluster.waitFor(2)); + if (pid) { // Parent see Cluster_child.cpp for child. + Cluster cluster("Test", "amqp::1"); + TestClusterHandler handler(cluster); + BOOST_REQUIRE(handler.waitMembers(2)); // Exchange frames with child. AMQFrame frame(VER, 1, new ChannelOkBody(VER)); cluster.handle(frame); - BOOST_REQUIRE(received.waitFor(2)); - BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *received[0].getBody()); - BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *received[1].getBody()); + BOOST_REQUIRE(handler.waitFrames(2)); + BOOST_CHECK_TYPEID_EQUAL(ChannelOkBody, *handler[0].getBody()); + BOOST_CHECK_TYPEID_EQUAL(BasicGetOkBody, *handler[1].getBody()); // Wait for child to exit. int status; BOOST_CHECK_EQUAL(::wait(&status), pid); BOOST_CHECK_EQUAL(0, status); - BOOST_CHECK(cluster.waitFor(1)); + BOOST_CHECK(handler.waitMembers(1)); BOOST_CHECK_EQUAL(1u, cluster.size()); } else { // Child |