[Commit-gnuradio] r3861 - gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-10-26 13:19:27 -0600 (Thu, 26 Oct 2006)
New Revision: 3861

Modified:
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/gr_basic_flowgraph.h
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.cc
   
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.h
Log:
Work in progress. test_validate_5 is failing.

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/gr_basic_flowgraph.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/gr_basic_flowgraph.h
     2006-10-26 18:12:11 UTC (rev 3860)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/gr_basic_flowgraph.h
     2006-10-26 19:19:27 UTC (rev 3861)
@@ -29,7 +29,7 @@
 // and is not exported via SWIG.  This is only used when writing pure C++ 
programs.
 
 // Define to 0 to eliminate flowgraph debugging
-#define GR_FLOWGRAPH_DEBUG 0
+#define GR_FLOWGRAPH_DEBUG 1
 
 #include <gr_block.h>
 #include <boost/enable_shared_from_this.hpp>

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.cc
 2006-10-26 18:12:11 UTC (rev 3860)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.cc
 2006-10-26 19:19:27 UTC (rev 3861)
@@ -25,6 +25,7 @@
 
 #include <qa_gr_basic_flowgraph.h>
 #include <gr_basic_flowgraph.h>
+#include <gr_nop.h>
 #include <cppunit/TestAssert.h>
 
 void qa_gr_basic_flowgraph::setUp()
@@ -121,3 +122,61 @@
     d_fg->connect(src1, 0, dst2, 0);
     d_fg->validate();
 }
+
+void qa_gr_basic_flowgraph::test_validate_2()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr nop1 = gr_make_nop(sizeof(int));
+    gr_block_sptr dst1 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst2 = gr_make_null_sink(sizeof(int));
+    d_fg->connect(src1, 0, nop1, 0);
+    d_fg->connect(src1, 0, nop1, 1);
+    d_fg->connect(nop1, 0, dst1, 0);
+    d_fg->connect(nop1, 1, dst2, 0);
+    d_fg->validate();
+}
+
+void qa_gr_basic_flowgraph::test_validate_3()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr nop1 = gr_make_nop(sizeof(int));
+    gr_block_sptr dst1 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst2 = gr_make_null_sink(sizeof(int));
+    d_fg->connect(src1, 0, nop1, 0);
+    d_fg->connect(src1, 0, nop1, 2);
+    d_fg->connect(nop1, 0, dst1, 0);
+    d_fg->connect(nop1, 1, dst2, 0);
+    d_fg->validate();
+}
+
+void qa_gr_basic_flowgraph::test_validate_4()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr nop1 = gr_make_nop(sizeof(int));
+    gr_block_sptr dst1 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst2 = gr_make_null_sink(sizeof(int));
+    d_fg->connect(src1, 0, nop1, 0);
+    d_fg->connect(src1, 0, nop1, 1);
+    d_fg->connect(nop1, 0, dst1, 0);
+    d_fg->connect(nop1, 2, dst2, 0);
+    d_fg->validate();
+}
+
+void qa_gr_basic_flowgraph::test_validate_5()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr nop1 = gr_make_nop(sizeof(int));
+    gr_block_sptr dst1 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst2 = gr_make_null_sink(sizeof(int));
+    d_fg->connect(src1, 0, nop1, 0);
+    d_fg->connect(src1, 0, nop1, 1);
+    d_fg->connect(nop1, 0, dst1, 0);
+    d_fg->connect(nop1, 1, dst2, 0);
+    d_fg->validate();
+    d_fg->disconnect(src1, 0, nop1, 1);
+    d_fg->validate();
+}

Modified: 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.h
  2006-10-26 18:12:11 UTC (rev 3860)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.h
  2006-10-26 19:19:27 UTC (rev 3861)
@@ -44,6 +44,10 @@
     CPPUNIT_TEST(test_one_src_two_dst);
     CPPUNIT_TEST_EXCEPTION(test_itemsize_mismatch, std::invalid_argument);
     CPPUNIT_TEST(test_validate_1);
+    CPPUNIT_TEST(test_validate_2);
+    CPPUNIT_TEST_EXCEPTION(test_validate_3, std::invalid_argument);
+    CPPUNIT_TEST_EXCEPTION(test_validate_4, std::invalid_argument);
+    CPPUNIT_TEST_EXCEPTION(test_validate_5, std::invalid_argument);
     
     CPPUNIT_TEST_SUITE_END();
 
@@ -58,6 +62,10 @@
     void test_one_src_two_dst();
     void test_itemsize_mismatch();
     void test_validate_1();
+    void test_validate_2();
+    void test_validate_3();
+    void test_validate_4();
+    void test_validate_5();
         
 public:
     void setUp();