diff options
Diffstat (limited to 'gr-blocks/lib/qa_gr_block.cc')
| -rw-r--r-- | gr-blocks/lib/qa_gr_block.cc | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/gr-blocks/lib/qa_gr_block.cc b/gr-blocks/lib/qa_gr_block.cc index 36ec128b6e..46079165b0 100644 --- a/gr-blocks/lib/qa_gr_block.cc +++ b/gr-blocks/lib/qa_gr_block.cc @@ -24,56 +24,51 @@ #include <config.h> #endif -#include <qa_gr_block.h> #include <gnuradio/block.h> #include <gnuradio/blocks/null_sink.h> #include <gnuradio/blocks/null_source.h> +#include <boost/test/unit_test.hpp> -// ---------------------------------------------------------------- - - -void -qa_gr_block::t0 () +BOOST_AUTO_TEST_CASE(t0) { // test creation of sources gr::block_sptr src1(gr::blocks::null_source::make(sizeof (int))); - CPPUNIT_ASSERT_EQUAL(std::string("null_source"), src1->name ()); - CPPUNIT_ASSERT_EQUAL(0, src1->input_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL(1, src1->output_signature()->min_streams ()); - CPPUNIT_ASSERT_EQUAL(-1, src1->output_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL((int) sizeof(int), + BOOST_REQUIRE_EQUAL(std::string("null_source"), src1->name ()); + BOOST_REQUIRE_EQUAL(0, src1->input_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL(1, src1->output_signature()->min_streams ()); + BOOST_REQUIRE_EQUAL(-1, src1->output_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL((int) sizeof(int), src1->output_signature()->sizeof_stream_item (0)); gr::block_sptr src2(gr::blocks::null_source::make(sizeof(short))); - CPPUNIT_ASSERT_EQUAL(std::string ("null_source"), src2->name ()); - CPPUNIT_ASSERT_EQUAL(0, src2->input_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL(1, src2->output_signature()->min_streams ()); - CPPUNIT_ASSERT_EQUAL(-1, src2->output_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL((int)sizeof (short), + BOOST_REQUIRE_EQUAL(std::string ("null_source"), src2->name ()); + BOOST_REQUIRE_EQUAL(0, src2->input_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL(1, src2->output_signature()->min_streams ()); + BOOST_REQUIRE_EQUAL(-1, src2->output_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL((int)sizeof (short), src2->output_signature()->sizeof_stream_item (0)); } -void -qa_gr_block::t1 () +BOOST_AUTO_TEST_CASE(t1) { // test creation of sinks gr::block_sptr dst1 (gr::blocks::null_sink::make (sizeof (int))); - CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst1->name ()); - CPPUNIT_ASSERT_EQUAL (1, dst1->input_signature()->min_streams ()); - CPPUNIT_ASSERT_EQUAL (-1, dst1->input_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL ((int) sizeof (int), + BOOST_REQUIRE_EQUAL (std::string ("null_sink"), dst1->name ()); + BOOST_REQUIRE_EQUAL (1, dst1->input_signature()->min_streams ()); + BOOST_REQUIRE_EQUAL (-1, dst1->input_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL ((int) sizeof (int), dst1->input_signature()->sizeof_stream_item (0)); - CPPUNIT_ASSERT_EQUAL (0, dst1->output_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL (0, dst1->output_signature()->max_streams ()); gr::block_sptr dst2 (gr::blocks::null_sink::make (sizeof (short))); - CPPUNIT_ASSERT_EQUAL (std::string ("null_sink"), dst2->name ()); - CPPUNIT_ASSERT_EQUAL (1, dst2->input_signature()->min_streams ()); - CPPUNIT_ASSERT_EQUAL (-1, dst2->input_signature()->max_streams ()); - CPPUNIT_ASSERT_EQUAL ((int) sizeof (short), + BOOST_REQUIRE_EQUAL (std::string ("null_sink"), dst2->name ()); + BOOST_REQUIRE_EQUAL (1, dst2->input_signature()->min_streams ()); + BOOST_REQUIRE_EQUAL (-1, dst2->input_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL ((int) sizeof (short), dst2->input_signature()->sizeof_stream_item (0)); - CPPUNIT_ASSERT_EQUAL (0, dst2->output_signature()->max_streams ()); + BOOST_REQUIRE_EQUAL (0, dst2->output_signature()->max_streams ()); } #include <gnuradio/top_block.h> @@ -81,8 +76,7 @@ qa_gr_block::t1 () #include <gnuradio/block_detail.h> #include <gnuradio/blocks/nop.h> -void -qa_gr_block::t2 () +BOOST_AUTO_TEST_CASE(t2) { gr::block_sptr src1(gr::blocks::null_source::make(sizeof (int))); gr::block_sptr nop(gr::blocks::nop::make(sizeof (int))); @@ -98,16 +92,12 @@ qa_gr_block::t2 () const char *ibuf = nop->detail()->input(0)->buffer()->base(); int ibsize = nop->detail()->input(0)->buffer()->bufsize(); - CPPUNIT_ASSERT(obuf != NULL); - CPPUNIT_ASSERT(ibuf != NULL); - CPPUNIT_ASSERT(obsize > 0); - CPPUNIT_ASSERT(ibsize > 0); + BOOST_REQUIRE(obuf != NULL); + BOOST_REQUIRE(ibuf != NULL); + BOOST_REQUIRE(obsize > 0); + BOOST_REQUIRE(ibsize > 0); tb->stop(); tb->wait(); } -void -qa_gr_block::t3 () -{ -} |