diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-29 23:08:08 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-29 23:08:08 +0000 |
| commit | 89e0f01cc546f252fdcc680d5eaba2841f9d62a6 (patch) | |
| tree | 96f68071042dec955fd53359d98467636f2310dc /cpp/tests/BrokerChannelTest.cpp | |
| parent | 060c7af39f60a9ea72b29ed3a603fc0ee236dd05 (diff) | |
| download | qpid-python-89e0f01cc546f252fdcc680d5eaba2841f9d62a6.tar.gz | |
* tests/BrokerChannelTest.cpp: fixed leak in test code.
* tests/.vg-supp: Updated supressions
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@523869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/tests/BrokerChannelTest.cpp')
| -rw-r--r-- | cpp/tests/BrokerChannelTest.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/cpp/tests/BrokerChannelTest.cpp b/cpp/tests/BrokerChannelTest.cpp index 8717be07b5..61135c898b 100644 --- a/cpp/tests/BrokerChannelTest.cpp +++ b/cpp/tests/BrokerChannelTest.cpp @@ -31,6 +31,7 @@ #include "MockChannel.h" #include "broker/Connection.h" #include "ProtocolInitiation.h" +#include <boost/ptr_container/ptr_vector.hpp> using namespace boost; using namespace qpid::broker; @@ -40,7 +41,7 @@ using std::string; using std::queue; struct MockHandler : ConnectionOutputHandler{ - std::vector<AMQFrame*> frames; + boost::ptr_vector<AMQFrame> frames; void send(AMQFrame* frame){ frames.push_back(frame); } @@ -190,18 +191,18 @@ class BrokerChannelTest : public CppUnit::TestCase queue->deliver(msg); CPPUNIT_ASSERT_EQUAL((size_t) 4, handler.frames.size()); - CPPUNIT_ASSERT_EQUAL(ChannelId(0), handler.frames[0]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[1]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[2]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[3]->getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(0), handler.frames[0].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[1].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[2].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[3].getChannel()); CPPUNIT_ASSERT(dynamic_cast<ConnectionStartBody*>( - handler.frames[0]->getBody().get())); + handler.frames[0].getBody().get())); CPPUNIT_ASSERT(dynamic_cast<BasicDeliverBody*>( - handler.frames[1]->getBody().get())); + handler.frames[1].getBody().get())); CPPUNIT_ASSERT(dynamic_cast<AMQHeaderBody*>( - handler.frames[2]->getBody().get())); + handler.frames[2].getBody().get())); AMQContentBody* contentBody = dynamic_cast<AMQContentBody*>( - handler.frames[3]->getBody().get()); + handler.frames[3].getBody().get()); CPPUNIT_ASSERT(contentBody); CPPUNIT_ASSERT_EQUAL(data, contentBody->getData()); } @@ -221,18 +222,18 @@ class BrokerChannelTest : public CppUnit::TestCase queue->deliver(msg); CPPUNIT_ASSERT_EQUAL((size_t) 4, handler.frames.size()); - CPPUNIT_ASSERT_EQUAL(ChannelId(0), handler.frames[0]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[1]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[2]->getChannel()); - CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[3]->getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(0), handler.frames[0].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[1].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[2].getChannel()); + CPPUNIT_ASSERT_EQUAL(ChannelId(7), handler.frames[3].getChannel()); CPPUNIT_ASSERT(dynamic_cast<ConnectionStartBody*>( - handler.frames[0]->getBody().get())); + handler.frames[0].getBody().get())); CPPUNIT_ASSERT(dynamic_cast<BasicDeliverBody*>( - handler.frames[1]->getBody().get())); + handler.frames[1].getBody().get())); CPPUNIT_ASSERT(dynamic_cast<AMQHeaderBody*>( - handler.frames[2]->getBody().get())); + handler.frames[2].getBody().get())); AMQContentBody* contentBody = dynamic_cast<AMQContentBody*>( - handler.frames[3]->getBody().get()); + handler.frames[3].getBody().get()); CPPUNIT_ASSERT(contentBody); CPPUNIT_ASSERT_EQUAL(data, contentBody->getData()); } |