Reflect PR comments

Signed-off-by: TaikiYamada4 <[email protected]>
TaikiYamada4 · Nov 8, 2024 · be45043 · be45043
1 parent 5a5bccc
commit be45043
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/map/autoware_lanelet2_map_validator/src/common/validation.cpp b/map/autoware_lanelet2_map_validator/src/common/validation.cpp
@@ -190,7 +190,7 @@ json & find_validator_block(json & json_data, const std::string & validator_name
   throw std::runtime_error(msg);
 }
 
-std::vector<lanelet::validation::DetectedIssues> descript_unused_validators_to_json(
+std::vector<lanelet::validation::DetectedIssues> describe_unused_validators_to_json(
   json & json_data, const Validators & unused_validators)
 {
   lanelet::validation::Issues issues;
@@ -340,9 +340,11 @@ void process_requirements(json json_data, const MetaConfig & validator_config)
   auto [validation_queue, remaining_validators] = create_validation_queue(validators);
 
   // Note validators that cannot be run from the start
-  std::vector<lanelet::validation::DetectedIssues> unused_validator_issues =
-    descript_unused_validators_to_json(json_data, remaining_validators);
-  appendIssues(issues, std::move(unused_validator_issues));
+  if (auto unused_validator_issues =
+        describe_unused_validators_to_json(json_data, remaining_validators);
+      !unused_validator_issues.empty()) {
+    appendIssues(issues, std::move(unused_validator_issues));
+  }
 
   // Main validation process
   while (!validation_queue.empty()) {

diff --git a/map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validation.hpp b/map/autoware_lanelet2_map_validator/src/include/lanelet2_map_validator/validation.hpp
@@ -77,7 +77,7 @@ std::tuple<std::queue<std::string>, Validators> create_validation_queue(
 // Function to find a validator block by name
 json & find_validator_block(json & json_data, const std::string & validator_name);
 
-std::vector<lanelet::validation::DetectedIssues> descript_unused_validators_to_json(
+std::vector<lanelet::validation::DetectedIssues> describe_unused_validators_to_json(
   json & json_data, const Validators & unused_validators);
 
 std::vector<lanelet::validation::DetectedIssues> check_prerequisite_completion(

diff --git a/...est_descript_unused_validators_input.json → ...est_describe_unused_validators_input.json b/...est_descript_unused_validators_input.json → ...est_describe_unused_validators_input.json
diff --git a/...st_descript_unused_validators_output.json → ...st_describe_unused_validators_output.json b/...st_descript_unused_validators_output.json → ...st_describe_unused_validators_output.json
diff --git a/map/autoware_lanelet2_map_validator/test/src/test_json_processing.cpp b/map/autoware_lanelet2_map_validator/test/src/test_json_processing.cpp
@@ -125,11 +125,11 @@ TEST_F(JsonProcessingTest, DescriptUnusedValidatorsToJson)
     {"validator2", {{{"validator1", true}}, ValidatorInfo::Severity::ERROR}},
     {"validator3", {{{"validator2", true}}, ValidatorInfo::Severity::ERROR}}};
 
-  json sample_input_data = load_json_file("test_descript_unused_validators_input.json");
-  json answer_output_data = load_json_file("test_descript_unused_validators_output.json");
+  json sample_input_data = load_json_file("test_describe_unused_validators_input.json");
+  json answer_output_data = load_json_file("test_describe_unused_validators_output.json");
 
   // Check issues
-  auto detected_issues = descript_unused_validators_to_json(sample_input_data, error_validators);
+  auto detected_issues = describe_unused_validators_to_json(sample_input_data, error_validators);
   EXPECT_EQ(detected_issues.size(), 1);
   EXPECT_EQ(detected_issues[0].issues.size(), 3);
   EXPECT_EQ(detected_issues[0].checkName, "invalid_prerequisites");