From 2a868af68b701a29b43f4b52f0990f7ce1c99918 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Thu, 23 Jan 2025 16:02:11 +0900 Subject: [PATCH] chore: change junit inline namespace to normal namespace --- common/simple_junit/include/simple_junit/junit5.hpp | 2 +- .../openscenario_interpreter/openscenario_interpreter.hpp | 2 +- .../file_interactions/junit_xml_reporter.hpp | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/simple_junit/include/simple_junit/junit5.hpp b/common/simple_junit/include/simple_junit/junit5.hpp index 410571f346d..813c158aab1 100644 --- a/common/simple_junit/include/simple_junit/junit5.hpp +++ b/common/simple_junit/include/simple_junit/junit5.hpp @@ -28,7 +28,7 @@ using string = std::string; namespace common { -inline namespace junit +namespace junit { struct Pass { diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/openscenario_interpreter.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/openscenario_interpreter.hpp index a1fd41e2f4e..a50db902db3 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/openscenario_interpreter.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/openscenario_interpreter.hpp @@ -70,7 +70,7 @@ class Interpreter : public rclcpp_lifecycle::LifecycleNode, std::shared_ptr timer; - common::JUnit5 results; + common::junit::JUnit5 results; boost::variant result; diff --git a/test_runner/random_test_runner/include/random_test_runner/file_interactions/junit_xml_reporter.hpp b/test_runner/random_test_runner/include/random_test_runner/file_interactions/junit_xml_reporter.hpp index f34453d8d50..9be3a0913ff 100644 --- a/test_runner/random_test_runner/include/random_test_runner/file_interactions/junit_xml_reporter.hpp +++ b/test_runner/random_test_runner/include/random_test_runner/file_interactions/junit_xml_reporter.hpp @@ -29,7 +29,9 @@ class JunitXmlReporterTestCase { public: - explicit JunitXmlReporterTestCase(common::SimpleTestCase & testcase) : testcase_(testcase) {} + explicit JunitXmlReporterTestCase(common::junit::SimpleTestCase & testcase) : testcase_(testcase) + { + } void reportCollision(const NPCDescription & npc, double time) { @@ -52,7 +54,7 @@ class JunitXmlReporterTestCase testcase_.error.push_back(result); } - common::SimpleTestCase & testcase_; + common::junit::SimpleTestCase & testcase_; }; class JunitXmlReporter @@ -77,7 +79,7 @@ class JunitXmlReporter } private: - common::JUnit5 results_; + common::junit::JUnit5 results_; std::string output_directory_; rclcpp::Logger logger_; };