Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions launch_ros/launch_ros/parameter_descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ def value_type(self) -> AllowedTypesType:
return self.__value_type

def __str__(self) -> Text:
value_type_name = self.value_type.__name__ if self.value_type is not None else None
return (
'launch_ros.description.ParameterValue'
f'(value={self.value}, value_type={self.value_type.__name__})'
f'(value={self.value}, value_type={value_type_name})'
)

def evaluate(self, context: LaunchContext) -> 'EvaluatedParameterValue':
Expand Down Expand Up @@ -146,9 +147,10 @@ def value_type(self) -> AllowedTypesType:
return self.__parameter_value.value_type

def __str__(self) -> Text:
value_type_name = self.value_type.__name__ if self.value_type is not None else None
return (
'launch_ros.description.Parameter'
f'(name={self.name}, value={self.value}, value_type={self.value_type.__name__})'
f'(name={self.name}, value={self.value}, value_type={value_type_name})'
)

def evaluate(self, context: LaunchContext) -> Tuple[Text, 'EvaluatedParameterValue']:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def test_parameter_value_description():
param = ParameterValue(value='asd')
assert param.value == 'asd'
assert param.value_type is None
assert str(param) == 'launch_ros.description.ParameterValue(value=asd, value_type=None)'
assert param.evaluate(lc) == 'asd'
# After the first `evaluate` call, the following `.value` and `.evaluate()`
# calls are calculated differently. Test them too.
Expand Down Expand Up @@ -107,6 +108,8 @@ def test_parameter_description():
assert param.value == 'asd'
assert param.value_type is None
assert param.evaluate(lc) == ('my_param', 'asd')
assert str(param) == (
'launch_ros.description.Parameter(name=my_param, value=asd, value_type=None)')
# After the first `evaluate` call, the following `.name` `.value` and `.evaluate()`
# calls are calculated differently. Test them too.
assert param.name == 'my_param'
Expand Down