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, 23 insertions, 31 deletions

diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/cpp/src/tests/DeliveryRecordTest.cpp
index 9487f743d6..43161b4065 100644
--- a/cpp/src/tests/DeliveryRecordTest.cpp
+++ b/cpp/src/tests/DeliveryRecordTest.cpp
@@ -20,7 +20,7 @@
  *
  */
 #include "qpid/broker/DeliveryRecord.h"
-#include "qpid_test_plugin.h"
+#include "unit_test.h"
 #include <iostream>
 #include <memory>
 #include <boost/format.hpp>
@@ -31,38 +31,30 @@ using namespace qpid::framing;
 using boost::dynamic_pointer_cast;
 using std::list;
 
-class DeliveryRecordTest : public CppUnit::TestCase  
-{
-    CPPUNIT_TEST_SUITE(DeliveryRecordTest);
-    CPPUNIT_TEST(testSort);
-    CPPUNIT_TEST_SUITE_END();
-
-public:
-
-    void testSort()
-    {
-        list<SequenceNumber> ids;
-        ids.push_back(SequenceNumber(6));
-        ids.push_back(SequenceNumber(2));
-        ids.push_back(SequenceNumber(4));
-        ids.push_back(SequenceNumber(5));
-        ids.push_back(SequenceNumber(1));
-        ids.push_back(SequenceNumber(3));
+QPID_AUTO_TEST_SUITE(DeliveryRecordTestSuite)
 
-        list<DeliveryRecord> records;
-        for (list<SequenceNumber>::iterator i = ids.begin(); i != ids.end(); i++) {
-            records.push_back(DeliveryRecord(QueuedMessage(0), Queue::shared_ptr(), "tag", DeliveryToken::shared_ptr(), *i, false, false));
-        }
-        records.sort();
+QPID_AUTO_TEST_CASE(testSort)
+{
+    list<SequenceNumber> ids;
+    ids.push_back(SequenceNumber(6));
+    ids.push_back(SequenceNumber(2));
+    ids.push_back(SequenceNumber(4));
+    ids.push_back(SequenceNumber(5));
+    ids.push_back(SequenceNumber(1));
+    ids.push_back(SequenceNumber(3));
+
+    list<DeliveryRecord> records;
+    for (list<SequenceNumber>::iterator i = ids.begin(); i != ids.end(); i++) {
+        records.push_back(DeliveryRecord(QueuedMessage(0), Queue::shared_ptr(), "tag", DeliveryToken::shared_ptr(), *i, false, false));
+    }
+    records.sort();
 
-        SequenceNumber expected(0);
-        for (list<DeliveryRecord>::iterator i = records.begin(); i != records.end(); i++) {
-            CPPUNIT_ASSERT(i->matches(++expected));
-        }
+    SequenceNumber expected(0);
+    for (list<DeliveryRecord>::iterator i = records.begin(); i != records.end(); i++) {
+        BOOST_CHECK(i->matches(++expected));
     }
-};
+}
+
 
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(DeliveryRecordTest);
+QPID_AUTO_TEST_SUITE_END()