X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_component_class.py;h=4f6978e74bbaeeea1203b74daed12491f122815d;hb=5c61fb9d5be835a0efc87f7764117c4d05e0ae5a;hp=7ed554d674256677723f6c1a8211b4d9b72ec238;hpb=694c792bc8f078c02acde68a3390acafbb36b2f4;p=babeltrace.git diff --git a/tests/bindings/python/bt2/test_component_class.py b/tests/bindings/python/bt2/test_component_class.py index 7ed554d6..4f6978e7 100644 --- a/tests/bindings/python/bt2/test_component_class.py +++ b/tests/bindings/python/bt2/test_component_class.py @@ -16,7 +16,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -from bt2 import value import unittest import bt2 @@ -27,109 +26,79 @@ class UserComponentClassTestCase(unittest.TestCase): cls() def test_no_init_source(self): - class MyIter(bt2._UserMessageIterator): - def __next__(self): - raise bt2.Stop - - class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): + class MySource( + bt2._UserSourceComponent, message_iterator_class=bt2._UserMessageIterator + ): pass self._test_no_init(MySource) def test_no_init_filter(self): - class MyIter(bt2._UserMessageIterator): - def __next__(self): - raise bt2.Stop - - class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyIter): + class MyFilter( + bt2._UserFilterComponent, message_iterator_class=bt2._UserMessageIterator + ): pass self._test_no_init(MyFilter) def test_no_init_sink(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self._test_no_init(MySink) def test_incomplete_source_no_msg_iter_cls(self): - class MyIter(bt2._UserMessageIterator): - pass - - with self.assertRaises(bt2.IncompleteUserClass): + with self.assertRaises(bt2._IncompleteUserClass): class MySource(bt2._UserSourceComponent): pass def test_incomplete_source_wrong_msg_iter_cls_type(self): - class MyIter(bt2._UserMessageIterator): - pass - - with self.assertRaises(bt2.IncompleteUserClass): + with self.assertRaises(bt2._IncompleteUserClass): class MySource(bt2._UserSourceComponent, message_iterator_class=int): pass def test_incomplete_filter_no_msg_iter_cls(self): - class MyIter(bt2._UserMessageIterator): - pass - - with self.assertRaises(bt2.IncompleteUserClass): + with self.assertRaises(bt2._IncompleteUserClass): class MyFilter(bt2._UserFilterComponent): pass def test_incomplete_sink_no_consume_method(self): - class MyIter(bt2._UserMessageIterator): - pass - - with self.assertRaises(bt2.IncompleteUserClass): + with self.assertRaises(bt2._IncompleteUserClass): class MySink(bt2._UserSinkComponent): pass def test_minimal_source(self): - class MyIter(bt2._UserMessageIterator): - pass - - class MySource(bt2._UserSourceComponent, message_iterator_class=MyIter): + class MySource( + bt2._UserSourceComponent, message_iterator_class=bt2._UserMessageIterator + ): pass def test_minimal_filter(self): - class MyIter(bt2._UserMessageIterator): - pass - - class MyFilter(bt2._UserFilterComponent, message_iterator_class=MyIter): + class MyFilter( + bt2._UserFilterComponent, message_iterator_class=bt2._UserMessageIterator + ): pass def test_minimal_sink(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass def test_default_name(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertEqual(MySink.name, 'MySink') def test_custom_name(self): class MySink(bt2._UserSinkComponent, name='salut'): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertEqual(MySink.name, 'salut') @@ -138,10 +107,7 @@ class UserComponentClassTestCase(unittest.TestCase): with self.assertRaises(TypeError): class MySink(bt2._UserSinkComponent, name=23): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass def test_description(self): @@ -156,10 +122,7 @@ class UserComponentClassTestCase(unittest.TestCase): cupim flank tenderloin. """ - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertEqual(MySink.description, 'The description.') @@ -169,10 +132,7 @@ class UserComponentClassTestCase(unittest.TestCase): """ """ - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertIsNone(MySink.description) @@ -187,20 +147,14 @@ class UserComponentClassTestCase(unittest.TestCase): here. """ - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertEqual(MySink.help, 'The help\ntext is\nhere.') def test_addr(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertIsInstance(MySink.addr, int) @@ -208,130 +162,108 @@ class UserComponentClassTestCase(unittest.TestCase): def test_query_not_implemented(self): class MySink(bt2._UserSinkComponent): - def _consume(self): + def _user_consume(self): pass - def _graph_is_configured(self): - pass - - with self.assertRaises(bt2._Error): - bt2.QueryExecutor().query(MySink, 'obj', 23) + with self.assertRaises(bt2.UnknownObject): + bt2.QueryExecutor(MySink, 'obj', 23).query() def test_query_raises(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, priv_query_exec, obj, params): raise ValueError with self.assertRaises(bt2._Error): - bt2.QueryExecutor().query(MySink, 'obj', 23) + bt2.QueryExecutor(MySink, 'obj', 23).query() def test_query_wrong_return_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, priv_query_exec, obj, params, method_obj): return ... with self.assertRaises(bt2._Error): - bt2.QueryExecutor().query(MySink, 'obj', 23) + bt2.QueryExecutor(MySink, 'obj', 23).query() 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, priv_query_exec, obj, params, method_obj): nonlocal query_params query_params = params return None query_params = None params = None - res = bt2.QueryExecutor().query(MySink, 'obj', params) + res = bt2.QueryExecutor(MySink, 'obj', params).query() self.assertEqual(query_params, params) self.assertIsNone(res) del query_params 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, priv_query_exec, obj, params, method_obj): nonlocal query_log_level - query_log_level = log_level + query_log_level = priv_query_exec.logging_level query_log_level = None - res = bt2.QueryExecutor().query(MySink, 'obj', None, bt2.LoggingLevel.WARNING) + query_exec = bt2.QueryExecutor(MySink, 'obj', None) + query_exec.logging_level = bt2.LoggingLevel.WARNING + query_exec.query() self.assertEqual(query_log_level, bt2.LoggingLevel.WARNING) del query_log_level def test_query_returns_none(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass @staticmethod - def _query(query_exec, obj, params, log_level): + def _user_query(priv_query_exec, obj, params, method_obj): return - res = bt2.QueryExecutor().query(MySink, 'obj', None) + res = bt2.QueryExecutor(MySink, 'obj', None).query() self.assertIsNone(res) def test_query_simple(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, priv_query_exec, obj, params, method_obj): nonlocal query_params query_params = params return 17.5 query_params = None params = ['coucou', 23, None] - res = bt2.QueryExecutor().query(MySink, 'obj', params) + res = bt2.QueryExecutor(MySink, 'obj', params).query() self.assertEqual(query_params, params) self.assertEqual(res, 17.5) del query_params def test_query_complex(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, priv_query_exec, obj, params, method_obj): nonlocal query_params query_params = params return {'null': None, 'bt2': 'BT2'} @@ -343,23 +275,20 @@ class UserComponentClassTestCase(unittest.TestCase): 'null': None, } - res = bt2.QueryExecutor().query(MySink, 'obj', params) + res = bt2.QueryExecutor(MySink, 'obj', params).query() self.assertEqual(query_params, params) self.assertEqual(res, {'null': None, 'bt2': 'BT2'}) del query_params def test_eq(self): class MySink(bt2._UserSinkComponent): - def _consume(self): - pass - - def _graph_is_configured(self): + def _user_consume(self): pass self.assertEqual(MySink, MySink) -class GenericComponentClassTestCase(unittest.TestCase): +class ComponentClassTestCase(unittest.TestCase): def setUp(self): class MySink(bt2._UserSinkComponent): ''' @@ -368,23 +297,18 @@ class GenericComponentClassTestCase(unittest.TestCase): The help. ''' - 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, priv_query_exec, obj, params, method_obj): return [obj, params, 23] self._py_comp_cls = MySink graph = bt2.Graph() comp = graph.add_component(MySink, 'salut') self._comp_cls = comp.cls - self.assertTrue( - issubclass(type(self._comp_cls), bt2.component._GenericComponentClass) - ) + self.assertIs(type(self._comp_cls), bt2._SinkComponentClassConst) def tearDown(self): del self._py_comp_cls @@ -411,8 +335,12 @@ class GenericComponentClassTestCase(unittest.TestCase): self.assertEqual(self._py_comp_cls, self._comp_cls) def test_query(self): - res = bt2.QueryExecutor().query( + res = bt2.QueryExecutor( self._comp_cls, 'an object', {'yes': 'no', 'book': -17} - ) + ).query() expected = ['an object', {'yes': 'no', 'book': -17}, 23] self.assertEqual(res, expected) + + +if __name__ == '__main__': + unittest.main()