Merged jcorgan/ptrfix -r8827:8843 into the trunk.

[debian/gnuradio] / gnuradio-core / src / lib / runtime / qa_gr_hier_block2.cc

diff --git a/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc b/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
index 07b9d5ecf89ae9704edadd19a1593ac96a84b01c..2cf1a8d10eec73f3ce1ff103e195d61433c4ef0a 100644 (file)
--- a/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
+++ b/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -33,14 +33,25 @@
 void qa_gr_hier_block2::test_make()
 {
     gr_hier_block2_sptr src1(gr_make_hier_block2("test",
-                                                gr_make_io_signature(1, 1, sizeof(int)),
-                                                gr_make_io_signature(1, 1, sizeof(int))));
+                                                gr_make_io_signature(1, 2, 1 * sizeof(int)),
+                                                gr_make_io_signature(3, 4, 2 * sizeof(int))));
 
     CPPUNIT_ASSERT(src1);
     CPPUNIT_ASSERT_EQUAL(std::string("test"), src1->name());
-    CPPUNIT_ASSERT_EQUAL(1, 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), 
+
+    CPPUNIT_ASSERT_EQUAL(1 * (int) sizeof(int), 
+                        src1->input_signature()->sizeof_stream_item(0));
+
+    CPPUNIT_ASSERT_EQUAL(1, src1->input_signature()->min_streams());
+    CPPUNIT_ASSERT_EQUAL(2, src1->input_signature()->max_streams());
+
+
+    CPPUNIT_ASSERT_EQUAL(2 * (int) sizeof(int), 
                         src1->output_signature()->sizeof_stream_item(0));
+
+    CPPUNIT_ASSERT_EQUAL(3, src1->output_signature()->min_streams());
+    CPPUNIT_ASSERT_EQUAL(4, src1->output_signature()->max_streams());
+
 }
+
+