projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: remove unnecessary message iterator classes
[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 fd36d240ccce53284a8e05f30613bcc9fd98c199..4f6978e74bbaeeea1203b74daed12491f122815d 100644
(file)
--- 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.
#
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-from bt2 import value
import unittest
import bt2
import unittest
import bt2
@@
-27,21
+26,17
@@
class UserComponentClassTestCase(unittest.TestCase):
cls()
def test_no_init_source(self):
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):
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)
pass
self._test_no_init(MyFilter)
@@
-54,53
+49,39
@@
class UserComponentClassTestCase(unittest.TestCase):
self._test_no_init(MySink)
def test_incomplete_source_no_msg_iter_cls(self):
self._test_no_init(MySink)
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_msg_iter_cls_type(self):
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):
class MySource(bt2._UserSourceComponent, message_iterator_class=int):
pass
def test_incomplete_filter_no_msg_iter_cls(self):
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):
class MyFilter(bt2._UserFilterComponent):
pass
def test_incomplete_sink_no_consume_method(self):
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):
class MySink(bt2._UserSinkComponent):
pass
def test_minimal_source(self):
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):
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):
pass
def test_minimal_sink(self):
@@
-184,8
+165,8
@@
class UserComponentClassTestCase(unittest.TestCase):
def _user_consume(self):
pass
def _user_consume(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 test_query_raises(self):
class MySink(bt2._UserSinkComponent):
@@
-193,11
+174,11
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_query(cls,
query_exec, obj, params, log_level
):
+ def _user_query(cls,
priv_query_exec, obj, params
):
raise ValueError
with self.assertRaises(bt2._Error):
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 test_query_wrong_return_type(self):
class MySink(bt2._UserSinkComponent):
@@
-205,11
+186,11
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_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):
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 test_query_params_none(self):
class MySink(bt2._UserSinkComponent):
@@
-217,14
+198,14
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_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
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
self.assertEqual(query_params, params)
self.assertIsNone(res)
del query_params
@@
-235,12
+216,14
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_query(cls,
query_exec, obj, params, log_level
):
+ def _user_query(cls,
priv_query_exec, obj, params, method_obj
):
nonlocal query_log_level
nonlocal query_log_level
- query_log_level =
lo
g_level
+ query_log_level =
priv_query_exec.loggin
g_level
query_log_level = None
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
self.assertEqual(query_log_level, bt2.LoggingLevel.WARNING)
del query_log_level
@@
-250,10
+233,10
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@staticmethod
pass
@staticmethod
- def _user_query(
query_exec, obj, params, log_level
):
+ def _user_query(
priv_query_exec, obj, params, method_obj
):
return
return
- res = bt2.QueryExecutor(
).query(MySink, 'obj', None
)
+ res = bt2.QueryExecutor(
MySink, 'obj', None).query(
)
self.assertIsNone(res)
def test_query_simple(self):
self.assertIsNone(res)
def test_query_simple(self):
@@
-262,14
+245,14
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_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]
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
self.assertEqual(query_params, params)
self.assertEqual(res, 17.5)
del query_params
@@
-280,7
+263,7
@@
class UserComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_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'}
nonlocal query_params
query_params = params
return {'null': None, 'bt2': 'BT2'}
@@
-292,7
+275,7
@@
class UserComponentClassTestCase(unittest.TestCase):
'null': None,
}
'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
self.assertEqual(query_params, params)
self.assertEqual(res, {'null': None, 'bt2': 'BT2'})
del query_params
@@
-318,14
+301,14
@@
class ComponentClassTestCase(unittest.TestCase):
pass
@classmethod
pass
@classmethod
- def _user_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
return [obj, params, 23]
self._py_comp_cls = MySink
graph = bt2.Graph()
comp = graph.add_component(MySink, 'salut')
self._comp_cls = comp.cls
- self.assert
True(issubclass(type(self._comp_cls), bt2._SinkComponentClass)
)
+ self.assert
Is(type(self._comp_cls), bt2._SinkComponentClassConst
)
def tearDown(self):
del self._py_comp_cls
def tearDown(self):
del self._py_comp_cls
@@
-352,8
+335,12
@@
class ComponentClassTestCase(unittest.TestCase):
self.assertEqual(self._py_comp_cls, self._comp_cls)
def test_query(self):
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}
self._comp_cls, 'an object', {'yes': 'no', 'book': -17}
- )
+ )
.query()
expected = ['an object', {'yes': 'no', 'book': -17}, 23]
self.assertEqual(res, expected)
expected = ['an object', {'yes': 'no', 'book': -17}, 23]
self.assertEqual(res, expected)
+
+
+if __name__ == '__main__':
+ unittest.main()
This page took
0.028213 seconds
and
4
git commands to generate.