props: began work on vector converters

1 files changed, 49 insertions, 21 deletions

diff --git a/tests/query_test.py b/tests/query_test.py
index a61d4db..039888c 100644
--- a/tests/query_test.py
+++ b/tests/query_test.py
@@ -8,23 +8,32 @@ from demo_blocks import *
 class MyBlock(gras.Block):
     def __init__(self):
         gras.Block.__init__(self, "MyBlock", out_sig=[numpy.uint32], in_sig=[numpy.uint32])
-        self.foo = 0
-        self.register_getter("foo", self.get_foo)
-        self.register_setter("foo", self.set_foo)
+        self.integer_value = 0
+        self.register_getter("integer_value", self.get_integer_value)
+        self.register_setter("integer_value", self.set_integer_value)
+        self.vector_value = [0]
+        self.register_getter("vector_value", self.get_vector_value)
+        self.register_setter("vector_value", self.set_vector_value)
 
     def work(self, ins, outs):
         n = min(len(ins[0]), len(outs[0]))
-        outs[0][:n] = ins[0][:n] + self.foo
+        outs[0][:n] = ins[0][:n] + self.integer_value
         self.consume(n)
         self.produce(n)
 
-    def get_foo(self):
-        return self.foo
+    def get_integer_value(self):
+        return self.integer_value
 
-    def set_foo(self, new_foo):
-        print "new_foo", new_foo
-        new_foo + 0 #throws if its not a number
-        self.foo = new_foo
+    def set_integer_value(self, new_integer_value):
+        print "new_integer_value", new_integer_value
+        self.integer_value = new_integer_value
+
+    def get_vector_value(self):
+        return self.vector_value
+
+    def set_vector_value(self, new_vector_value):
+        print "new_vector_value", new_vector_value
+        self.vector_value = numpy.copy(new_vector_value)
 
 class QueryTest(unittest.TestCase):
 
@@ -61,38 +70,57 @@ class QueryTest(unittest.TestCase):
         #found the block we asked for
         self.assertTrue(block_id in stats_result['blocks'])
 
-    def test_props(self):
+    def test_integer_query(self):
         vec_source = VectorSource(numpy.uint32, [0, 9, 8, 7, 6])
         vec_sink = VectorSink(numpy.uint32)
         block = MyBlock()
-        block.set_uid("my_block_uid")
+        block.set_uid("test_integer_query")
         self.tb.connect(vec_source, block, vec_sink)
         self.tb.run()
 
         #query the block list
         blocks_result = self.tb.query(dict(path="/blocks.json"))
         self.assertEqual(len(blocks_result['blocks']), 3)
-        self.assertTrue('my_block_uid' in blocks_result['blocks'])
+        self.assertTrue('test_integer_query' in blocks_result['blocks'])
 
-        #set the property
+        #set the integer property
         self.tb.query(dict(
             path="/props.json",
-            block='my_block_uid',
-            key='foo',
+            block='test_integer_query',
+            key='integer_value',
             action='set',
             value=42,
         ))
-        self.assertEqual(block.foo, 42)
+        self.assertEqual(block.integer_value, 42)
 
-        #get the property
-        block.set('foo', 21)
+        #get the integer property
+        block.set('integer_value', 21)
         result = self.tb.query(dict(
             path="/props.json",
-            block='my_block_uid',
-            key='foo',
+            block='test_integer_query',
+            key='integer_value',
             action='get'
         ))
         self.assertEqual(result['value'], 21)
 
+    def test_vector_query(self):
+        vec_source = VectorSource(numpy.uint32, [0, 9, 8, 7, 6])
+        vec_sink = VectorSink(numpy.uint32)
+        block = MyBlock()
+        block.set_uid("test_vector_query")
+        self.tb.connect(vec_source, block, vec_sink)
+        self.tb.run()
+
+        #set the vector property
+        self.tb.query(dict(
+            path="/props.json",
+            block='test_vector_query',
+            key='vector_value',
+            action='set',
+            value=[1, 2, 3, 4, 5],
+        ))
+        print block.vector_value
+        self.assertEqual(list(block.vector_value), [1, 2, 3, 4, 5])
+
 if __name__ == '__main__':
     unittest.main()