niklas/ros2_tracing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add assertNumEvents method and use assertFieldEquals

Browse source
This commit is contained in:
Christophe Bedard 2019-06-23 12:56:50 +02:00
parent 4b1545ccb4
commit 0abddffeff
7 changed files with 52 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tracetools_test/test/test_intra.py
View file

@ -46,12 +46,12 @@ class TestIntra(TraceTestCase):
'topic_name',
'/the_topic/_intra',
sub_init_events)
self.assertEqual(
len(sub_init_normal_events),
self.assertNumEvents(
sub_init_normal_events,
1,
'none or more than 1 sub init event for normal sub')
self.assertEqual(
len(sub_init_intra_events),
self.assertNumEvents(
sub_init_intra_events,
1,
'none or more than 1 sub init event for intra sub')
@ -68,8 +68,8 @@ class TestIntra(TraceTestCase):
sub_handle_intra,
self.get_events_with_name(
'ros2:rclcpp_subscription_callback_added'))
self.assertEqual(
len(callback_added_events),
self.assertNumEvents(
callback_added_events,
1,
'none or more than 1 callback added event')
callback_added_event = callback_added_events[0]
@ -79,8 +79,8 @@ class TestIntra(TraceTestCase):
start_events = self.get_events_with_name('ros2:callback_start')
end_events = self.get_events_with_name('ros2:callback_end')
# Should still have two start:end pairs (1 normal + 1 intra)
self.assertEqual(len(start_events), 2, 'does not have 2 callback start events')
self.assertEqual(len(end_events), 2, 'does not have 2 callback end events')
self.assertNumEvents(start_events, 2, 'does not have 2 callback start events')
self.assertNumEvents(end_events, 2, 'does not have 2 callback end events')
start_events_intra = self.get_events_with_field_value(
'callback',
callback_handle_intra,
@ -89,12 +89,12 @@ class TestIntra(TraceTestCase):
'callback',
callback_handle_intra,
end_events)
self.assertEqual(
len(start_events_intra),
self.assertNumEvents(
start_events_intra,
1,
'none or more than one intra start event')
self.assertEqual(
len(end_events_intra),
self.assertNumEvents(
end_events_intra,
1,
'none or more than one intra end event')
@ -111,8 +111,8 @@ class TestIntra(TraceTestCase):
'callback',
callback_handle_intra,
start_events)
self.assertEqual(
len(start_events_not_intra),
self.assertNumEvents(
start_events_not_intra,
1,
'none or more than one normal start event')
start_event_not_intra = start_events_not_intra[0]