From 1a14b81c86c49d562486ab2c55a75c564144fa71 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 22 Jan 2009 20:29:12 +0000 Subject: Removed BodyHolder: minor performance improvement, opens the way for more efficient memory management. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@736783 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/MessageBuilderTest.cpp | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'cpp/src/tests/MessageBuilderTest.cpp') diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp index 313a91c053..a183742832 100644 --- a/cpp/src/tests/MessageBuilderTest.cpp +++ b/cpp/src/tests/MessageBuilderTest.cpp @@ -101,9 +101,8 @@ QPID_AUTO_TEST_CASE(testHeaderOnly) std::string exchange("builder-exchange"); std::string key("builder-exchange"); - AMQFrame method(in_place( - ProtocolVersion(), exchange, 0, 0)); - AMQFrame header(in_place()); + AMQFrame method((MessageTransferBody(ProtocolVersion(), exchange, 0, 0))); + AMQFrame header((AMQHeaderBody())); header.castBody()->get(true)->setContentLength(0); header.castBody()->get(true)->setRoutingKey(key); @@ -126,9 +125,9 @@ QPID_AUTO_TEST_CASE(test1ContentFrame) std::string exchange("builder-exchange"); std::string key("builder-exchange"); - AMQFrame method(in_place(ProtocolVersion(), exchange, 0, 0)); - AMQFrame header(in_place()); - AMQFrame content(in_place(data)); + AMQFrame method((MessageTransferBody(ProtocolVersion(), exchange, 0, 0))); + AMQFrame header((AMQHeaderBody())); + AMQFrame content((AMQContentBody(data))); method.setEof(false); header.setBof(false); header.setEof(false); @@ -160,11 +159,10 @@ QPID_AUTO_TEST_CASE(test2ContentFrames) std::string exchange("builder-exchange"); std::string key("builder-exchange"); - AMQFrame method(in_place( - ProtocolVersion(), exchange, 0, 0)); - AMQFrame header(in_place()); - AMQFrame content1(in_place(data1)); - AMQFrame content2(in_place(data2)); + AMQFrame method((MessageTransferBody(ProtocolVersion(), exchange, 0, 0))); + AMQFrame header((AMQHeaderBody())); + AMQFrame content1((AMQContentBody(data1))); + AMQFrame content2((AMQContentBody(data2))); method.setEof(false); header.setBof(false); header.setEof(false); @@ -197,11 +195,10 @@ QPID_AUTO_TEST_CASE(testStaging) std::string exchange("builder-exchange"); std::string key("builder-exchange"); - AMQFrame method(in_place( - ProtocolVersion(), exchange, 0, 0)); - AMQFrame header(in_place()); - AMQFrame content1(in_place(data1)); - AMQFrame content2(in_place(data2)); + AMQFrame method(MessageTransferBody(ProtocolVersion(), exchange, 0, 0)); + AMQFrame header((AMQHeaderBody())); + AMQFrame content1((AMQContentBody(data1))); + AMQFrame content2((AMQContentBody(data2))); header.castBody()->get(true)->setContentLength(data1.size() + data2.size()); header.castBody()->get(true)->setRoutingKey(key); -- cgit v1.2.1