Most of remaining version changes for C++. Still need to deal with AMQFrame

defualt constructor and do some clean up here and there..



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494540 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 11 insertions, 8 deletions

diff --git a/cpp/tests/BodyHandlerTest.cpp b/cpp/tests/BodyHandlerTest.cpp
index 5c3cba0f25..bf60dd21e3 100644
--- a/cpp/tests/BodyHandlerTest.cpp
+++ b/cpp/tests/BodyHandlerTest.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include <iostream>
+#include <AMQP_HighestVersion.h>
 #include <amqp_framing.h>
 #include <qpid_test_plugin.h>
 using namespace qpid::framing;
@@ -72,7 +73,7 @@ public:
     void testMethod() 
     {
         AMQMethodBody* method = new QueueDeclareBody(v);
-        AMQFrame frame(0, method);
+        AMQFrame frame(highestProtocolVersion, 0, method);
         TestBodyHandler handler(method);
         handler.handleBody(frame.getBody());
     }
@@ -80,7 +81,7 @@ public:
     void testHeader() 
     {
         AMQHeaderBody* header = new AMQHeaderBody();
-        AMQFrame frame(0, header);
+        AMQFrame frame(highestProtocolVersion, 0, header);
         TestBodyHandler handler(header);
         handler.handleBody(frame.getBody());
     }
@@ -88,7 +89,7 @@ public:
     void testContent() 
     {
         AMQContentBody* content = new AMQContentBody();
-        AMQFrame frame(0, content);
+        AMQFrame frame(highestProtocolVersion, 0, content);
         TestBodyHandler handler(content);
         handler.handleBody(frame.getBody());
     }
@@ -96,7 +97,7 @@ public:
     void testHeartbeat() 
     {
         AMQHeartbeatBody* heartbeat = new AMQHeartbeatBody();
-        AMQFrame frame(0, heartbeat);
+        AMQFrame frame(highestProtocolVersion, 0, heartbeat);
         TestBodyHandler handler(heartbeat);
         handler.handleBody(frame.getBody());
     }
diff --git a/cpp/tests/FramingTest.cpp b/cpp/tests/FramingTest.cpp
index bc65891956..e4d289d3d5 100644
--- a/cpp/tests/FramingTest.cpp
+++ b/cpp/tests/FramingTest.cpp
@@ -120,7 +120,7 @@ class FramingTest : public CppUnit::TestCase
     {
         std::string a = "hostA";
         std::string b = "hostB";
-        AMQFrame in(999, new ConnectionRedirectBody(v, a, b));
+        AMQFrame in(highestProtocolVersion, 999, new ConnectionRedirectBody(v, a, b));
         in.encode(buffer);
         buffer.flip(); 
         AMQFrame out;
@@ -131,7 +131,7 @@ class FramingTest : public CppUnit::TestCase
     void testBasicConsumeOkBodyFrame()
     {
         std::string s = "hostA";
-        AMQFrame in(999, new BasicConsumeOkBody(v, s));
+        AMQFrame in(highestProtocolVersion, 999, new BasicConsumeOkBody(v, s));
         in.encode(buffer);
         buffer.flip(); 
         AMQFrame out;
diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index 64789ed836..bd638dae66 100644
--- a/cpp/tests/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
@@ -20,6 +20,7 @@
  */
 #include <InMemoryContent.h>
 #include <qpid_test_plugin.h>
+#include <AMQP_HighestVersion.h>
 #include <iostream>
 #include <list>
 
@@ -66,7 +67,7 @@ public:
         u_int16_t channel = 3;
 
         addframes(content, inCount, in);
-        content.send(&handler, channel, framesize);         
+        content.send(highestProtocolVersion, &handler, channel, framesize);         
         check(handler, channel, outCount, out);
     }
 
diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index a8e7d61e0d..2075a6dd3a 100644
--- a/cpp/tests/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include <LazyLoadedContent.h>
+#include <AMQP_HighestVersion.h>
 #include <NullMessageStore.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
@@ -99,7 +100,7 @@ public:
         LazyLoadedContent content(&store, 0, in.size());
         DummyHandler handler;
         u_int16_t channel = 3;
-        content.send(&handler, channel, framesize);         
+        content.send(highestProtocolVersion, &handler, channel, framesize);         
         check(handler, channel, outCount, out);
     }