Skip to content

store types as tuple and return ordered dict #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mikaelarguedas wants to merge 3 commits into from
Closed

store types as tuple and return ordered dict #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
616d4e9
store types as constant and return ordered dict
mikaelarguedas Feb 17, 2019
56e7270
import copy is now unnecessary
mikaelarguedas Feb 17, 2019
8f10819
update tests
mikaelarguedas Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions rosidl_generator_py/resource/_msg.py.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
@# - value_to_py (function)
@#######################################################################
@
from copy import copy
import logging
import traceback

Expand Down Expand Up @@ -116,27 +115,27 @@ class @(spec.base_type.type)(metaclass=Metaclass):
@[end for]@
]

_fields_and_field_types = {
SLOT_TYPES = ((
Copy link
Member

@dirk-thomas dirk-thomas Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why two parenthesis here? One should be sufficient.

@[for field in spec.fields]@
@[ if field.type.is_primitive_type() ]@
'@(field.name)': '@(field.type)',
'@(field.type)',
@[ else ]@
@[ if field.type.is_array ]@
@[ if field.type.array_size ]@
@[ if field.type.is_upper_bound ]@
'@(field.name)': '@(field.type.pkg_name)/@(field.type.type)[<=@(field.type.array_size)]',
'@(field.type.pkg_name)/@(field.type.type)[<=@(field.type.array_size)]',
@[ else ]@
'@(field.name)': '@(field.type.pkg_name)/@(field.type.type)[@(field.type.array_size)]',
'@(field.type.pkg_name)/@(field.type.type)[@(field.type.array_size)]',
@[ end if ]@
@[ else ]@
'@(field.name)': '@(field.type.pkg_name)/@(field.type.type)[]',
'@(field.type.pkg_name)/@(field.type.type)[]',
@[ end if ]@
@[ else ]@
'@(field.name)': '@(field.type.pkg_name)/@(field.type.type)',
'@(field.type.pkg_name)/@(field.type.type)',
@[ end if ]@
@[ end if ]@
@[end for]@
}
))
@
@[if len(spec.fields) > 0]@

Expand Down Expand Up @@ -200,8 +199,9 @@ class @(spec.base_type.type)(metaclass=Metaclass):
return True

@@classmethod
def get_fields_and_field_types(cls):
return copy(cls._fields_and_field_types)
def get_slot_types(cls):
from collections import OrderedDict
Copy link
Member

@dirk-thomas dirk-thomas Feb 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not import the module at the top of the file?

return OrderedDict(zip(cls.__slots__, cls.SLOT_TYPES))
@[for field in spec.fields]@

@{
Expand Down
85 changes: 52 additions & 33 deletions rosidl_generator_py/test/test_interfaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,56 +261,75 @@ def test_out_of_range():

def test_slot_attributes():
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) == len(nested_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': 'rosidl_generator_py/Primitives[<=3]',
'unbounded_primitives': 'rosidl_generator_py/Primitives[]',
}
assert nested_slot_types == ((
'rosidl_generator_py/Primitives',
'rosidl_generator_py/Primitives[2]',
'rosidl_generator_py/Primitives[<=3]',
'rosidl_generator_py/Primitives[]',
))
from collections import OrderedDict
expected_nested_slot_types_dict = OrderedDict([
('_primitives', 'rosidl_generator_py/Primitives'),
('_two_primitives', 'rosidl_generator_py/Primitives[2]'),
('_up_to_three_primitives', 'rosidl_generator_py/Primitives[<=3]'),
('_unbounded_primitives', '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():
def test_string_slot_attributes():
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) == len(string_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': 'string<=5[<=10]',
'ub_string_dynamic_array_value': 'string<=5[]',
'string_dynamic_array_value': 'string[]',
'string_static_array_value': 'string[3]',
'string_bounded_array_value': 'string[<=10]',
'def_string_dynamic_array_value': 'string[]',
'def_string_static_array_value': 'string[3]',
'def_string_bounded_array_value': 'string[<=10]',
'def_various_quotes': 'string[]',
'def_various_commas': 'string[]',
}

assert string_slot_types == ((
'string<=5[3]',
'string<=5[<=10]',
'string<=5[]',
'string[]',
'string[3]',
'string[<=10]',
'string[]',
'string[3]',
'string[<=10]',
'string[]',
'string[]',
))
from collections import OrderedDict
expected_string_slot_types_dict = OrderedDict([
('_ub_string_static_array_value', 'string<=5[3]'),
('_ub_string_ub_array_value', 'string<=5[<=10]'),
('_ub_string_dynamic_array_value', 'string<=5[]'),
('_string_dynamic_array_value', 'string[]'),
('_string_static_array_value', 'string[3]'),
('_string_bounded_array_value', 'string[<=10]'),
('_def_string_dynamic_array_value', 'string[]'),
('_def_string_static_array_value', 'string[3]'),
('_def_string_bounded_array_value', 'string[<=10]'),
('_def_various_quotes', 'string[]'),
('_def_various_commas', '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