update tests

Signed-off-by: Mikael Arguedas <[email protected]>

Author: mikaelarguedas

rosidl_generator_py/test/test_interfaces.py

@@ -260,57 +260,103 @@ def test_out_of_range():
 
 
 def test_slot_attributes():
+    from rosidl_parser.definition import Array
+    from rosidl_parser.definition import BoundedSequence
+    from rosidl_parser.definition import NamespacedType
+    from rosidl_parser.definition import UnboundedSequence
     a = Nested()
-    assert hasattr(a, 'get_fields_and_field_types')
+    assert hasattr(a, 'SLOT_TYPES')
+    assert hasattr(a, 'get_slot_types')
     assert hasattr(a, '__slots__')
-    nested_slot_types_dict = getattr(a, 'get_fields_and_field_types')()
+    nested_slot_types_dict = getattr(a, 'get_slot_types')()
+    nested_slot_types = Nested.SLOT_TYPES
     nested_slots = getattr(a, '__slots__')
     assert len(nested_slot_types_dict) == len(nested_slots)
-    expected_nested_slot_types_dict = {
-        'primitives': 'rosidl_generator_py/Primitives',
-        'two_primitives': 'rosidl_generator_py/Primitives[2]',
-        'up_to_three_primitives': 'sequence<rosidl_generator_py/Primitives, 3>',
-        'unbounded_primitives': 'sequence<rosidl_generator_py/Primitives>',
-    }
-    assert len(nested_slot_types_dict) == len(expected_nested_slot_types_dict)
-
-    for expected_field, expected_slot_type in expected_nested_slot_types_dict.items():
-        assert expected_field in nested_slot_types_dict.keys()
-        assert expected_slot_type == nested_slot_types_dict[expected_field]
-
-
-def test_primative_slot_attributes():
+    assert len(nested_slot_types) == len(nested_slots)
+    expected_keys = [
+        'primitives',
+        'two_primitives',
+        'up_to_three_primitives',
+        'unbounded_primitives',
+    ]
+    assert len(nested_slot_types_dict.keys()) == len(expected_keys)
+    for e_key in expected_keys:
+        assert e_key in nested_slot_types_dict.keys()
+    assert isinstance(nested_slot_types_dict['primitives'], NamespacedType)
+    assert nested_slot_types_dict['primitives'].namespaces == ['rosidl_generator_py', 'msg']
+    assert nested_slot_types_dict['primitives'].name == 'Primitives'
+
+    assert isinstance(nested_slot_types_dict['two_primitives'], Array)
+    assert isinstance(nested_slot_types_dict['two_primitives'].basetype, NamespacedType)
+    assert nested_slot_types_dict['two_primitives'].basetype.namespaces == \
+        ['rosidl_generator_py', 'msg']
+    assert nested_slot_types_dict['two_primitives'].basetype.name == 'Primitives'
+
+    assert isinstance(nested_slot_types_dict['up_to_three_primitives'], BoundedSequence)
+    assert isinstance(nested_slot_types_dict['up_to_three_primitives'].basetype, NamespacedType)
+    assert nested_slot_types_dict['up_to_three_primitives'].basetype.namespaces == \
+        ['rosidl_generator_py', 'msg']
+    assert nested_slot_types_dict['up_to_three_primitives'].basetype.name == 'Primitives'
+
+    assert isinstance(nested_slot_types_dict['unbounded_primitives'], UnboundedSequence)
+    assert isinstance(nested_slot_types_dict['unbounded_primitives'].basetype, NamespacedType)
+    assert nested_slot_types_dict['unbounded_primitives'].basetype.namespaces == \
+        ['rosidl_generator_py', 'msg']
+    assert nested_slot_types_dict['unbounded_primitives'].basetype.name == 'Primitives'
+
+
+def test_string_slot_attributes():
+    from rosidl_parser.definition import Array
+    from rosidl_parser.definition import BoundedSequence
+    from rosidl_parser.definition import String
+    from rosidl_parser.definition import UnboundedSequence
     b = StringArrays()
-    assert hasattr(b, 'get_fields_and_field_types')
+    assert hasattr(b, 'SLOT_TYPES')
+    assert hasattr(b, 'get_slot_types')
     assert hasattr(b, '__slots__')
-    string_slot_types_dict = getattr(b, 'get_fields_and_field_types')()
+    string_slot_types_dict = getattr(b, 'get_slot_types')()
+    string_slot_types = StringArrays.SLOT_TYPES
     string_slots = getattr(b, '__slots__')
     assert len(string_slot_types_dict) == len(string_slots)
-    expected_string_slot_types_dict = {
-        'ub_string_static_array_value': 'string<5>[3]',
-        'ub_string_ub_array_value': 'sequence<string<5>, 10>',
-        'ub_string_dynamic_array_value': 'sequence<string<5>>',
-        'string_dynamic_array_value': 'sequence<string>',
-        'string_static_array_value': 'string[3]',
-        'string_bounded_array_value': 'sequence<string, 10>',
-        'def_string_dynamic_array_value': 'sequence<string>',
-        'def_string_static_array_value': 'string[3]',
-        'def_string_bounded_array_value': 'sequence<string, 10>',
-        'def_various_quotes': 'sequence<string>',
-        'def_various_commas': 'sequence<string>',
-    }
-
-    assert len(string_slot_types_dict) == len(expected_string_slot_types_dict)
-
-    for expected_field, expected_slot_type in expected_string_slot_types_dict.items():
-        assert expected_field in string_slot_types_dict.keys()
-        assert expected_slot_type == string_slot_types_dict[expected_field]
-
-
-def test_modifying_slot_fields_and_types():
-    b = StringArrays()
-    assert hasattr(b, 'get_fields_and_field_types')
-    string_slot_types_dict = getattr(b, 'get_fields_and_field_types')()
-    string_slot_types_dict_len = len(string_slot_types_dict)
-    string_slot_types_dict[1] = 2
-    assert len(getattr(b, 'get_fields_and_field_types')()) == string_slot_types_dict_len
+    assert len(string_slot_types) == len(string_slots)
+
+    expected_keys = [
+        'ub_string_static_array_value',
+        'ub_string_ub_array_value',
+        'ub_string_dynamic_array_value',
+        'string_dynamic_array_value',
+        'string_static_array_value',
+        'string_bounded_array_value',
+        'def_string_dynamic_array_value',
+        'def_string_static_array_value',
+        'def_string_bounded_array_value',
+        'def_various_quotes',
+        'def_various_commas',
+    ]
+
+    assert len(string_slot_types_dict.keys()) == len(expected_keys)
+    for e_key in expected_keys:
+        assert e_key in string_slot_types_dict.keys()
+
+    assert isinstance(string_slot_types_dict['ub_string_static_array_value'], Array)
+    assert isinstance(string_slot_types_dict['ub_string_static_array_value'].basetype, String)
+    assert string_slot_types_dict['ub_string_static_array_value'].size == 3
+    assert string_slot_types_dict['ub_string_static_array_value'].basetype.maximum_size == '5'
+
+    assert isinstance(string_slot_types_dict['ub_string_ub_array_value'], BoundedSequence)
+    assert isinstance(string_slot_types_dict['ub_string_ub_array_value'].basetype, String)
+    assert string_slot_types_dict['ub_string_ub_array_value'].upper_bound == 10
+    assert string_slot_types_dict['ub_string_ub_array_value'].basetype.maximum_size == '5'
+
+    assert isinstance(string_slot_types_dict['ub_string_dynamic_array_value'], UnboundedSequence)
+    assert isinstance(string_slot_types_dict['ub_string_dynamic_array_value'].basetype, String)
+    assert string_slot_types_dict['ub_string_dynamic_array_value'].basetype.maximum_size == '5'
+
+    assert isinstance(string_slot_types_dict['string_dynamic_array_value'], UnboundedSequence)
+    assert isinstance(string_slot_types_dict['string_dynamic_array_value'].basetype, String)
+    assert string_slot_types_dict['string_dynamic_array_value'].basetype.maximum_size == 'None'
+
+    assert isinstance(string_slot_types_dict['string_static_array_value'], Array)
+    assert isinstance(string_slot_types_dict['string_static_array_value'].basetype, String)
+    assert string_slot_types_dict['string_static_array_value'].size == 3
+    assert string_slot_types_dict['string_static_array_value'].basetype.maximum_size == 'None'