From ac744774585abe91bbbd78004ab6400b22778704 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sat, 8 Feb 2020 19:22:17 -0500 Subject: [PATCH] Extract more assertValidPointer() method from assertValidPointer() --- tracetools_test/tracetools_test/case.py | 30 +++++++++++++++++++------ 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/tracetools_test/tracetools_test/case.py b/tracetools_test/tracetools_test/case.py index 49d6722..d1940e8 100644 --- a/tracetools_test/tracetools_test/case.py +++ b/tracetools_test/tracetools_test/case.py @@ -132,17 +132,33 @@ class TraceTestCase(unittest.TestCase): handle_field_names: Union[str, List[str]], ) -> None: """ - Check that the handle associated with a field name is valid. + Check that the handle associated to a field name is valid. :param event: the event which has a handle field :param handle_field_names: the handle field name(s) to check """ - if not isinstance(handle_field_names, list): - handle_field_names = [handle_field_names] - for field_name in handle_field_names: - handle_value = self.get_field(event, field_name) - self.assertIsInstance(handle_value, int, 'handle value not int') - self.assertGreater(handle_value, 0, f'invalid handle value: {field_name}') + self.assertValidPointer( + event, + handle_field_names, + ) + + def assertValidPointer( + self, + event: DictEvent, + pointer_field_names: Union[str, List[str]], + ) -> None: + """ + Check that the pointer associated to a field name is valid. + + :param event: the event which has a pointer field + :param pointer_field_names: the pointer field name(s) to check + """ + if not isinstance(pointer_field_names, list): + pointer_field_names = [pointer_field_names] + for field_name in pointer_field_names: + pointer_value = self.get_field(event, field_name) + self.assertIsInstance(pointer_value, int, 'pointer value not int') + self.assertGreater(pointer_value, 0, f'invalid pointer value: {field_name}') def assertValidQueueDepth( self,