diff --git a/tracetools_test/test/test_intra.py b/tracetools_test/test/test_intra.py index f08616d..e4f20d6 100644 --- a/tracetools_test/test/test_intra.py +++ b/tracetools_test/test/test_intra.py @@ -33,8 +33,8 @@ class TestIntra(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. node_init before pub_init) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check sub_init sub_init_events = self.get_events_with_name('ros2:rcl_subscription_init') diff --git a/tracetools_test/test/test_node.py b/tracetools_test/test/test_node.py index bd731b2..189a937 100644 --- a/tracetools_test/test/test_node.py +++ b/tracetools_test/test/test_node.py @@ -34,8 +34,8 @@ class TestNode(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. init before node_init) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields rcl_init_events = self.get_events_with_name('ros2:rcl_init') diff --git a/tracetools_test/test/test_publisher.py b/tracetools_test/test/test_publisher.py index 595de47..ad2a3de 100644 --- a/tracetools_test/test/test_publisher.py +++ b/tracetools_test/test/test_publisher.py @@ -31,8 +31,8 @@ class TestPublisher(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. node_init before pub_init) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields pub_init_events = self.get_events_with_name('ros2:rcl_publisher_init') diff --git a/tracetools_test/test/test_service.py b/tracetools_test/test/test_service.py index f4a315c..856a873 100644 --- a/tracetools_test/test/test_service.py +++ b/tracetools_test/test/test_service.py @@ -32,8 +32,8 @@ class TestService(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. service_init before callback_added) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields srv_init_events = self.get_events_with_name('ros2:rcl_service_init') diff --git a/tracetools_test/test/test_service_callback.py b/tracetools_test/test/test_service_callback.py index 97412ef..b77336a 100644 --- a/tracetools_test/test/test_service_callback.py +++ b/tracetools_test/test/test_service_callback.py @@ -31,8 +31,8 @@ class TestServiceCallback(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. start before end) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields start_events = self.get_events_with_name('ros2:callback_start') diff --git a/tracetools_test/test/test_subscription.py b/tracetools_test/test/test_subscription.py index c7ba776..9237c63 100644 --- a/tracetools_test/test/test_subscription.py +++ b/tracetools_test/test/test_subscription.py @@ -32,8 +32,8 @@ class TestSubscription(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. sub_init before callback_added) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields sub_init_events = self.get_events_with_name('ros2:rcl_subscription_init') diff --git a/tracetools_test/test/test_subscription_callback.py b/tracetools_test/test/test_subscription_callback.py index 1f057da..5312c64 100644 --- a/tracetools_test/test/test_subscription_callback.py +++ b/tracetools_test/test/test_subscription_callback.py @@ -31,8 +31,8 @@ class TestSubscriptionCallback(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. start before end) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields start_events = self.get_events_with_name('ros2:callback_start') diff --git a/tracetools_test/test/test_timer.py b/tracetools_test/test/test_timer.py index 308e7df..99f9e37 100644 --- a/tracetools_test/test/test_timer.py +++ b/tracetools_test/test/test_timer.py @@ -33,8 +33,8 @@ class TestTimer(TraceTestCase): ) def test_all(self): - # Check events order as set (e.g. init, callback added, start, end) - self.assertEventsOrderSet(self._events_ros) + # Check events as set + self.assertEventsSet(self._events_ros) # Check fields init_events = self.get_events_with_name('ros2:rcl_timer_init') diff --git a/tracetools_test/tracetools_test/case.py b/tracetools_test/tracetools_test/case.py index 9e6a899..353edb3 100644 --- a/tracetools_test/tracetools_test/case.py +++ b/tracetools_test/tracetools_test/case.py @@ -99,13 +99,13 @@ class TraceTestCase(unittest.TestCase): def tearDown(self): cleanup_trace(self._full_path) - def assertEventsOrderSet(self, event_names: List[str]): + def assertEventsSet(self, event_names: List[str]): """ Compare given event names to trace events names as sets. :param event_names: the list of event names to compare to (as a set) """ - self.assertSetEqual(set(self._event_names), set(event_names), 'wrong events order') + self.assertSetEqual(set(self._event_names), set(event_names), 'wrong events') def assertProcessNamesExist(self, names: List[str]): """