diff --git a/CMakeLists.txt b/CMakeLists.txt index b20d543..a7e419c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,6 @@ set(msg_files "msg/Action.msg" "msg/ActionParameter.msg" "msg/ActionParameterFactsheet.msg" - "msg/ActionParameterValue.msg" "msg/ActionState.msg" "msg/AGVAction.msg" "msg/AGVGeometry.msg" diff --git a/include/vda5050_interfaces/json_utils/action_parameter.hpp b/include/vda5050_interfaces/json_utils/action_parameter.hpp index 7e89a34..ed57cc0 100644 --- a/include/vda5050_interfaces/json_utils/action_parameter.hpp +++ b/include/vda5050_interfaces/json_utils/action_parameter.hpp @@ -23,7 +23,6 @@ #include -#include "vda5050_interfaces/json_utils/action_parameter_value.hpp" #include "vda5050_interfaces/msg/action_parameter.hpp" namespace vda5050_interfaces { @@ -48,7 +47,7 @@ inline void to_json(nlohmann::json& j, const ActionParameter& msg) inline void from_json(const nlohmann::json& j, ActionParameter& msg) { msg.key = j.at("key").get(); - msg.value = j.at("value").get(); + msg.value = j.at("value").get(); } } // namespace msg diff --git a/msg/ActionParameter.msg b/msg/ActionParameter.msg index 17f36a5..5ce2c42 100644 --- a/msg/ActionParameter.msg +++ b/msg/ActionParameter.msg @@ -9,5 +9,5 @@ string key # The value of the parameter that belongs to the key # # Field Type: Required -ActionParameterValue value +string value diff --git a/msg/ActionParameterValue.msg b/msg/ActionParameterValue.msg deleted file mode 100644 index 54767c7..0000000 --- a/msg/ActionParameterValue.msg +++ /dev/null @@ -1,21 +0,0 @@ -# Value of the parameter in ActionParameter - -# The type of this parameter -# -# Field Type: Required -uint8 type - -# Enum values for type -# -# Field Type: Required -uint8 TYPE_ARRAY=1 -uint8 TYPE_BOOL=2 -uint8 TYPE_NUMBER=3 -uint8 TYPE_STRING=4 -uint8 TYPE_OBJECT=5 - -# Value that this parameter holds -# -# Field Type: Required -string value - diff --git a/test/generator/generator.hpp b/test/generator/generator.hpp index 98709ba..a89f637 100644 --- a/test/generator/generator.hpp +++ b/test/generator/generator.hpp @@ -27,7 +27,6 @@ #include "vda5050_interfaces/msg/action.hpp" #include "vda5050_interfaces/msg/action_parameter.hpp" #include "vda5050_interfaces/msg/action_parameter_factsheet.hpp" -#include "vda5050_interfaces/msg/action_parameter_value.hpp" #include "vda5050_interfaces/msg/action_state.hpp" #include "vda5050_interfaces/msg/agv_action.hpp" #include "vda5050_interfaces/msg/agv_geometry.hpp" @@ -78,7 +77,6 @@ using vda5050_interfaces::msg::Action; using vda5050_interfaces::msg::ActionParameter; using vda5050_interfaces::msg::ActionParameterFactsheet; -using vda5050_interfaces::msg::ActionParameterValue; using vda5050_interfaces::msg::ActionState; using vda5050_interfaces::msg::AGVAction; using vda5050_interfaces::msg::AGVGeometry; @@ -324,17 +322,6 @@ class RandomDataGenerator return states[state_idx]; } - /// \brief Generate a random ActionParameterValue type - uint8_t generate_random_action_parameter_value_type() - { - std::vector states = { - ActionParameterValue::TYPE_ARRAY, ActionParameterValue::TYPE_BOOL, - ActionParameterValue::TYPE_NUMBER, ActionParameterValue::TYPE_STRING, - ActionParameterValue::TYPE_OBJECT}; - auto state_idx = generate_random_index(states.size()); - return states[state_idx]; - } - /// \brief Generate a random scope value for actionScopes std::string generate_random_scope() { @@ -843,15 +830,10 @@ class RandomDataGenerator msg.agv_position.push_back(generate()); msg.velocity.push_back(generate()); } - else if constexpr (std::is_same_v) - { - msg.type = generate_random_action_parameter_value_type(); - msg.value = generate_random_string(); - } else if constexpr (std::is_same_v) { msg.key = generate_random_string(); - msg.value = generate(); + msg.value = generate_random_string(); } else if constexpr (std::is_same_v) { @@ -867,25 +849,6 @@ class RandomDataGenerator msg.header = generate
(); msg.actions = generate_random_vector(generate_random_size()); } - else if constexpr (std::is_same_v) - { - msg.type = generate_random_action_parameter_value_type(); - msg.value = generate_random_string(); - } - else if constexpr (std::is_same_v) - { - msg.key = generate_random_string(); - msg.value = generate(); - } - else if constexpr (std::is_same_v) - { - msg.action_type = generate_random_string(); - msg.action_id = generate_random_string(); - msg.blocking_type = generate_random_blocking_type(); - msg.action_description.push_back(generate_random_string()); - msg.action_parameters = - generate_random_vector(generate_random_size()); - } else if constexpr (std::is_same_v) { msg.header = generate
(); diff --git a/test/test_json_utils.cpp b/test/test_json_utils.cpp index f392504..56e87c8 100644 --- a/test/test_json_utils.cpp +++ b/test/test_json_utils.cpp @@ -24,7 +24,6 @@ #include "vda5050_interfaces/json_utils/action.hpp" #include "vda5050_interfaces/json_utils/action_parameter.hpp" #include "vda5050_interfaces/json_utils/action_parameter_factsheet.hpp" -#include "vda5050_interfaces/json_utils/action_parameter_value.hpp" #include "vda5050_interfaces/json_utils/action_state.hpp" #include "vda5050_interfaces/json_utils/agv_action.hpp" #include "vda5050_interfaces/json_utils/agv_geometry.hpp" @@ -75,7 +74,6 @@ using vda5050_interfaces::msg::Action; using vda5050_interfaces::msg::ActionParameter; using vda5050_interfaces::msg::ActionParameterFactsheet; -using vda5050_interfaces::msg::ActionParameterValue; using vda5050_interfaces::msg::ActionState; using vda5050_interfaces::msg::AGVAction; using vda5050_interfaces::msg::AGVGeometry; @@ -125,16 +123,15 @@ using vda5050_interfaces::msg::WheelDefinition; // List of types to be tested for serialization round-trip using SerializableTypes = ::testing::Types< - Action, ActionParameter, ActionParameterFactsheet, ActionParameterValue, - ActionState, AGVAction, AGVGeometry, AGVPosition, BatteryState, - BoundingBoxReference, Connection, ControlPoint, EdgeState, Envelope2d, - Envelope3d, Error, ErrorReference, Factsheet, Header, Info, InfoReference, - InstantActions, Load, LoadDimensions, LoadSet, LoadSpecification, - MaxArrayLens, MaxStringLens, Network, Node, NodePosition, NodeState, - OptionalParameters, Order, PhysicalParameters, PolygonPoint, Position, - ProtocolFeatures, ProtocolLimits, SafetyState, State, Timing, Trajectory, - TypeSpecification, VehicleConfig, Velocity, VersionInfo, Visualization, - WheelDefinition>; + Action, ActionParameter, ActionParameterFactsheet, ActionState, AGVAction, + AGVGeometry, AGVPosition, BatteryState, BoundingBoxReference, Connection, + ControlPoint, EdgeState, Envelope2d, Envelope3d, Error, ErrorReference, + Factsheet, Header, Info, InfoReference, InstantActions, Load, LoadDimensions, + LoadSet, LoadSpecification, MaxArrayLens, MaxStringLens, Network, Node, + NodePosition, NodeState, OptionalParameters, Order, PhysicalParameters, + PolygonPoint, Position, ProtocolFeatures, ProtocolLimits, SafetyState, State, + Timing, Trajectory, TypeSpecification, VehicleConfig, Velocity, VersionInfo, + Visualization, WheelDefinition>; template class SerializationTest : public ::testing::Test