From f9f848394de0662248cf62d4ec5e4818949403b2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 30 Jan 2007 20:07:41 +0000 Subject: Andrew Stitcher r723@fuschia: andrew | 2007-01-12 00:35:16 +0000 Branch for my work on Qpid.0-9 r724@fuschia: andrew | 2007-01-12 00:59:28 +0000 Added in empty implementation of handler class for protocol Message class r768@fuschia: andrew | 2007-01-17 01:25:16 +0000 * Added Test for new MessageHandlerImpl (but no actual tests yet) * Filled in lots of the blanks in the MessageHandlerImpl with code stolen from the BasicHandlerImpl r800@fuschia: andrew | 2007-01-17 17:34:13 +0000 Updated to latest upstream changes r840@fuschia: andrew | 2007-01-19 00:31:59 +0000 Fixed merge errors r841@fuschia: andrew | 2007-01-19 00:47:29 +0000 Another merge problem fixed r878@fuschia: andrew | 2007-01-24 11:27:48 +0000 Started work on the Message class handler implementation r976@fuschia: andrew | 2007-01-30 17:05:05 +0000 Working again after broker Message refactor r980@fuschia: andrew | 2007-01-30 18:39:18 +0000 Fix for extra parameter to transfer git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@501534 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/MessageBuilderTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cpp/tests/MessageBuilderTest.cpp') diff --git a/cpp/tests/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp index 21f5935218..e84d1df0e7 100644 --- a/cpp/tests/MessageBuilderTest.cpp +++ b/cpp/tests/MessageBuilderTest.cpp @@ -74,14 +74,14 @@ class MessageBuilderTest : public CppUnit::TestCase // Don't hide overloads. using NullMessageStore::destroy; - void destroy(Message* msg) + void destroy(BasicMessage* msg) { CPPUNIT_ASSERT(msg->getPersistenceId()); } - Message::shared_ptr getRestoredMessage() + BasicMessage::shared_ptr getRestoredMessage() { - Message::shared_ptr msg(new Message()); + BasicMessage::shared_ptr msg(new BasicMessage()); if (header) { header->flip(); msg->decodeHeader(*header); @@ -116,7 +116,7 @@ class MessageBuilderTest : public CppUnit::TestCase DummyHandler handler; MessageBuilder builder(&handler); - Message::shared_ptr message(new Message(0, "test", "my_routing_key", false, false)); + Message::shared_ptr message(new BasicMessage(0, "test", "my_routing_key", false, false)); AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); header->setContentSize(0); @@ -133,7 +133,7 @@ class MessageBuilderTest : public CppUnit::TestCase string data1("abcdefg"); - Message::shared_ptr message(new Message(0, "test", "my_routing_key", false, false)); + Message::shared_ptr message(new BasicMessage(0, "test", "my_routing_key", false, false)); AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); header->setContentSize(7); AMQContentBody::shared_ptr part1(new AMQContentBody(data1)); @@ -154,7 +154,7 @@ class MessageBuilderTest : public CppUnit::TestCase string data1("abcdefg"); string data2("hijklmn"); - Message::shared_ptr message(new Message(0, "test", "my_routing_key", false, false)); + Message::shared_ptr message(new BasicMessage(0, "test", "my_routing_key", false, false)); AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); header->setContentSize(14); AMQContentBody::shared_ptr part1(new AMQContentBody(data1)); @@ -183,7 +183,7 @@ class MessageBuilderTest : public CppUnit::TestCase string data1("abcdefg"); string data2("hijklmn"); - Message::shared_ptr message(new Message(0, "test", "my_routing_key", false, false)); + Message::shared_ptr message(new BasicMessage(0, "test", "my_routing_key", false, false)); AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); header->setContentSize(14); BasicHeaderProperties* properties = dynamic_cast(header->getProperties()); @@ -200,7 +200,7 @@ class MessageBuilderTest : public CppUnit::TestCase CPPUNIT_ASSERT(handler.msg); CPPUNIT_ASSERT_EQUAL(message, handler.msg); - Message::shared_ptr restored = store.getRestoredMessage(); + BasicMessage::shared_ptr restored = store.getRestoredMessage(); CPPUNIT_ASSERT_EQUAL(message->getExchange(), restored->getExchange()); CPPUNIT_ASSERT_EQUAL(message->getRoutingKey(), restored->getRoutingKey()); CPPUNIT_ASSERT_EQUAL(message->getHeaderProperties()->getMessageId(), restored->getHeaderProperties()->getMessageId()); -- cgit v1.2.1