From b5c270f10496f522ef6a03a8fa60f85d55c9187d Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 2 Feb 2007 22:03:10 +0000 Subject: * cpp/lib/common/framing/MethodContext.h: Reduced MethodContext to ChannelAdapter and Method Body. Request ID comes from body, ChannelAdapter is used to send frames, not OutputHandler. * cpp/lib/common/framing/ChannelAdapter.h,.cpp: Removed context member. Context is per-method not per-channel. * cpp/lib/broker/*: Replace direct use of OutputHandler and ChannelId with MethodContext (for responses) or ChannelAdapter (for requests.) Use context request-ID to construct responses, send all bodies via ChannelAdapter. * cpp/lib/broker/BrokerAdapter.cpp: Link broker::Channel to BrokerAdapter. * cpp/lib/broker/*: Remove unnecessary ProtocolVersion parameters. Fix bogus signatures: ProtocolVersion* -> const ProtocolVersion& * Cosmetic changes, many files: - fixed indentation, broke long lines. - removed unnecessary qpid:: prefixes. * broker/BrokerAdapter,BrokerChannel: Merged BrokerAdapter into broker::channel. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@502767 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/TxAckTest.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cpp/tests/TxAckTest.cpp') diff --git a/cpp/tests/TxAckTest.cpp b/cpp/tests/TxAckTest.cpp index a6fe0f1010..07381d187d 100644 --- a/cpp/tests/TxAckTest.cpp +++ b/cpp/tests/TxAckTest.cpp @@ -25,6 +25,7 @@ #include #include #include +#include "DummyChannel.h" using std::list; using std::vector; @@ -44,7 +45,7 @@ class TxAckTest : public CppUnit::TestCase dequeued.push_back(std::pair(msg, xid)); } - TestMessageStore() : NullMessageStore(false) {} + TestMessageStore() : NullMessageStore() {} ~TestMessageStore(){} }; @@ -69,7 +70,9 @@ public: TxAckTest() : queue(new Queue("my_queue", false, &store, 0)), op(acked, deliveries, &xid) { for(int i = 0; i < 10; i++){ - Message::shared_ptr msg(new BasicMessage(0, "exchange", "routing_key", false, false)); + Message::shared_ptr msg( + new BasicMessage(0, "exchange", "routing_key", false, false, + DummyChannel::basicGetBody())); msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC))); msg->getHeaderProperties()->setDeliveryMode(PERSISTENT); messages.push_back(msg); -- cgit v1.2.1