[Commit-gnuradio] r3915 - in gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src: lib/runtime python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2006-10-31 23:42:27 -0700 (Tue, 31 Oct 2006)
New Revision: 3915

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
Log:
Work in progress.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
      2006-10-31 23:15:52 UTC (rev 3914)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
      2006-11-01 06:42:27 UTC (rev 3915)
@@ -77,10 +77,8 @@
     if (port < 0)
        throw std::invalid_argument("port number must not be negative");
        
-    if (sig->max_streams() >= 0 && port >= sig->max_streams()) {
-       std::cerr << "Port " << port << " exceeds max streams " << 
sig->max_streams() << std::endl;
+    if (sig->max_streams() >= 0 && port >= sig->max_streams())
        throw std::invalid_argument("port number exceeds max streams");
-    }
 }
 
 void gr_hier_block2_impl::check_dst_not_used(const std::string name, int port)

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
    2006-10-31 23:15:52 UTC (rev 3914)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
    2006-11-01 06:42:27 UTC (rev 3915)
@@ -96,7 +96,7 @@
        hblock.define_component("nop1", nop1)
        hblock.connect("nop1", 0, "self-out", 0)
 
-    def test_010_connect_unknown_from(self):
+    def test_010_connect_unknown_src(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -105,7 +105,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("nop2", 0, 
"self-out", 0))
     
-    def test_011_connect_unknown_to(self):
+    def test_011_connect_unknown_dst(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -114,7 +114,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("self-in", 0, 
"nop2", 0))
 
-    def test_012_connect_invalid_from_port_neg(self):
+    def test_012_connect_invalid_src_port_neg(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -123,7 +123,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("self-in", -1, 
"nop1", 0))
 
-    def test_013_connect_invalid_from_port_exceeds(self):
+    def test_013_connect_invalid_src_port_exceeds(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -132,7 +132,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("self-in", 1, 
"nop1", 0))
     
-    def test_014_connect_invalid_to_port_neg(self):
+    def test_014_connect_invalid_dst_port_neg(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -141,7 +141,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("self-in", -1, 
"nop1", 0))
 
-    def test_015_connect_invalid_to_port_exceeds(self):
+    def test_015_connect_invalid_dst_port_exceeds(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))
@@ -150,7 +150,7 @@
        hblock.define_component("nop1", nop1)
        self.assertRaises(ValueError, lambda: hblock.connect("self-in", 1, 
"nop1", 0))
 
-    def test_016_connect_dest_port_in_use(self):
+    def test_016_connect_dst_port_in_use(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))