bt2: update bindings to make test_component_class pass

[babeltrace.git] / tests / bindings / python / bt2 / test_component_class.py

diff --git a/tests/bindings/python/bt2/test_component_class.py b/tests/bindings/python/bt2/test_component_class.py
index a8160c338c241f25299b89bb37757322915f2d5a..1debdf7bba97ef2557b25249b8c58114a51454ff 100644 (file)
--- a/tests/bindings/python/bt2/test_component_class.py
+++ b/tests/bindings/python/bt2/test_component_class.py
@@ -1,6 +1,5 @@
-from bt2 import values
+from bt2 import value
 import unittest
-import copy
 import bt2
 
 
@@ -10,23 +9,23 @@ class UserComponentClassTestCase(unittest.TestCase):
             cls()
 
     def test_no_init_source(self):
-        class MyIter(bt2._UserNotificationIterator):
+        class MyIter(bt2._UserMessageIterator):
             def __next__(self):
                 raise bt2.Stop
 
         class MySource(bt2._UserSourceComponent,
-                       notification_iterator_class=MyIter):
+                       message_iterator_class=MyIter):
             pass
 
         self._test_no_init(MySource)
 
     def test_no_init_filter(self):
-        class MyIter(bt2._UserNotificationIterator):
+        class MyIter(bt2._UserMessageIterator):
             def __next__(self):
                 raise bt2.Stop
 
         class MyFilter(bt2._UserFilterComponent,
-                       notification_iterator_class=MyIter):
+                       message_iterator_class=MyIter):
             pass
 
         self._test_no_init(MyFilter)
@@ -38,25 +37,25 @@ class UserComponentClassTestCase(unittest.TestCase):
 
         self._test_no_init(MySink)
 
-    def test_incomplete_source_no_notif_iter_cls(self):
-        class MyIter(bt2._UserNotificationIterator):
+    def test_incomplete_source_no_msg_iter_cls(self):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         with self.assertRaises(bt2.IncompleteUserClass):
             class MySource(bt2._UserSourceComponent):
                 pass
 
-    def test_incomplete_source_wrong_notif_iter_cls_type(self):
-        class MyIter(bt2._UserNotificationIterator):
+    def test_incomplete_source_wrong_msg_iter_cls_type(self):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         with self.assertRaises(bt2.IncompleteUserClass):
             class MySource(bt2._UserSourceComponent,
-                           notification_iterator_class=int):
+                           message_iterator_class=int):
                 pass
 
-    def test_incomplete_filter_no_notif_iter_cls(self):
-        class MyIter(bt2._UserNotificationIterator):
+    def test_incomplete_filter_no_msg_iter_cls(self):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         with self.assertRaises(bt2.IncompleteUserClass):
@@ -64,7 +63,7 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
     def test_incomplete_sink_no_consume_method(self):
-        class MyIter(bt2._UserNotificationIterator):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         with self.assertRaises(bt2.IncompleteUserClass):
@@ -72,19 +71,19 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
     def test_minimal_source(self):
-        class MyIter(bt2._UserNotificationIterator):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         class MySource(bt2._UserSourceComponent,
-                       notification_iterator_class=MyIter):
+                       message_iterator_class=MyIter):
             pass
 
     def test_minimal_filter(self):
-        class MyIter(bt2._UserNotificationIterator):
+        class MyIter(bt2._UserMessageIterator):
             pass
 
         class MyFilter(bt2._UserFilterComponent,
-                       notification_iterator_class=MyIter):
+                       message_iterator_class=MyIter):
             pass
 
     def test_minimal_sink(self):
@@ -168,7 +167,7 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
         with self.assertRaises(bt2.Error):
-            MySink.query('obj', 23)
+            bt2.QueryExecutor().query(MySink, 'obj', 23)
 
     def test_query_raises(self):
         class MySink(bt2._UserSinkComponent):
@@ -176,11 +175,11 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 raise ValueError
 
         with self.assertRaises(bt2.Error):
-            MySink.query('obj', 23)
+            bt2.QueryExecutor().query(MySink, 'obj', 23)
 
     def test_query_wrong_return_type(self):
         class MySink(bt2._UserSinkComponent):
@@ -188,11 +187,11 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 return ...
 
         with self.assertRaises(bt2.Error):
-            MySink.query('obj', 23)
+            bt2.QueryExecutor().query(MySink, 'obj', 23)
 
     def test_query_params_none(self):
         class MySink(bt2._UserSinkComponent):
@@ -200,14 +199,14 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 nonlocal query_params
                 query_params = params
                 return None
 
         query_params = None
         params = None
-        res = MySink.query('obj', params)
+        res = bt2.QueryExecutor().query(MySink, 'obj', params)
         self.assertEqual(query_params, params)
         self.assertIsNone(res)
         del query_params
@@ -218,14 +217,14 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 nonlocal query_params
                 query_params = params
                 return 17.5
 
         query_params = None
         params = ['coucou', 23, None]
-        res = MySink.query('obj', params)
+        res = bt2.QueryExecutor().query(MySink, 'obj', params)
         self.assertEqual(query_params, params)
         self.assertEqual(res, 17.5)
         del query_params
@@ -236,7 +235,7 @@ class UserComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 nonlocal query_params
                 query_params = params
                 return {
@@ -255,7 +254,7 @@ class UserComponentClassTestCase(unittest.TestCase):
             'null': None,
         }
 
-        res = MySink.query('obj', params)
+        res = bt2.QueryExecutor().query(MySink, 'obj', params)
         self.assertEqual(query_params, params)
         self.assertEqual(res, {
             'null': None,
@@ -283,12 +282,12 @@ class GenericComponentClassTestCase(unittest.TestCase):
                 pass
 
             @classmethod
-            def _query(cls, obj, params):
+            def _query(cls, query_exec, obj, params):
                 return [obj, params, 23]
 
         self._py_comp_cls = MySink
         graph = bt2.Graph()
-        comp = graph.add_component(MySink, 'salut')
+        comp = graph.add_sink_component(MySink, 'salut')
         self._comp_cls = comp.component_class
         self.assertTrue(issubclass(type(self._comp_cls),
                                    bt2.component._GenericComponentClass))
@@ -318,6 +317,7 @@ class GenericComponentClassTestCase(unittest.TestCase):
         self.assertEqual(self._py_comp_cls, self._comp_cls)
 
     def test_query(self):
-        res = self._comp_cls.query('an object', {'yes': 'no', 'book': -17})
+        res = bt2.QueryExecutor().query(self._comp_cls, 'an object',
+                                        {'yes': 'no', 'book': -17})
         expected = ['an object', {'yes': 'no', 'book': -17}, 23]
         self.assertEqual(res, expected)