Multi version part 3. (2 more to come + tests)

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

3 files changed, 11 insertions, 6 deletions

diff --git a/qpid/cpp/tests/ChannelTest.cpp b/qpid/cpp/tests/ChannelTest.cpp
index 120f7c287f..f0860b8a28 100644
--- a/qpid/cpp/tests/ChannelTest.cpp
+++ b/qpid/cpp/tests/ChannelTest.cpp
@@ -26,6 +26,8 @@
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
+#include <AMQP_HighestVersion.h>
+
 
 using namespace boost;
 using namespace qpid::broker;
@@ -132,7 +134,7 @@ class ChannelTest : public CppUnit::TestCase
 
     void testConsumerMgmt(){
         Queue::shared_ptr queue(new Queue("my_queue"));
-        Channel channel(qpid::framing::highestVersion, 0, 0, 0);
+        Channel channel(qpid::framing::highestProtocolVersion, 0, 0, 0);
         CPPUNIT_ASSERT(!channel.exists("my_consumer"));
 
         ConnectionToken* owner = 0;
@@ -157,7 +159,7 @@ class ChannelTest : public CppUnit::TestCase
 
     void testDeliveryNoAck(){
         DummyHandler handler;
-        Channel channel(qpid::framing::highestVersion, &handler, 7, 10000);
+        Channel channel(qpid::framing::highestProtocolVersion, &handler, 7, 10000);
 
         const string data("abcdefghijklmn");
 
@@ -184,7 +186,7 @@ class ChannelTest : public CppUnit::TestCase
 
     void testDeliveryAndRecovery(){
         DummyHandler handler;
-        Channel channel(qpid::framing::highestVersion, &handler, 7, 10000);
+        Channel channel(qpid::framing::highestProtocolVersion, &handler, 7, 10000);
         const string data("abcdefghijklmn");
 
         Message::shared_ptr msg(createMessage("test", "my_routing_key", "my_message_id", 14));
@@ -212,7 +214,7 @@ class ChannelTest : public CppUnit::TestCase
     void testStaging(){
         MockMessageStore store;
         DummyHandler handler;
-        Channel channel(qpid::framing::highestVersion, &handler, 1, 1000/*framesize*/, &store, 10/*staging threshold*/);
+        Channel channel(qpid::framing::highestProtocolVersion, &handler, 1, 1000/*framesize*/, &store, 10/*staging threshold*/);
         const string data[] = {"abcde", "fghij", "klmno"};
 
         Message* msg = new Message(0, "my_exchange", "my_routing_key", false, false);
diff --git a/qpid/cpp/tests/FramingTest.cpp b/qpid/cpp/tests/FramingTest.cpp
index d630628504..bc65891956 100644
--- a/qpid/cpp/tests/FramingTest.cpp
+++ b/qpid/cpp/tests/FramingTest.cpp
@@ -25,6 +25,8 @@
 #include <qpid_test_plugin.h>
 #include <sstream>
 #include <typeinfo>
+#include <AMQP_HighestVersion.h>
+
 
 using namespace qpid::framing;
 
@@ -54,7 +56,7 @@ class FramingTest : public CppUnit::TestCase
 
   public:
 
-    FramingTest() : buffer(100), v(qpid::framing::highestVersion){}
+    FramingTest() : buffer(100), v(qpid::framing::highestProtocolVersion){}
 
     void testBasicQosBody() 
     {
diff --git a/qpid/cpp/tests/MessageTest.cpp b/qpid/cpp/tests/MessageTest.cpp
index c6ceb6e833..bcf3ad8064 100644
--- a/qpid/cpp/tests/MessageTest.cpp
+++ b/qpid/cpp/tests/MessageTest.cpp
@@ -21,6 +21,7 @@
 #include <BrokerMessage.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
+#include <AMQP_HighestVersion.h>
 
 using namespace boost;
 using namespace qpid::broker;
@@ -76,7 +77,7 @@ class MessageTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, msg->contentSize());
 
         DummyHandler handler;
-        msg->deliver(&handler, 0, "ignore", 0, 100, &(qpid::framing::highestVersion)); 
+        msg->deliver(&handler, 0, "ignore", 0, 100, &(qpid::framing::highestProtocolVersion)); 
         CPPUNIT_ASSERT_EQUAL((size_t) 3, handler.frames.size());
         AMQContentBody::shared_ptr contentBody(dynamic_pointer_cast<AMQContentBody, AMQBody>(handler.frames[2]->getBody()));
         CPPUNIT_ASSERT(contentBody);