diff options
Diffstat (limited to 'tests/block_test.py')
| -rw-r--r-- | tests/block_test.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tests/block_test.py b/tests/block_test.py index 2f8d91b..614e702 100644 --- a/tests/block_test.py +++ b/tests/block_test.py @@ -3,7 +3,7 @@ import unittest import gras import numpy -from demo_blocks import * +from gras import TestUtils class BlockTest(unittest.TestCase): @@ -14,55 +14,55 @@ class BlockTest(unittest.TestCase): self.tb = None def test_vector_blocks(self): - vec_source = VectorSource(numpy.uint32, [0, 9, 8, 7, 6]) - vec_sink = VectorSink(numpy.uint32) + vec_source = TestUtils.VectorSource(numpy.uint32, [0, 9, 8, 7, 6]) + vec_sink = TestUtils.VectorSink(numpy.uint32) self.tb.connect(vec_source, vec_sink) self.tb.run() - self.assertEqual(vec_sink.get_vector(), (0, 9, 8, 7, 6)) + self.assertEqual(vec_sink.data(), (0, 9, 8, 7, 6)) def test_add_f32(self): - src0 = VectorSource(numpy.float32, [1, 3, 5, 7, 9]) - src1 = VectorSource(numpy.float32, [0, 2, 4, 6, 8]) - adder = Add2X(numpy.float32) - sink = VectorSink(numpy.float32) + src0 = TestUtils.VectorSource(numpy.float32, [1, 3, 5, 7, 9]) + src1 = TestUtils.VectorSource(numpy.float32, [0, 2, 4, 6, 8]) + adder = TestUtils.Add2X(numpy.float32) + sink = TestUtils.VectorSink(numpy.float32) self.tb.connect((src0, 0), (adder, 0)) self.tb.connect((src1, 0), (adder, 1)) self.tb.connect(adder, sink) self.tb.run() - self.assertEqual(sink.get_vector(), (1, 5, 9, 13, 17)) + self.assertEqual(sink.data(), (1, 5, 9, 13, 17)) def test_add_fc32(self): - src0 = VectorSource(numpy.complex64, [1, 3j, 5, 7j, 9]) - src1 = VectorSource(numpy.complex64, [0, 2j, 4, 6j, 8]) - adder = Add2X(numpy.complex64) - sink = VectorSink(numpy.complex64) + src0 = TestUtils.VectorSource(numpy.complex64, [1, 3j, 5, 7j, 9]) + src1 = TestUtils.VectorSource(numpy.complex64, [0, 2j, 4, 6j, 8]) + adder = TestUtils.Add2X(numpy.complex64) + sink = TestUtils.VectorSink(numpy.complex64) self.tb.connect((src0, 0), (adder, 0)) self.tb.connect((src1, 0), (adder, 1)) self.tb.connect(adder, sink) self.tb.run() - self.assertEqual(sink.get_vector(), (1, 5j, 9, 13j, 17)) + self.assertEqual(sink.data(), (1, 5j, 9, 13j, 17)) def test_add_f32_feedback(self): """ Feedback adder output to input1 of the adder. Preload input1 of the adder to set the delay. """ - src0 = VectorSource(numpy.float32, [1, 3, 5, 7, 9]) - adder = Add2X(numpy.float32) + src0 = TestUtils.VectorSource(numpy.float32, [1, 3, 5, 7, 9]) + adder = TestUtils.Add2X(numpy.float32) adder.input_config(1).preload_items = 1 #make this a feedback delay of 1 - sink = VectorSink(numpy.float32) + sink = TestUtils.VectorSink(numpy.float32) self.tb.connect((src0, 0), (adder, 0)) self.tb.connect((adder, 0), (adder, 1)) self.tb.connect(adder, sink) self.tb.run() - self.assertEqual(sink.get_vector(), (1, 4, 9, 16, 25)) + self.assertEqual(sink.data(), (1, 4, 9, 16, 25)) def test_tag_source_sink(self): values = (0, 'hello', 4.2, True, None, [2, 3, 4], (9, 8, 7), 1j, {2:'d'}) - src = TagSource(values) - sink = TagSink() + src = TestUtils.TagSource(values) + sink = TestUtils.TagSink() self.tb.connect(src, sink) self.tb.run() self.assertEqual(sink.get_values(), values) @@ -79,7 +79,7 @@ class BlockTest(unittest.TestCase): except: pass self.consume(0, len(ins[0])) - source = VectorSource(numpy.uint32, [0, 9, 8, 7, 6]) + source = TestUtils.VectorSource(numpy.uint32, [0, 9, 8, 7, 6]) sink = BadTouch(numpy.uint32) self.tb.connect(source, sink) |