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, 81 insertions, 91 deletions

diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp
index 56be38a302..c3b64419ed 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/cpp/src/tests/HeaderTest.cpp
@@ -21,100 +21,90 @@
 #include <iostream>
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/FieldValue.h"
-#include "qpid_test_plugin.h"
+#include "unit_test.h"
 
 using namespace qpid::framing;
 using namespace std;
 
-class HeaderTest : public CppUnit::TestCase  
+QPID_AUTO_TEST_SUITE(HeaderTestSuite)
+
+QPID_AUTO_TEST_CASE(testGenericProperties) 
+{
+    AMQHeaderBody body;
+    body.get<MessageProperties>(true)->getApplicationHeaders().setString(
+        "A", "BCDE");
+    char buff[100];
+    Buffer wbuffer(buff, 100);
+    body.encode(wbuffer);
+
+    Buffer rbuffer(buff, 100);
+    AMQHeaderBody body2;
+    body2.decode(rbuffer, body.size());
+    MessageProperties* props =
+        body2.get<MessageProperties>(true);
+    BOOST_CHECK_EQUAL(
+        string("BCDE"),
+        props->getApplicationHeaders().get("A")->get<string>());
+}
+
+QPID_AUTO_TEST_CASE(testMessageProperties) 
 {
-    CPPUNIT_TEST_SUITE(HeaderTest);
-    CPPUNIT_TEST(testGenericProperties);
-    CPPUNIT_TEST(testMessageProperties);
-    CPPUNIT_TEST(testDeliveryProperies);
-    CPPUNIT_TEST_SUITE_END();
-
-  public:
-
-    void testGenericProperties() 
-    {
-        AMQHeaderBody body;
-        body.get<MessageProperties>(true)->getApplicationHeaders().setString(
-            "A", "BCDE");
-        char buff[100];
-        Buffer wbuffer(buff, 100);
-        body.encode(wbuffer);
-
-        Buffer rbuffer(buff, 100);
-        AMQHeaderBody body2;
-        body2.decode(rbuffer, body.size());
-        MessageProperties* props =
-            body2.get<MessageProperties>(true);
-        CPPUNIT_ASSERT_EQUAL(
-            string("BCDE"),
-            props->getApplicationHeaders().get("A")->get<string>());
-    }
-
-    void testMessageProperties() {
-        AMQFrame out(in_place<AMQHeaderBody>());
-        MessageProperties* props1 = 
-            out.castBody<AMQHeaderBody>()->get<MessageProperties>(true);
-
-        props1->setContentLength(42);
-        props1->setMessageId(Uuid(true));
-        props1->setCorrelationId("correlationId");
-        props1->setReplyTo(ReplyTo("ex","key"));
-        props1->setContentType("contentType");
-        props1->setContentEncoding("contentEncoding");
-        props1->setUserId("userId");
-        props1->setAppId("appId");
-
-        char buff[10000];
-        Buffer wbuffer(buff, 10000);
-        out.encode(wbuffer);
-
-        Buffer rbuffer(buff, 10000);
-        AMQFrame in;
-        in.decode(rbuffer);
-        MessageProperties* props2 =
-            in.castBody<AMQHeaderBody>()->get<MessageProperties>(true);
-
-        CPPUNIT_ASSERT_EQUAL(props1->getContentLength(), props2->getContentLength());
-        CPPUNIT_ASSERT_EQUAL(props1->getMessageId(), props2->getMessageId());
-        CPPUNIT_ASSERT_EQUAL(props1->getCorrelationId(), props2->getCorrelationId());
-        CPPUNIT_ASSERT_EQUAL(props1->getContentType(), props2->getContentType());
-        CPPUNIT_ASSERT_EQUAL(props1->getContentEncoding(), props2->getContentEncoding());
-        CPPUNIT_ASSERT_EQUAL(props1->getUserId(), props2->getUserId());
-        CPPUNIT_ASSERT_EQUAL(props1->getAppId(), props2->getAppId());
-
-    }
-
-    void testDeliveryProperies() {
-        AMQFrame out(in_place<AMQHeaderBody>());
-        DeliveryProperties* props1 = 
-            out.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true);
-
-        props1->setDiscardUnroutable(true);
-        props1->setExchange("foo");
-
-        char buff[10000];
-        Buffer wbuffer(buff, 10000);
-        out.encode(wbuffer);
-
-        Buffer rbuffer(buff, 10000);
-        AMQFrame in;
-        in.decode(rbuffer);
-        DeliveryProperties* props2 =
-            in.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true);
-
-        CPPUNIT_ASSERT(props2->getDiscardUnroutable());
-        CPPUNIT_ASSERT_EQUAL(string("foo"), props2->getExchange());
-        CPPUNIT_ASSERT(!props2->hasTimestamp());
-    }
-
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(HeaderTest);
+    AMQFrame out(in_place<AMQHeaderBody>());
+    MessageProperties* props1 = 
+        out.castBody<AMQHeaderBody>()->get<MessageProperties>(true);
+
+    props1->setContentLength(42);
+    props1->setMessageId(Uuid(true));
+    props1->setCorrelationId("correlationId");
+    props1->setReplyTo(ReplyTo("ex","key"));
+    props1->setContentType("contentType");
+    props1->setContentEncoding("contentEncoding");
+    props1->setUserId("userId");
+    props1->setAppId("appId");
+
+    char buff[10000];
+    Buffer wbuffer(buff, 10000);
+    out.encode(wbuffer);
+
+    Buffer rbuffer(buff, 10000);
+    AMQFrame in;
+    in.decode(rbuffer);
+    MessageProperties* props2 =
+        in.castBody<AMQHeaderBody>()->get<MessageProperties>(true);
+
+    BOOST_CHECK_EQUAL(props1->getContentLength(), props2->getContentLength());
+    BOOST_CHECK_EQUAL(props1->getMessageId(), props2->getMessageId());
+    BOOST_CHECK_EQUAL(props1->getCorrelationId(), props2->getCorrelationId());
+    BOOST_CHECK_EQUAL(props1->getContentType(), props2->getContentType());
+    BOOST_CHECK_EQUAL(props1->getContentEncoding(), props2->getContentEncoding());
+    BOOST_CHECK_EQUAL(props1->getUserId(), props2->getUserId());
+    BOOST_CHECK_EQUAL(props1->getAppId(), props2->getAppId());
+
+}
+
+QPID_AUTO_TEST_CASE(testDeliveryProperies) 
+{
+    AMQFrame out(in_place<AMQHeaderBody>());
+    DeliveryProperties* props1 = 
+        out.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true);
+
+    props1->setDiscardUnroutable(true);
+    props1->setExchange("foo");
+
+    char buff[10000];
+    Buffer wbuffer(buff, 10000);
+    out.encode(wbuffer);
+
+    Buffer rbuffer(buff, 10000);
+    AMQFrame in;
+    in.decode(rbuffer);
+    DeliveryProperties* props2 =
+        in.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true);
+
+    BOOST_CHECK(props2->getDiscardUnroutable());
+    BOOST_CHECK_EQUAL(string("foo"), props2->getExchange());
+    BOOST_CHECK(!props2->hasTimestamp());
+}
+
+QPID_AUTO_TEST_SUITE_END()