Author: gordonsim
Date: 2007-09-20 03:46:22 -0400 (Thu, 20 Sep 2007)
New Revision: 929
Modified:
store/trunk/cpp/tests/SimpleTest.cpp
Log:
Updated inline with recent changes on qpid-trunk (signature to MessageDelivery::deliver()
was changed)
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2007-09-19 17:52:00 UTC (rev 928)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2007-09-20 07:46:22 UTC (rev 929)
@@ -53,20 +53,6 @@
}
};
-class DummyAdapter : public ChannelAdapter
-{
-public:
- DummyAdapter(ChannelId id, OutputHandler* out, ProtocolVersion ver) {
- ChannelAdapter::init(id, *out, ver);
- }
-
- virtual void handleMethod(AMQMethodBody*) {}
- virtual void handleHeader(AMQHeaderBody*) {}
- virtual void handleContent(AMQContentBody*) {}
- virtual void handleHeartbeat(AMQHeartbeatBody*) {}
- virtual bool isOpen() const { return true; }
-};
-
class SimpleTest : public CppUnit::TestCase
{
CPPUNIT_TEST_SUITE(SimpleTest);
@@ -242,8 +228,7 @@
CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, msg->contentSize());
DummyHandler handler;
- DummyAdapter adapter(0, &handler,
qpid::framing::highestProtocolVersion);
- MessageDelivery::deliver(msg, adapter, 0,
MessageDelivery::getBasicConsumeToken("ignore"), 100);
+ MessageDelivery::deliver(msg, handler, 0,
MessageDelivery::getBasicConsumeToken("ignore"), 100);
CPPUNIT_ASSERT_EQUAL((size_t) 3, handler.frames.size());
AMQContentBody*
contentBody(dynamic_cast<AMQContentBody*>(handler.frames[2].getBody()));
CPPUNIT_ASSERT(contentBody);
@@ -322,8 +307,7 @@
//load it (without recovery)
DummyHandler handler;
- DummyAdapter adapter(0, &handler,
qpid::framing::highestProtocolVersion);
- MessageDelivery::deliver(msg, adapter, 0,
+ MessageDelivery::deliver(msg, handler, 0,
MessageDelivery::getBasicConsumeToken("ignore"), 20);//52 chars of data, i.e. 2
chunks of 20 and one of 12
CPPUNIT_ASSERT(handler.frames.size() > 2);
string loaded;
@@ -362,8 +346,7 @@
//load lazily
DummyHandler handler;
- DummyAdapter adapter(0, &handler,
qpid::framing::highestProtocolVersion);
- MessageDelivery::deliver(msg, adapter, 0,
MessageDelivery::getBasicConsumeToken("ignore"), 20);//52 chars of data, i.e. 2
chunks of 20 and one of 12
+ MessageDelivery::deliver(msg, handler, 0,
MessageDelivery::getBasicConsumeToken("ignore"), 20);//52 chars of data, i.e. 2
chunks of 20 and one of 12
CPPUNIT_ASSERT(handler.frames.size() > 2);
string loaded;