diff --git a/src/Model.cc b/src/Model.cc index 5a0de0411..8891589d3 100644 --- a/src/Model.cc +++ b/src/Model.cc @@ -84,7 +84,7 @@ class sdf::Model::Implementation public: std::vector, sdf::InterfaceModelConstPtr>> interfaceModels; - /// \brief The interface models specified in this model. + /// \brief The interface models added into in this model via merge include. public: std::vector, sdf::InterfaceModelConstPtr>> mergedInterfaceModels; diff --git a/test/integration/interface_api.cc b/test/integration/interface_api.cc index 85e399784..1041a21e4 100644 --- a/test/integration/interface_api.cc +++ b/test/integration/interface_api.cc @@ -934,8 +934,7 @@ TEST_F(InterfaceAPIMergeInclude, Reposturing) std::unordered_map> elementsToReposture; // Create a resposture callback function for a given absolute model name. The - // name is used to store poses in `posesAfterReposture` as well as to lookup - // interface models in `models` + // name is used to store poses in `posesAfterReposture`. auto makeRepostureFunc = [&](const std::string &_absoluteName) { auto repostureFunc = @@ -1222,12 +1221,12 @@ R"( ///////////////////////////////////////////////// TEST_F(InterfaceAPIMergeInclude, JointModelChild) { - const std::string testSdf = R"( + const std::string testSdf = R"( - joint_model_parent_or_child.toml + joint_child_model_frame.toml diff --git a/test/integration/model/joint_model_parent_or_child.toml b/test/integration/model/joint_child_model_frame.toml similarity index 90% rename from test/integration/model/joint_model_parent_or_child.toml rename to test/integration/model/joint_child_model_frame.toml index 715bd873a..f6711301d 100644 --- a/test/integration/model/joint_model_parent_or_child.toml +++ b/test/integration/model/joint_child_model_frame.toml @@ -8,7 +8,7 @@ canonical_link = "base" [links.base] pose = "0 0 0 0 0 0" -# Test use of __model__ in joint parent or child +# Test use of __model__ in joint child [links.parent_link] pose = "0 0 0 0 0 0"