X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fbindings%2Fpython%2Fbt2%2Ftest_component_class.py;h=1debdf7bba97ef2557b25249b8c58114a51454ff;hb=bbb3650ffa25676b8425802ba1dd5614fc1db17f;hp=e1d6b6652405f3a9a83b1e077a778c15c5a85190;hpb=90cfc0122a02a3407b73165ae30d5f00c48b97a6;p=babeltrace.git

diff --git a/tests/bindings/python/bt2/test_component_class.py b/tests/bindings/python/bt2/test_component_class.py
index e1d6b665..1debdf7b 100644
--- a/tests/bindings/python/bt2/test_component_class.py
+++ b/tests/bindings/python/bt2/test_component_class.py
@@ -1,33 +1,31 @@
-from bt2 import values
+from bt2 import value
 import unittest
-import copy
 import bt2
 
 
-@unittest.skip("this is broken")
 class UserComponentClassTestCase(unittest.TestCase):
     def _test_no_init(self, cls):
         with self.assertRaises(bt2.Error):
             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)
@@ -39,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):
@@ -65,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):
@@ -73,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):
@@ -272,7 +270,6 @@ class UserComponentClassTestCase(unittest.TestCase):
         self.assertEqual(MySink, MySink)
 
 
-@unittest.skip("this is broken")
 class GenericComponentClassTestCase(unittest.TestCase):
     def setUp(self):
         class MySink(bt2._UserSinkComponent):
@@ -290,7 +287,7 @@ class GenericComponentClassTestCase(unittest.TestCase):
 
         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))