Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / python / gnuradio / gr / qa_add_and_friends.py

diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py b/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
index 3228ae050fe28723698cd30593ff24d31ff5c4bc..2fa97fad8d58c4ae118b92716640bee1ff33899e 100755 (executable)
--- a/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -25,38 +25,38 @@ from gnuradio import gr, gr_unittest
 class test_head (gr_unittest.TestCase):
 
     def setUp (self):
-        self.fg = gr.flow_graph ()
+        self.tb = gr.top_block ()
 
     def tearDown (self):
-        self.fg = None
+        self.tb = None
 
     def help_ii (self, src_data, exp_data, op):
         for s in zip (range (len (src_data)), src_data):
             src = gr.vector_source_i (s[1])
-            self.fg.connect (src, (op, s[0]))
+            self.tb.connect (src, (op, s[0]))
         dst = gr.vector_sink_i ()
-        self.fg.connect (op, dst)
-        self.fg.run ()
+        self.tb.connect (op, dst)
+        self.tb.run ()
         result_data = dst.data ()
         self.assertEqual (exp_data, result_data)
 
     def help_ff (self, src_data, exp_data, op):
         for s in zip (range (len (src_data)), src_data):
             src = gr.vector_source_f (s[1])
-            self.fg.connect (src, (op, s[0]))
+            self.tb.connect (src, (op, s[0]))
         dst = gr.vector_sink_f ()
-        self.fg.connect (op, dst)
-        self.fg.run ()
+        self.tb.connect (op, dst)
+        self.tb.run ()
         result_data = dst.data ()
         self.assertEqual (exp_data, result_data)
 
     def help_cc (self, src_data, exp_data, op):
         for s in zip (range (len (src_data)), src_data):
             src = gr.vector_source_c (s[1])
-            self.fg.connect (src, (op, s[0]))
+            self.tb.connect (src, (op, s[0]))
         dst = gr.vector_sink_c ()
-        self.fg.connect (op, dst)
-        self.fg.run ()
+        self.tb.connect (op, dst)
+        self.tb.run ()
         result_data = dst.data ()
         self.assertEqual (exp_data, result_data)