Various tweaks, switched to boost unit testing.

1 files changed, 4 insertions, 18 deletions

diff --git a/test/device_test.cpp b/test/device_test.cpp
index 66256ba88..db305097b 100644
--- a/test/device_test.cpp
+++ b/test/device_test.cpp
@@ -2,26 +2,12 @@
 // Copyright 2010 Ettus Research LLC
 //
 
+#include <boost/test/unit_test.hpp>
 #include <usrp_uhd/device.hpp>
-#include <cppunit/extensions/HelperMacros.h>
-
-/***********************************************************************
- * cpp unit setup
- **********************************************************************/
-class device_test : public CppUnit::TestFixture{
-    CPPUNIT_TEST_SUITE(device_test);
-    CPPUNIT_TEST(test);
-    CPPUNIT_TEST_SUITE_END();
-
-public:
-    void test(void);
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(device_test);
 
 using namespace usrp_uhd;
 
-void device_test::test(void){
+BOOST_AUTO_TEST_CASE(test_device){
     device_addr_t device_addr(DEVICE_ADDR_TYPE_VIRTUAL);
     device_addr.virtual_args.num_dboards = 2;
     device_addr.virtual_args.num_rx_dsps = 3;
@@ -34,11 +20,11 @@ void device_test::test(void){
     std::cout << "Access the mboard" << std::endl;
     wax::proxy mb0 = (*dev)[DEVICE_PROP_MBOARD];
     std::cout << wax::cast<std::string>(mb0[MBOARD_PROP_NAME]) << std::endl;
-    CPPUNIT_ASSERT_EQUAL(
+    BOOST_CHECK_EQUAL(
         device_addr.virtual_args.num_dboards,
         wax::cast<size_t>(mb0[MBOARD_PROP_NUM_RX_DBOARDS])
     );
-    CPPUNIT_ASSERT_EQUAL(
+    BOOST_CHECK_EQUAL(
         device_addr.virtual_args.num_dboards,
         wax::cast<size_t>(mb0[MBOARD_PROP_NUM_TX_DBOARDS])
     );