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

[jcorgan]

Author: jcorgan
Date: 2006-10-26 13:52:35 -0600 (Thu, 26 Oct 2006)
New Revision: 3863

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. Completed gr_basic_flowgraph QA code.

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 19:28:36 UTC (rev 3862)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/gr_basic_flowgraph.h
     2006-10-26 19:52:35 UTC (rev 3863)
@@ -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 1
+#define GR_FLOWGRAPH_DEBUG 0
 
 #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 19:28:36 UTC (rev 3862)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.cc
 2006-10-26 19:52:35 UTC (rev 3863)
@@ -121,6 +121,7 @@
     d_fg->connect(src1, 0, dst1, 0);
     d_fg->connect(src1, 0, dst2, 0);
     d_fg->validate();
+    CPPUNIT_ASSERT(d_fg->calc_partitions().size() == 1);
 }
 
 void qa_gr_basic_flowgraph::test_validate_2()
@@ -135,6 +136,7 @@
     d_fg->connect(nop1, 0, dst1, 0);
     d_fg->connect(nop1, 1, dst2, 0);
     d_fg->validate();
+    CPPUNIT_ASSERT(d_fg->calc_partitions().size() == 1);
 }
 
 void qa_gr_basic_flowgraph::test_validate_3()
@@ -181,3 +183,32 @@
     d_fg->validate();
     d_fg->disconnect(src1, 0, nop1, 1);
 }
+
+void qa_gr_basic_flowgraph::test_partition_1()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr src2 = gr_make_null_source(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, dst1, 0);
+    d_fg->connect(src2, 0, dst2, 0);
+    d_fg->validate();
+    CPPUNIT_ASSERT(d_fg->calc_partitions().size() == 2);
+}
+
+void qa_gr_basic_flowgraph::test_partition_2()
+{
+    CPPUNIT_ASSERT(d_fg);
+    gr_block_sptr src1 = gr_make_null_source(sizeof(int));
+    gr_block_sptr src2 = gr_make_null_source(sizeof(int));
+    gr_block_sptr src3 = gr_make_null_source(sizeof(int));
+    gr_block_sptr dst1 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst2 = gr_make_null_sink(sizeof(int));
+    gr_block_sptr dst3 = gr_make_null_sink(sizeof(int));
+    d_fg->connect(src1, 0, dst1, 0);
+    d_fg->connect(src2, 0, dst2, 0);
+    d_fg->connect(src3, 0, dst3, 0);
+    d_fg->validate();
+    CPPUNIT_ASSERT(d_fg->calc_partitions().size() == 3);
+}

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 19:28:36 UTC (rev 3862)
+++ 
gnuradio/branches/developers/jcorgan/cppwrap/gnuradio-core/src/lib/runtime/qa_gr_basic_flowgraph.h
  2006-10-26 19:52:35 UTC (rev 3863)
@@ -48,6 +48,8 @@
     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(test_partition_1);
+    CPPUNIT_TEST(test_partition_2);
     
     CPPUNIT_TEST_SUITE_END();
 
@@ -66,7 +68,9 @@
     void test_validate_3();
     void test_validate_4();
     void test_validate_5();
-        
+    void test_partition_1();
+    void test_partition_2();
+            
 public:
     void setUp();
     void tearDown();