From 998aebf83c2796fdfabc2efd804ca14103adcaaf Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 25 Jan 2010 16:07:07 -0800 Subject: Various tweaks, switched to boost unit testing. --- test/device_test.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'test/device_test.cpp') 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 #include -#include - -/*********************************************************************** - * 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(mb0[MBOARD_PROP_NAME]) << std::endl; - CPPUNIT_ASSERT_EQUAL( + BOOST_CHECK_EQUAL( device_addr.virtual_args.num_dboards, wax::cast(mb0[MBOARD_PROP_NUM_RX_DBOARDS]) ); - CPPUNIT_ASSERT_EQUAL( + BOOST_CHECK_EQUAL( device_addr.virtual_args.num_dboards, wax::cast(mb0[MBOARD_PROP_NUM_TX_DBOARDS]) ); -- cgit v1.2.3