X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_event_class.py;h=bd8636338d5f3e5700f5fbeec728d0261d4455ec;hp=891cc95b8b176bbc522232e64c8cdb0889679c5f;hb=32656995e4bd342b59681d2706b7519e839bef2c;hpb=fa4c33e32ea9cc929d3ceb6c7b30f5a32418c518 diff --git a/tests/bindings/python/bt2/test_event_class.py b/tests/bindings/python/bt2/test_event_class.py index 891cc95b..bd863633 100644 --- a/tests/bindings/python/bt2/test_event_class.py +++ b/tests/bindings/python/bt2/test_event_class.py @@ -7,28 +7,28 @@ import bt2 @unittest.skip("this is broken") class EventClassTestCase(unittest.TestCase): def setUp(self): - self._context_ft = bt2.StructureFieldType() - self._context_ft.append_field('allo', bt2.StringFieldType()) - self._context_ft.append_field('zola', bt2.IntegerFieldType(18)) - self._payload_ft = bt2.StructureFieldType() - self._payload_ft.append_field('zoom', bt2.StringFieldType()) + self._context_fc = bt2.StructureFieldClass() + self._context_fc.append_field('allo', bt2.StringFieldClass()) + self._context_fc.append_field('zola', bt2.IntegerFieldClass(18)) + self._payload_fc = bt2.StructureFieldClass() + self._payload_fc.append_field('zoom', bt2.StringFieldClass()) self._ec = bt2.EventClass('my_event') self._ec.id = 18 self._ec.emf_uri = 'yes' self._ec.log_level = bt2.EventClassLogLevel.INFO - self._ec.context_field_type = self._context_ft - self._ec.payload_field_type = self._payload_ft + self._ec.context_field_class = self._context_fc + self._ec.payload_field_class = self._payload_fc def tearDown(self): - del self._context_ft - del self._payload_ft + del self._context_fc + del self._payload_fc del self._ec def test_create(self): self.assertEqual(self._ec.name, 'my_event') self.assertEqual(self._ec.id, 18) - self.assertEqual(self._ec.context_field_type, self._context_ft) - self.assertEqual(self._ec.payload_field_type, self._payload_ft) + self.assertEqual(self._ec.context_field_class, self._context_fc) + self.assertEqual(self._ec.payload_field_class, self._payload_fc) self.assertEqual(self._ec.emf_uri, 'yes') self.assertEqual(self._ec.log_level, bt2.EventClassLogLevel.INFO) @@ -38,14 +38,14 @@ class EventClassTestCase(unittest.TestCase): def test_create_full(self): ec = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertEqual(ec.name, 'name') self.assertEqual(ec.id, 23) - self.assertEqual(ec.context_field_type, self._context_ft) - self.assertEqual(ec.payload_field_type, self._payload_ft) + self.assertEqual(ec.context_field_class, self._context_fc) + self.assertEqual(ec.payload_field_class, self._payload_fc) self.assertEqual(ec.emf_uri, 'my URI') self.assertEqual(ec.log_level, bt2.EventClassLogLevel.WARNING) @@ -57,29 +57,29 @@ class EventClassTestCase(unittest.TestCase): with self.assertRaises(TypeError): self._ec.id = 'lel' - def test_assign_context_field_type(self): - self._ec.context_field_type = self._payload_ft - self.assertEqual(self._ec.context_field_type, self._payload_ft) + def test_assign_context_field_class(self): + self._ec.context_field_class = self._payload_fc + self.assertEqual(self._ec.context_field_class, self._payload_fc) - def test_assign_no_context_field_type(self): - self._ec.context_field_type = None - self.assertIsNone(self._ec.context_field_type) + def test_assign_no_context_field_class(self): + self._ec.context_field_class = None + self.assertIsNone(self._ec.context_field_class) - def test_assign_invalid_context_field_type(self): + def test_assign_invalid_context_field_class(self): with self.assertRaises(TypeError): - self._ec.context_field_type = 'lel' + self._ec.context_field_class = 'lel' - def test_assign_payload_field_type(self): - self._ec.payload_field_type = self._payload_ft - self.assertEqual(self._ec.payload_field_type, self._payload_ft) + def test_assign_payload_field_class(self): + self._ec.payload_field_class = self._payload_fc + self.assertEqual(self._ec.payload_field_class, self._payload_fc) - def test_assign_no_payload_field_type(self): - self._ec.payload_field_type = None - self.assertIsNone(self._ec.payload_field_type) + def test_assign_no_payload_field_class(self): + self._ec.payload_field_class = None + self.assertIsNone(self._ec.payload_field_class) - def test_assign_invalid_payload_field_type(self): + def test_assign_invalid_payload_field_class(self): with self.assertRaises(TypeError): - self._ec.payload_field_type = 'lel' + self._ec.payload_field_class = 'lel' def test_stream_class_prop_no_sc(self): self.assertIsNone(self._ec.stream_class) @@ -97,14 +97,14 @@ class EventClassTestCase(unittest.TestCase): def test_copy(self): cpy = copy.copy(self._ec) self._test_copy(cpy) - self.assertEqual(self._ec.context_field_type.addr, cpy.context_field_type.addr) - self.assertEqual(self._ec.payload_field_type.addr, cpy.payload_field_type.addr) + self.assertEqual(self._ec.context_field_class.addr, cpy.context_field_class.addr) + self.assertEqual(self._ec.payload_field_class.addr, cpy.payload_field_class.addr) def test_deepcopy(self): cpy = copy.deepcopy(self._ec) self._test_copy(cpy) - self.assertNotEqual(self._ec.context_field_type.addr, cpy.context_field_type.addr) - self.assertNotEqual(self._ec.payload_field_type.addr, cpy.payload_field_type.addr) + self.assertNotEqual(self._ec.context_field_class.addr, cpy.context_field_class.addr) + self.assertNotEqual(self._ec.payload_field_class.addr, cpy.payload_field_class.addr) def test_assign_emf_uri(self): self._ec.emf_uri = 'salut' @@ -124,91 +124,91 @@ class EventClassTestCase(unittest.TestCase): def test_eq(self): ec1 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertEqual(ec1, ec2) def test_ne_name(self): ec1 = bt2.EventClass(name='name1', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertNotEqual(ec1, ec2) def test_ne_id(self): ec1 = bt2.EventClass(name='name', id=24, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertNotEqual(ec1, ec2) - def test_ne_context_field_type(self): + def test_ne_context_field_class(self): ec1 = bt2.EventClass(name='name', id=23, - context_field_type=self._payload_ft, - payload_field_type=self._payload_ft, + context_field_class=self._payload_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertNotEqual(ec1, ec2) - def test_ne_payload_field_type(self): + def test_ne_payload_field_class(self): ec1 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._context_ft, + context_field_class=self._context_fc, + payload_field_class=self._context_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) self.assertNotEqual(ec1, ec2) def test_ne_emf_uri(self): ec1 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my UR', log_level=bt2.EventClassLogLevel.WARNING) self.assertNotEqual(ec1, ec2) def test_ne_log_level(self): ec1 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.WARNING) ec2 = bt2.EventClass(name='name', id=23, - context_field_type=self._context_ft, - payload_field_type=self._payload_ft, + context_field_class=self._context_fc, + payload_field_class=self._payload_fc, emf_uri='my URI', log_level=bt2.EventClassLogLevel.ERROR) self.assertNotEqual(ec1, ec2)