diff --git a/rviz_visual_testing_framework/CMakeLists.txt b/rviz_visual_testing_framework/CMakeLists.txt index c7f14ebbc..3f405f5f3 100644 --- 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/rviz_visual_testing_framework/visual_tests_default_config.rviz b/rviz_visual_testing_framework/config/visual_tests_default_config.rviz similarity index 100% rename from rviz_visual_testing_framework/visual_tests_default_config.rviz rename to rviz_visual_testing_framework/config/visual_tests_default_config.rviz diff --git a/rviz_visual_testing_framework/visual_tests_test_image_config.rviz b/rviz_visual_testing_framework/config/visual_tests_test_image_config.rviz similarity index 100% rename from rviz_visual_testing_framework/visual_tests_test_image_config.rviz rename to rviz_visual_testing_framework/config/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 index bc6affe99..d0c8c6f3f 100644 --- 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 #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"))); } }