diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-22 19:18:17 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-22 19:18:17 +0000 |
| commit | f84aa49fada52d4a61a9d7a491b8cbb52e7b5c0d (patch) | |
| tree | d67432b9684bd1afb3a238bb9a8e2c646ab3b031 /qpid/cpp/src/tests | |
| parent | 237f40cf63857bfd1a2a9d036f2609c21cd02b76 (diff) | |
| download | qpid-python-f84aa49fada52d4a61a9d7a491b8cbb52e7b5c0d.tar.gz | |
* specs/amqp-transitional.0-10.xml: Removed ping and pong methods.
They have been removed from the spec.
* cpp/src/tests/Cluster.cpp, Cluster_child.cpp:
Removed use of SessionPing/PongBody.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@568732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/Cluster.cpp | 14 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/Cluster_child.cpp | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/qpid/cpp/src/tests/Cluster.cpp b/qpid/cpp/src/tests/Cluster.cpp index f3a50e2094..a9caa89321 100644 --- a/qpid/cpp/src/tests/Cluster.cpp +++ b/qpid/cpp/src/tests/Cluster.cpp @@ -19,8 +19,8 @@ #include "Cluster.h" #include "test_tools.h" -#include "qpid/framing/SessionPingBody.h" -#include "qpid/framing/SessionPongBody.h" +#include "qpid/framing/SessionOpenBody.h" +#include "qpid/framing/SessionAttachedBody.h" #include "qpid/framing/all_method_bodies.h" #include "qpid/cluster/ClassifierHandler.h" @@ -34,11 +34,11 @@ static const ProtocolVersion VER; /** Verify membership in a cluster with one member. */ BOOST_AUTO_TEST_CASE(testClusterOne) { TestCluster cluster("clusterOne", "amqp:one:1"); - AMQFrame send(VER, 1, SessionPingBody(VER)); + AMQFrame send(VER, 1, SessionOpenBody(VER)); cluster.handle(send); AMQFrame received; BOOST_REQUIRE(cluster.received.waitPop(received)); - BOOST_CHECK_TYPEID_EQUAL(SessionPingBody, *received.getBody()); + BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); BOOST_CHECK_EQUAL(1u, cluster.size()); Cluster::MemberList members = cluster.getMembers(); BOOST_CHECK_EQUAL(1u, members.size()); @@ -60,14 +60,14 @@ BOOST_AUTO_TEST_CASE(testClusterTwo) { BOOST_REQUIRE(cluster.waitFor(2)); // Myself and child. // Exchange frames with child. - AMQFrame send(VER, 1, SessionPingBody(VER)); + AMQFrame send(VER, 1, SessionOpenBody(VER)); cluster.handle(send); AMQFrame received; BOOST_REQUIRE(cluster.received.waitPop(received)); - BOOST_CHECK_TYPEID_EQUAL(SessionPingBody, *received.getBody()); + BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *received.getBody()); BOOST_REQUIRE(cluster.received.waitPop(received)); - BOOST_CHECK_TYPEID_EQUAL(SessionPongBody, *received.getBody()); + BOOST_CHECK_TYPEID_EQUAL(SessionAttachedBody, *received.getBody()); if (!nofork) { // Wait for child to exit. diff --git a/qpid/cpp/src/tests/Cluster_child.cpp b/qpid/cpp/src/tests/Cluster_child.cpp index 7789ada614..bd76e58127 100644 --- a/qpid/cpp/src/tests/Cluster_child.cpp +++ b/qpid/cpp/src/tests/Cluster_child.cpp @@ -20,8 +20,8 @@ #include "Cluster.h" #include "test_tools.h" -#include "qpid/framing/SessionPingBody.h" -#include "qpid/framing/SessionPongBody.h" +#include "qpid/framing/SessionOpenBody.h" +#include "qpid/framing/SessionAttachedBody.h" using namespace std; using namespace qpid; @@ -37,13 +37,13 @@ void clusterTwo() { TestCluster cluster("clusterTwo", "amqp:child:2"); AMQFrame frame; BOOST_REQUIRE(cluster.received.waitPop(frame)); // Frame from parent. - BOOST_CHECK_TYPEID_EQUAL(SessionPingBody, *frame.getBody()); + BOOST_CHECK_TYPEID_EQUAL(SessionOpenBody, *frame.getBody()); BOOST_CHECK_EQUAL(2u, cluster.size()); // Me and parent - AMQFrame send(VER, 1, SessionPongBody(VER)); + AMQFrame send(VER, 1, SessionAttachedBody(VER)); cluster.handle(send); BOOST_REQUIRE(cluster.received.waitPop(frame)); - BOOST_CHECK_TYPEID_EQUAL(SessionPongBody, *frame.getBody()); + BOOST_CHECK_TYPEID_EQUAL(SessionAttachedBody, *frame.getBody()); } int test_main(int, char**) { |