3 files changed, 130 insertions, 3 deletions
diff --git a/gr-analog/python/qa_ctcss_squelch.py b/gr-analog/python/qa_ctcss_squelch.py
index 4d4fc30778..08d3dbfef8 100755
--- a/gr-analog/python/qa_ctcss_squelch.py
+++ b/gr-analog/python/qa_ctcss_squelch.py
@@ -49,7 +49,7 @@ class test_ctcss_squelch(gr_unittest.TestCase):
 
         op.set_ramp(ramp2)
         r = op.ramp()
-        self.assertEqual(rate2, r)
+        self.assertEqual(ramp2, r)
 
         op.set_gate(gate2)
         g = op.gate()
diff --git a/gr-analog/python/qa_pwr_squelch.py b/gr-analog/python/qa_pwr_squelch.py
new file mode 100755
index 0000000000..dd42c7fb90
--- /dev/null
+++ b/gr-analog/python/qa_pwr_squelch.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+#
+# Copyright 2012 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 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest
+import analog_swig as analog
+
+class test_pwr_squelch(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_pwr_squelch_001(self):
+        # Test set/gets
+
+        alpha = 0.0001
+        
+        thr1 = 10
+        thr2 = 20
+        ramp = 1
+        ramp2 = 2
+        gate = True
+        gate2 = False
+
+        op = analog.pwr_squelch_cc(thr1, alpha, ramp, gate)
+
+        op.set_threshold(thr2)
+        t = op.threshold()
+        self.assertEqual(thr2, t)
+
+        op.set_ramp(ramp2)
+        r = op.ramp()
+        self.assertEqual(ramp2, r)
+
+        op.set_gate(gate2)
+        g = op.gate()
+        self.assertEqual(gate2, g)
+
+    def test_pwr_squelch_002(self):
+        # Test runtime, gate=True
+        alpha = 0.0001
+        thr = -25
+
+        src_data = map(lambda x: float(x)/10.0, range(1, 40))
+        src = gr.vector_source_c(src_data)
+        op = analog.pwr_squelch_cc(thr, alpha)
+        dst = gr.vector_sink_c()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        expected_result = src_data
+        expected_result[0:20] = 20*[0,]
+
+        result_data = dst.data()
+        self.assertComplexTuplesAlmostEqual(expected_result, result_data, 4)
+
+    def test_pwr_squelch_003(self):
+        # Test set/gets
+
+        alpha = 0.0001
+        
+        thr1 = 10
+        thr2 = 20
+        ramp = 1
+        ramp2 = 2
+        gate = True
+        gate2 = False
+
+        op = analog.pwr_squelch_ff(thr1, alpha, ramp, gate)
+
+        op.set_threshold(thr2)
+        t = op.threshold()
+        self.assertEqual(thr2, t)
+
+        op.set_ramp(ramp2)
+        r = op.ramp()
+        self.assertEqual(ramp2, r)
+
+        op.set_gate(gate2)
+        g = op.gate()
+        self.assertEqual(gate2, g)
+
+
+    def test_pwr_squelch_004(self):
+        alpha = 0.0001
+        thr = -25
+
+        src_data = map(lambda x: float(x)/10.0, range(1, 40))
+        src = gr.vector_source_f(src_data)
+        op = analog.pwr_squelch_ff(thr, alpha)
+        dst = gr.vector_sink_f()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        expected_result = src_data
+        expected_result[0:20] = 20*[0,]
+
+        result_data = dst.data()
+        self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_pwr_squelch, "test_pwr_squelch.xml")
+
diff --git a/gr-analog/python/qa_simple_squelch.py b/gr-analog/python/qa_simple_squelch.py
index 97deee06cd..9fa112864f 100755
--- a/gr-analog/python/qa_simple_squelch.py
+++ b/gr-analog/python/qa_simple_squelch.py
@@ -46,7 +46,6 @@ class test_simple_squelch(gr_unittest.TestCase):
         self.assertEqual(thr2, t)
 
     def test_simple_squelch_002(self):
-        # Test runtime, gate=True
         alpha = 0.0001
         thr = -25
 
@@ -63,7 +62,7 @@ class test_simple_squelch(gr_unittest.TestCase):
         expected_result[0:20] = 20*[0,]
 
         result_data = dst.data()
-        self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
+        self.assertComplexTuplesAlmostEqual(expected_result, result_data, 4)
 
 if __name__ == '__main__':
     gr_unittest.run(test_simple_squelch, "test_simple_squelch.xml")