Convert remaining cppunit tests to boost test framework to reduce dependencies.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@661587 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 164 insertions, 173 deletions

diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index 69e2ec1c1e..35b147a875 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -24,7 +24,7 @@
 #include "qpid/framing/frame_functors.h"
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/TypeFilter.h"
-#include "qpid_test_plugin.h"
+#include "unit_test.h"
 #include <list>
 
 using namespace boost;
@@ -32,194 +32,185 @@ using namespace qpid::broker;
 using namespace qpid::framing;
 using namespace qpid::sys;
 
-class MessageBuilderTest : public CppUnit::TestCase  
+class MockMessageStore : public NullMessageStore
 {
-    class MockMessageStore : public NullMessageStore
-    {
-        enum Op {STAGE=1, APPEND=2};
+    enum Op {STAGE=1, APPEND=2};
 
-        uint64_t id;
-        intrusive_ptr<PersistableMessage> expectedMsg;        
-        string expectedData;
-        std::list<Op> ops;
+    uint64_t id;
+    intrusive_ptr<PersistableMessage> expectedMsg;        
+    string expectedData;
+    std::list<Op> ops;
         
-        void checkExpectation(Op actual)
-        {
-            CPPUNIT_ASSERT_EQUAL(ops.front(), actual);
-            ops.pop_front();
-        }
-
-    public:
-        MockMessageStore() : id(0), expectedMsg(0) {}
-
-        void expectStage(PersistableMessage& msg) 
-        { 
-            expectedMsg = &msg;
-            ops.push_back(STAGE); 
-        }
-
-        void expectAppendContent(PersistableMessage& msg, const string& data) 
-        { 
-            expectedMsg = &msg;
-            expectedData = data;
-            ops.push_back(APPEND); 
-        }
-
-        void stage(intrusive_ptr<PersistableMessage>& msg)
-        {
-            checkExpectation(STAGE);
-            CPPUNIT_ASSERT_EQUAL(expectedMsg, msg);
-            msg->setPersistenceId(++id);
-        }
-
-        void appendContent(intrusive_ptr<const PersistableMessage>& msg, const string& data)
-        {
-            checkExpectation(APPEND);
-            CPPUNIT_ASSERT_EQUAL(static_pointer_cast<const PersistableMessage>(expectedMsg), msg);
-            CPPUNIT_ASSERT_EQUAL(expectedData, data);            
-        }
-
-        bool expectationsMet()
-        {
-            return ops.empty();
-        }
-    };
-
-    CPPUNIT_TEST_SUITE(MessageBuilderTest);
-    CPPUNIT_TEST(testHeaderOnly);
-    CPPUNIT_TEST(test1ContentFrame);
-    CPPUNIT_TEST(test2ContentFrames);
-    CPPUNIT_TEST(testStaging);
-    CPPUNIT_TEST_SUITE_END();
+    void checkExpectation(Op actual)
+    {
+        BOOST_CHECK_EQUAL(ops.front(), actual);
+        ops.pop_front();
+    }
 
   public:
+    MockMessageStore() : id(0), expectedMsg(0) {}
 
-    void testHeaderOnly(){
-        MessageBuilder builder(0, 0);
-        builder.start(SequenceNumber());
-
-        std::string exchange("builder-exchange");
-        std::string key("builder-exchange");
-
-        AMQFrame method(in_place<MessageTransferBody>(
-                            ProtocolVersion(), exchange, 0, 0));
-        AMQFrame header(in_place<AMQHeaderBody>());
-
-        header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(0);        
-        header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+    void expectStage(PersistableMessage& msg) 
+    { 
+        expectedMsg = &msg;
+        ops.push_back(STAGE); 
+    }
 
-        builder.handle(method);
-        builder.handle(header);
+    void expectAppendContent(PersistableMessage& msg, const string& data) 
+    { 
+        expectedMsg = &msg;
+        expectedData = data;
+        ops.push_back(APPEND); 
+    }
 
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT_EQUAL(exchange, builder.getMessage()->getExchangeName());
-        CPPUNIT_ASSERT_EQUAL(key, builder.getMessage()->getRoutingKey());
-        CPPUNIT_ASSERT(builder.getMessage()->getFrames().isComplete());
+    void stage(intrusive_ptr<PersistableMessage>& msg)
+    {
+        checkExpectation(STAGE);
+        BOOST_CHECK_EQUAL(expectedMsg, msg);
+        msg->setPersistenceId(++id);
     }
 
-    void test1ContentFrame(){
-        MessageBuilder builder(0, 0);
-        builder.start(SequenceNumber());
+    void appendContent(intrusive_ptr<const PersistableMessage>& msg, const string& data)
+    {
+        checkExpectation(APPEND);
+        BOOST_CHECK_EQUAL(static_pointer_cast<const PersistableMessage>(expectedMsg), msg);
+        BOOST_CHECK_EQUAL(expectedData, data);            
+    }
 
-        std::string data("abcdefg");
-        std::string exchange("builder-exchange");
-        std::string key("builder-exchange");
+    bool expectationsMet()
+    {
+        return ops.empty();
+    }
+};
 
-        AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), exchange, 0, 0));
-        AMQFrame header(in_place<AMQHeaderBody>());
-        AMQFrame content(in_place<AMQContentBody>(data));
-        method.setEof(false);
-        header.setBof(false);
-        header.setEof(false);
-        content.setBof(false);
+QPID_AUTO_TEST_SUITE(MessageBuilderTestSuite)
+    
+QPID_AUTO_TEST_CASE(testHeaderOnly)
+{
+    MessageBuilder builder(0, 0);
+    builder.start(SequenceNumber());
 
-        header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data.size());        
-        header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+    std::string exchange("builder-exchange");
+    std::string key("builder-exchange");
 
-        builder.handle(method);
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT(!builder.getMessage()->getFrames().isComplete());
+    AMQFrame method(in_place<MessageTransferBody>(
+                        ProtocolVersion(), exchange, 0, 0));
+    AMQFrame header(in_place<AMQHeaderBody>());
 
-        builder.handle(header);
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT(!builder.getMessage()->getFrames().isComplete());
+    header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(0);        
+    header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
 
-        builder.handle(content);        
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT(builder.getMessage()->getFrames().isComplete());
-    }
+    builder.handle(method);
+    builder.handle(header);
 
-    void test2ContentFrames(){
-        MessageBuilder builder(0, 0);
-        builder.start(SequenceNumber());
-
-        std::string data1("abcdefg");
-        std::string data2("hijklmn");
-        std::string exchange("builder-exchange");
-        std::string key("builder-exchange");
-
-        AMQFrame method(in_place<MessageTransferBody>(
-                            ProtocolVersion(), exchange, 0, 0));
-        AMQFrame header(in_place<AMQHeaderBody>());
-        AMQFrame content1(in_place<AMQContentBody>(data1));
-        AMQFrame content2(in_place<AMQContentBody>(data2));
-        method.setEof(false);
-        header.setBof(false);
-        header.setEof(false);
-        content1.setBof(false);
-        content1.setEof(false);
-        content2.setBof(false);
-
-        header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size() + data2.size());        
-        header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
-
-        builder.handle(method);
-        builder.handle(header);
-        builder.handle(content1);
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT(!builder.getMessage()->getFrames().isComplete());
-
-        builder.handle(content2);
-        CPPUNIT_ASSERT(builder.getMessage());
-        CPPUNIT_ASSERT(builder.getMessage()->getFrames().isComplete());
-    }
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK_EQUAL(exchange, builder.getMessage()->getExchangeName());
+    BOOST_CHECK_EQUAL(key, builder.getMessage()->getRoutingKey());
+    BOOST_CHECK(builder.getMessage()->getFrames().isComplete());
+}
 
-    void testStaging(){
-        MockMessageStore store;
-        MessageBuilder builder(&store, 5);
-        builder.start(SequenceNumber());
+QPID_AUTO_TEST_CASE(test1ContentFrame)
+{
+    MessageBuilder builder(0, 0);
+    builder.start(SequenceNumber());
+
+    std::string data("abcdefg");
+    std::string exchange("builder-exchange");
+    std::string key("builder-exchange");
+
+    AMQFrame method(in_place<MessageTransferBody>(ProtocolVersion(), exchange, 0, 0));
+    AMQFrame header(in_place<AMQHeaderBody>());
+    AMQFrame content(in_place<AMQContentBody>(data));
+    method.setEof(false);
+    header.setBof(false);
+    header.setEof(false);
+    content.setBof(false);
+
+    header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data.size());        
+    header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+
+    builder.handle(method);
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK(!builder.getMessage()->getFrames().isComplete());
+
+    builder.handle(header);
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK(!builder.getMessage()->getFrames().isComplete());
+
+    builder.handle(content);        
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK(builder.getMessage()->getFrames().isComplete());
+}
+
+QPID_AUTO_TEST_CASE(test2ContentFrames)
+{
+    MessageBuilder builder(0, 0);
+    builder.start(SequenceNumber());
+
+    std::string data1("abcdefg");
+    std::string data2("hijklmn");
+    std::string exchange("builder-exchange");
+    std::string key("builder-exchange");
+
+    AMQFrame method(in_place<MessageTransferBody>(
+                        ProtocolVersion(), exchange, 0, 0));
+    AMQFrame header(in_place<AMQHeaderBody>());
+    AMQFrame content1(in_place<AMQContentBody>(data1));
+    AMQFrame content2(in_place<AMQContentBody>(data2));
+    method.setEof(false);
+    header.setBof(false);
+    header.setEof(false);
+    content1.setBof(false);
+    content1.setEof(false);
+    content2.setBof(false);
+
+    header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size() + data2.size());        
+    header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+
+    builder.handle(method);
+    builder.handle(header);
+    builder.handle(content1);
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK(!builder.getMessage()->getFrames().isComplete());
+
+    builder.handle(content2);
+    BOOST_CHECK(builder.getMessage());
+    BOOST_CHECK(builder.getMessage()->getFrames().isComplete());
+}
+
+QPID_AUTO_TEST_CASE(testStaging)
+{
+    MockMessageStore store;
+    MessageBuilder builder(&store, 5);
+    builder.start(SequenceNumber());
         
-        std::string data1("abcdefg");
-        std::string data2("hijklmn");
-        std::string exchange("builder-exchange");
-        std::string key("builder-exchange");
-
-        AMQFrame method(in_place<MessageTransferBody>(
-                            ProtocolVersion(), exchange, 0, 0));
-        AMQFrame header(in_place<AMQHeaderBody>());
-        AMQFrame content1(in_place<AMQContentBody>(data1));
-        AMQFrame content2(in_place<AMQContentBody>(data2));
-
-        header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size() + data2.size());        
-        header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
-
-        builder.handle(method);
-        builder.handle(header);
-
-        store.expectStage(*builder.getMessage());
-        builder.handle(content1);
-        CPPUNIT_ASSERT(store.expectationsMet());
-        CPPUNIT_ASSERT_EQUAL((uint64_t) 1, builder.getMessage()->getPersistenceId());
-
-        store.expectAppendContent(*builder.getMessage(), data2);
-        builder.handle(content2);
-        CPPUNIT_ASSERT(store.expectationsMet());
-
-        //were the content frames dropped?
-        CPPUNIT_ASSERT(!builder.getMessage()->isContentLoaded());
-    }
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(MessageBuilderTest);
+    std::string data1("abcdefg");
+    std::string data2("hijklmn");
+    std::string exchange("builder-exchange");
+    std::string key("builder-exchange");
+
+    AMQFrame method(in_place<MessageTransferBody>(
+                        ProtocolVersion(), exchange, 0, 0));
+    AMQFrame header(in_place<AMQHeaderBody>());
+    AMQFrame content1(in_place<AMQContentBody>(data1));
+    AMQFrame content2(in_place<AMQContentBody>(data2));
+
+    header.castBody<AMQHeaderBody>()->get<MessageProperties>(true)->setContentLength(data1.size() + data2.size());        
+    header.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true)->setRoutingKey(key);
+
+    builder.handle(method);
+    builder.handle(header);
+
+    store.expectStage(*builder.getMessage());
+    builder.handle(content1);
+    BOOST_CHECK(store.expectationsMet());
+    BOOST_CHECK_EQUAL((uint64_t) 1, builder.getMessage()->getPersistenceId());
+
+    store.expectAppendContent(*builder.getMessage(), data2);
+    builder.handle(content2);
+    BOOST_CHECK(store.expectationsMet());
+    //were the content frames dropped?
+    BOOST_CHECK_ASSERT(!builder.getMessage()->isContentLoaded());
+}
+
+QPID_AUTO_TEST_SUITE_END()