* 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/qpid@568732 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 12 insertions, 29 deletions

diff --git a/cpp/src/tests/Cluster.cpp b/cpp/src/tests/Cluster.cpp
index f3a50e2094..a9caa89321 100644
--- a/cpp/src/tests/Cluster.cpp
+++ b/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/cpp/src/tests/Cluster_child.cpp b/cpp/src/tests/Cluster_child.cpp
index 7789ada614..bd76e58127 100644
--- a/cpp/src/tests/Cluster_child.cpp
+++ b/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**) {
diff --git a/specs/amqp-transitional.0-10.xml b/specs/amqp-transitional.0-10.xml
index 9d31159c39..b1fe81373a 100644
--- a/specs/amqp-transitional.0-10.xml
+++ b/specs/amqp-transitional.0-10.xml
@@ -1863,10 +1863,6 @@
                     / C:RESUME S:ATTACHED
       use-session   = C:FLOW S:FLOW-OK
                     / S:FLOW C:FLOW-OK
-                    / S:PING
-                    / C:PONG
-                    / C:PING
-                    / S:PONG
       close-session = C:SUSPEND S:DETACHED
                     / C:CLOSE S:CLOSED
                     / S:CLOSED
@@ -2225,19 +2221,6 @@
       <chassis name="server" implement="MUST" />
       <chassis name="client" implement="MUST" />
     </method>
-
-    <!-- ping and pong are still used by cluster test -->
-    <method name = "ping" index = "140" label = "ping">
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-    <method name = "pong" index = "150" label = "pong">
-      <chassis name = "server" implement = "MUST" />
-      <chassis name = "client" implement = "MUST" />
-    </method>
-
-
   </class>
 
   <!-- == Class: access ======================================================================== -->