Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageBuilderTest.cpp Thu Aug 16 13:12:33 2007 @@ -119,12 +119,12 @@ Message::shared_ptr message( new BasicMessage( 0, "test", "my_routing_key", false, false)); - AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); - header->setContentSize(0); + AMQHeaderBody header(BASIC); + header.setContentSize(0); builder.initialise(message); CPPUNIT_ASSERT(!handler.msg); - builder.setHeader(header); + builder.setHeader(&header); CPPUNIT_ASSERT(handler.msg); CPPUNIT_ASSERT_EQUAL(message, handler.msg); } @@ -137,15 +137,15 @@ 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)); + AMQHeaderBody header(BASIC); + header.setContentSize(7); + AMQContentBody part1(data1); builder.initialise(message); CPPUNIT_ASSERT(!handler.msg); - builder.setHeader(header); + builder.setHeader(&header); CPPUNIT_ASSERT(!handler.msg); - builder.addContent(part1); + builder.addContent(&part1); CPPUNIT_ASSERT(handler.msg); CPPUNIT_ASSERT_EQUAL(message, handler.msg); } @@ -159,18 +159,18 @@ 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)); - AMQContentBody::shared_ptr part2(new AMQContentBody(data2)); + AMQHeaderBody header(BASIC); + header.setContentSize(14); + AMQContentBody part1(data1); + AMQContentBody part2(data2); builder.initialise(message); CPPUNIT_ASSERT(!handler.msg); - builder.setHeader(header); + builder.setHeader(&header); CPPUNIT_ASSERT(!handler.msg); - builder.addContent(part1); + builder.addContent(&part1); CPPUNIT_ASSERT(!handler.msg); - builder.addContent(part2); + builder.addContent(&part2); CPPUNIT_ASSERT(handler.msg); CPPUNIT_ASSERT_EQUAL(message, handler.msg); } @@ -189,19 +189,19 @@ 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<BasicHeaderProperties*>(header->getProperties()); + AMQHeaderBody header(BASIC); + header.setContentSize(14); + BasicHeaderProperties* properties = dynamic_cast<BasicHeaderProperties*>(header.getProperties()); properties->setMessageId("MyMessage"); properties->getHeaders().setString("abc", "xyz"); - AMQContentBody::shared_ptr part1(new AMQContentBody(data1)); - AMQContentBody::shared_ptr part2(new AMQContentBody(data2)); + AMQContentBody part1(data1); + AMQContentBody part2(data2); builder.initialise(message); - builder.setHeader(header); - builder.addContent(part1); - builder.addContent(part2); + builder.setHeader(&header); + builder.addContent(&part1); + builder.addContent(&part2); CPPUNIT_ASSERT(handler.msg); CPPUNIT_ASSERT_EQUAL(message, handler.msg);
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/MessageTest.cpp Thu Aug 16 13:12:33 2007 @@ -47,13 +47,13 @@ BasicMessage::shared_ptr msg( new BasicMessage(0, exchange, routingKey, false, false)); - AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); - header->setContentSize(14); - AMQContentBody::shared_ptr part1(new AMQContentBody(data1)); - AMQContentBody::shared_ptr part2(new AMQContentBody(data2)); - msg->setHeader(header); - msg->addContent(part1); - msg->addContent(part2); + AMQHeaderBody header(BASIC); + header.setContentSize(14); + AMQContentBody part1(data1); + AMQContentBody part2(data2); + msg->setHeader(&header); + msg->addContent(&part1); + msg->addContent(&part2); msg->getHeaderProperties()->setMessageId(messageId); msg->getHeaderProperties()->setDeliveryMode(PERSISTENT); @@ -75,7 +75,8 @@ MockChannel channel(1); msg->deliver(channel, "ignore", 0, 100); CPPUNIT_ASSERT_EQUAL((size_t) 3, channel.out.frames.size()); - AMQContentBody::shared_ptr contentBody(dynamic_pointer_cast<AMQContentBody, AMQBody>(channel.out.frames[2].getBody())); + AMQContentBody* contentBody( + dynamic_cast<AMQContentBody*>(channel.out.frames[2].getBody())); CPPUNIT_ASSERT(contentBody); CPPUNIT_ASSERT_EQUAL(data1 + data2, contentBody->getData()); } Modified: incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/MockChannel.h Thu Aug 16 13:12:33 2007 @@ -51,13 +51,10 @@ bool isOpen() const { return true; } - void handleHeader( - boost::shared_ptr<qpid::framing::AMQHeaderBody> b) { send(b); } - void handleContent( - boost::shared_ptr<qpid::framing::AMQContentBody> b) { send(b); } - void handleHeartbeat( - boost::shared_ptr<qpid::framing::AMQHeartbeatBody> b) { send(b); } - void handleMethod(boost::shared_ptr<qpid::framing::AMQMethodBody> method) { send(method); }; + void handleHeader(qpid::framing::AMQHeaderBody* b) { send(*b); } + void handleContent(qpid::framing::AMQContentBody* b) { send(*b); } + void handleHeartbeat(qpid::framing::AMQHeartbeatBody* b) { send(*b); } + void handleMethod(qpid::framing::AMQMethodBody* b) { send(*b); }; }; Modified: incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/ReferenceTest.cpp Thu Aug 16 13:12:33 2007 @@ -67,17 +67,17 @@ Reference::shared_ptr r1(registry.open("bar")); - MessageTransferBody::shared_ptr t1(new MessageTransferBody(v)); + MessageTransferBody t1(v); // TODO aconway 2007-04-03: hack around lack of generated setters. Clean this up. - const_cast<framing::Content&>(t1->getBody()) = framing::Content(REFERENCE,"bar"); - MessageMessage::shared_ptr m1(new MessageMessage(0, t1, r1)); + const_cast<framing::Content&>(t1.getBody()) = framing::Content(REFERENCE,"bar"); + MessageMessage::shared_ptr m1(new MessageMessage(0, &t1, r1)); - MessageTransferBody::shared_ptr t2(new MessageTransferBody(v)); - const_cast<framing::Content&>(t2->getBody()) = framing::Content(REFERENCE,"bar"); - MessageMessage::shared_ptr m2(new MessageMessage(0, t2, r1)); + MessageTransferBody t2(v); + const_cast<framing::Content&>(t2.getBody()) = framing::Content(REFERENCE,"bar"); + MessageMessage::shared_ptr m2(new MessageMessage(0, &t2, r1)); - MessageAppendBody::shared_ptr a1(new MessageAppendBody(v)); - MessageAppendBody::shared_ptr a2(new MessageAppendBody(v)); + MessageAppendBody a1(v); + MessageAppendBody a2(v); r1->addMessage(m1); r1->addMessage(m2); @@ -86,12 +86,6 @@ r1->append(a2); CPPUNIT_ASSERT_EQUAL(size_t(2), r1->getAppends().size()); r1->close(); - - CPPUNIT_ASSERT_EQUAL(m1->getReference()->getAppends()[0], a1); - CPPUNIT_ASSERT_EQUAL(m1->getReference()->getAppends()[1], a2); - - CPPUNIT_ASSERT_EQUAL(m2->getReference()->getAppends()[0], a1); - CPPUNIT_ASSERT_EQUAL(m2->getReference()->getAppends()[1], a2); } }; Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/TxAckTest.cpp Thu Aug 16 13:12:33 2007 @@ -70,7 +70,8 @@ for(int i = 0; i < 10; i++){ Message::shared_ptr msg( new BasicMessage(0, "exchange", "routing_key", false, false)); - msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC))); + AMQHeaderBody body(BASIC); + msg->setHeader(&body); msg->getHeaderProperties()->setDeliveryMode(PERSISTENT); messages.push_back(msg); deliveries.push_back(DeliveryRecord(msg, queue, "xyz", (i+1))); Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp?view=diff&rev=566822&r1=566821&r2=566822 ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/TxPublishTest.cpp Thu Aug 16 13:12:33 2007 @@ -72,7 +72,8 @@ msg(new BasicMessage(0, "exchange", "routing_key", false, false)), op(msg) { - msg->setHeader(AMQHeaderBody::shared_ptr(new AMQHeaderBody(BASIC))); + AMQHeaderBody body(BASIC); + msg->setHeader(&body); msg->getHeaderProperties()->setDeliveryMode(PERSISTENT); op.deliverTo(queue1); op.deliverTo(queue2);
