Installed RViz configs for visual tests (#487)

* Installed RViz configs for visual tests
ros2 · Jan 10, 2020 · fea85f8 · fea85f8
1 parent 7f7a481
commit fea85f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/rviz_visual_testing_framework/CMakeLists.txt b/rviz_visual_testing_framework/CMakeLists.txt
@@ -109,6 +109,11 @@ install(
   DESTINATION include
 )
 
+install(
+  DIRECTORY config
+  DESTINATION share/${PROJECT_NAME}
+)
+
 if(BUILD_TESTING)
   # TODO(wjwwood): replace this with ament_lint_auto() and/or add the copyright linter back
   find_package(ament_cmake_cppcheck REQUIRED)

diff --git a/...ramework/visual_tests_default_config.rviz → ...k/config/visual_tests_default_config.rviz b/...ramework/visual_tests_default_config.rviz → ...k/config/visual_tests_default_config.rviz
diff --git a/...ework/visual_tests_test_image_config.rviz → ...onfig/visual_tests_test_image_config.rviz b/...ework/visual_tests_test_image_config.rviz → ...onfig/visual_tests_test_image_config.rviz
diff --git a/rviz_visual_testing_framework/src/visual_test_fixture.cpp b/rviz_visual_testing_framework/src/visual_test_fixture.cpp
@@ -34,6 +34,7 @@
 #include <vector>
 
 #include "rviz_common/ros_integration/ros_client_abstraction.hpp"
+#include "ament_index_cpp/get_package_share_directory.hpp"
 
 void VisualTestFixture::SetUpTestCase()
 {
@@ -51,13 +52,17 @@ void VisualTestFixture::SetUpTestCase()
   visualizer_app_->setApp(qapp_);
 
   visualizer_app_->init(argc, argv);
+
+  std::string package_share_directory = ament_index_cpp::get_package_share_directory(
+    "rviz_visual_testing_framework");
   if (VisualTest::generateReferenceImages()) {
     visualizer_app_->loadConfig(QDir::toNativeSeparators(
-        QString::fromStdString(std::string(_SRC_DIR_PATH) + "/visual_tests_default_config.rviz")));
+        QString::fromStdString(package_share_directory +
+        "/config/visual_tests_default_config.rviz")));
   } else {
     visualizer_app_->loadConfig(QDir::toNativeSeparators(
-        QString::fromStdString(std::string(_SRC_DIR_PATH) +
-        "/visual_tests_test_image_config.rviz")));
+        QString::fromStdString(package_share_directory +
+        "/config/visual_tests_test_image_config.rviz")));
   }
 }