X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_query_executor.py;h=6d0cc3bdeab6dc920ae87d84c67aeaeecff58091;hb=76b6c2f71a485f0cc9b766e1a54b9f7330ccd907;hp=a5d852f57c745f7b0fdef4a41bd551a1247086c7;hpb=a635e50750a3c1e8907b38c8311dc0b8bb0f09c3;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_query_executor.py b/tests/bindings/python/bt2/test_query_executor.py
index a5d852f5..6d0cc3bd 100644
--- a/tests/bindings/python/bt2/test_query_executor.py
+++ b/tests/bindings/python/bt2/test_query_executor.py
@@ -25,14 +25,11 @@ import bt2
 class QueryExecutorTestCase(unittest.TestCase):
     def test_query(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 nonlocal query_params
                 query_params = params
                 return {'null': None, 'bt2': 'BT2'}
@@ -51,14 +48,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_params_none(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 nonlocal query_params
                 query_params = params
 
@@ -69,14 +63,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_logging_level(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 nonlocal query_log_level
                 query_log_level = log_level
 
@@ -87,14 +78,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_gen_error(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 raise ValueError
 
         with self.assertRaises(bt2._Error) as ctx:
@@ -103,36 +91,30 @@ class QueryExecutorTestCase(unittest.TestCase):
         exc = ctx.exception
         self.assertEqual(len(exc), 2)
         cause = exc[0]
-        self.assertIsInstance(cause, bt2.error._ComponentClassErrorCause)
+        self.assertIsInstance(cause, bt2._ComponentClassErrorCause)
         self.assertIn('raise ValueError', cause.message)
         self.assertEqual(cause.component_class_type, bt2.ComponentClassType.SINK)
         self.assertEqual(cause.component_class_name, 'MySink')
 
-    def test_query_invalid_object(self):
+    def test_query_unknown_object(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
-                raise bt2.InvalidObject
+            def _user_query(cls, query_exec, obj, params, log_level):
+                raise bt2.UnknownObject
 
-        with self.assertRaises(bt2.InvalidObject):
+        with self.assertRaises(bt2.UnknownObject):
             res = bt2.QueryExecutor().query(MySink, 'obj', [17, 23])
 
     def test_query_logging_level_invalid_type(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 pass
 
         with self.assertRaises(TypeError):
@@ -140,14 +122,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_logging_level_invalid_value(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 pass
 
         with self.assertRaises(ValueError):
@@ -155,14 +134,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_try_again(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 raise bt2.TryAgain
 
         with self.assertRaises(bt2.TryAgain):
@@ -170,14 +146,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_add_interrupter(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 nonlocal interrupter2
                 test_self.assertFalse(query_exec.is_interrupted)
                 interrupter2.set()
@@ -195,14 +168,11 @@ class QueryExecutorTestCase(unittest.TestCase):
 
     def test_query_interrupt(self):
         class MySink(bt2._UserSinkComponent):
-            def _consume(self):
-                pass
-
-            def _graph_is_configured(self):
+            def _user_consume(self):
                 pass
 
             @classmethod
-            def _query(cls, query_exec, obj, params, log_level):
+            def _user_query(cls, query_exec, obj, params, log_level):
                 test_self.assertFalse(query_exec.is_interrupted)
                 query_exec.interrupt()
                 test_self.assertTrue(query_exec.is_interrupted)