Move nav2_behavior_tree test utils into the right folder

Author: AadityaRavindran

nav2_behavior_tree/CMakeLists.txt

@@ -223,8 +223,8 @@ install(DIRECTORY include/
   DESTINATION include/
 )
 
-install(DIRECTORY test/utils/
-        DESTINATION include/utils/
+install(DIRECTORY test/include/
+        DESTINATION include/
 )
 
 install(FILES nav2_tree_nodes.xml DESTINATION share/${PROJECT_NAME})

nav2_behavior_tree/test/CMakeLists.txt

@@ -1,7 +1,9 @@
 ament_add_gtest(test_bt_conversions test_bt_conversions.cpp)
 ament_target_dependencies(test_bt_conversions ${dependencies})
 
-include_directories(.)
+include_directories(
+  include/nav2_behavior_tree
+)
 
 add_subdirectory(plugins/condition)
 add_subdirectory(plugins/decorator)

nav2_behavior_tree/test/utils/test_action_server.hpp renamed to nav2_behavior_tree/test/include/nav2_behavior_tree/utils/test_action_server.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__TEST_ACTION_SERVER_HPP_
-#define UTILS__TEST_ACTION_SERVER_HPP_
+#ifndef NAV2_BEHAVIOR_TREE__UTILS__TEST_ACTION_SERVER_HPP_
+#define NAV2_BEHAVIOR_TREE__UTILS__TEST_ACTION_SERVER_HPP_
 
 #include <string>
 #include <memory>
@@ -97,4 +97,4 @@ class TestActionServer : public rclcpp::Node
   bool goal_cancelled_ = false;
 };
 
-#endif  // UTILS__TEST_ACTION_SERVER_HPP_
+#endif  // NAV2_BEHAVIOR_TREE__UTILS__TEST_ACTION_SERVER_HPP_

nav2_behavior_tree/test/utils/test_behavior_tree_fixture.hpp renamed to nav2_behavior_tree/test/include/nav2_behavior_tree/utils/test_behavior_tree_fixture.hpp

@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_
-#define UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_
+#ifndef NAV2_BEHAVIOR_TREE__UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_
+#define NAV2_BEHAVIOR_TREE__UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_
 
 #include <gtest/gtest.h>
 #include <memory>
@@ -90,4 +90,4 @@ BT::NodeConfiguration * nav2_behavior_tree::BehaviorTreeTestFixture::config_ = n
 std::shared_ptr<BT::BehaviorTreeFactory>
 nav2_behavior_tree::BehaviorTreeTestFixture::factory_ = nullptr;
 
-#endif  // UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_
+#endif  // NAV2_BEHAVIOR_TREE__UTILS__TEST_BEHAVIOR_TREE_FIXTURE_HPP_

nav2_behavior_tree/test/utils/test_dummy_tree_node.hpp renamed to nav2_behavior_tree/test/include/nav2_behavior_tree/utils/test_dummy_tree_node.hpp

@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__TEST_DUMMY_TREE_NODE_HPP_
-#define UTILS__TEST_DUMMY_TREE_NODE_HPP_
+#ifndef NAV2_BEHAVIOR_TREE__UTILS__TEST_DUMMY_TREE_NODE_HPP_
+#define NAV2_BEHAVIOR_TREE__UTILS__TEST_DUMMY_TREE_NODE_HPP_
 
 #include <behaviortree_cpp_v3/basic_types.h>
 #include <behaviortree_cpp_v3/action_node.h>
@@ -56,4 +56,4 @@ class DummyNode : public BT::ActionNodeBase
 
 }  // namespace nav2_behavior_tree
 
-#endif  // UTILS__TEST_DUMMY_TREE_NODE_HPP_
+#endif  // NAV2_BEHAVIOR_TREE__UTILS__TEST_DUMMY_TREE_NODE_HPP_

nav2_behavior_tree/test/utils/test_service.hpp renamed to nav2_behavior_tree/test/include/nav2_behavior_tree/utils/test_service.hpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__TEST_SERVICE_HPP_
-#define UTILS__TEST_SERVICE_HPP_
+#ifndef NAV2_BEHAVIOR_TREE__UTILS__TEST_SERVICE_HPP_
+#define NAV2_BEHAVIOR_TREE__UTILS__TEST_SERVICE_HPP_
 
 #include <string>
 #include <memory>
@@ -57,4 +57,4 @@ class TestService : public rclcpp::Node
   std::shared_ptr<typename ServiceT::Request> current_request_;
 };
 
-#endif  // UTILS__TEST_SERVICE_HPP_
+#endif  // NAV2_BEHAVIOR_TREE__UTILS__TEST_SERVICE_HPP_

nav2_behavior_tree/test/utils/test_transform_handler.hpp renamed to nav2_behavior_tree/test/include/nav2_behavior_tree/utils/test_transform_handler.hpp

@@ -13,8 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__TEST_TRANSFORM_HANDLER_HPP_
-#define UTILS__TEST_TRANSFORM_HANDLER_HPP_
+#ifndef NAV2_BEHAVIOR_TREE__UTILS__TEST_TRANSFORM_HANDLER_HPP_
+#define NAV2_BEHAVIOR_TREE__UTILS__TEST_TRANSFORM_HANDLER_HPP_
 
 #include <memory>
 #include <string>
@@ -162,4 +162,4 @@ class TransformHandler
 
 }  // namespace nav2_behavior_tree
 
-#endif  // UTILS__TEST_TRANSFORM_HANDLER_HPP_
+#endif  // NAV2_BEHAVIOR_TREE__UTILS__TEST_TRANSFORM_HANDLER_HPP_