You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2006/12/21 18:43:57 UTC
svn commit: r489418 - in /incubator/qpid/trunk/qpid/cpp/tests:
ChannelTest.cpp FramingTest.cpp MessageTest.cpp
Author: cctrieloff
Date: Thu Dec 21 09:43:56 2006
New Revision: 489418
URL: http://svn.apache.org/viewvc?view=rev&rev=489418
Log:
Multi version part 3. (2 more to come + tests)
Modified:
incubator/qpid/trunk/qpid/cpp/tests/ChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/tests/FramingTest.cpp
incubator/qpid/trunk/qpid/cpp/tests/MessageTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/tests/ChannelTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/ChannelTest.cpp?view=diff&rev=489418&r1=489417&r2=489418
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/ChannelTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/ChannelTest.cpp Thu Dec 21 09:43:56 2006
@@ -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 @@
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 @@
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 @@
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 @@
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);
Modified: incubator/qpid/trunk/qpid/cpp/tests/FramingTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/FramingTest.cpp?view=diff&rev=489418&r1=489417&r2=489418
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/FramingTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/FramingTest.cpp Thu Dec 21 09:43:56 2006
@@ -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 @@
public:
- FramingTest() : buffer(100), v(qpid::framing::highestVersion){}
+ FramingTest() : buffer(100), v(qpid::framing::highestProtocolVersion){}
void testBasicQosBody()
{
Modified: incubator/qpid/trunk/qpid/cpp/tests/MessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/tests/MessageTest.cpp?view=diff&rev=489418&r1=489417&r2=489418
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/tests/MessageTest.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/tests/MessageTest.cpp Thu Dec 21 09:43:56 2006
@@ -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 @@
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);