Added issue code to prerequisites processing

Signed-off-by: TaikiYamada4 <[email protected]>
TaikiYamada4 · Nov 18, 2024 · 71d6418 · 71d6418
1 parent f23fafb
commit 71d6418
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/map/autoware_lanelet2_map_validator/src/common/validation.cpp b/map/autoware_lanelet2_map_validator/src/common/validation.cpp
@@ -205,6 +205,7 @@ std::vector<lanelet::validation::DetectedIssues> describe_unused_validators_to_j
     issue_json["primitive"] =
       lanelet::validation::toString(lanelet::validation::Primitive::Primitive);
     issue_json["id"] = 0;
+    issue_json["issue-code"] = "General.InvalidPrerequisites-001";
     issue_json["message"] = "Prerequisites don't exist OR they are making a loop.";
     issues_json.push_back(issue_json);
     validator_json["issues"] = issues_json;
@@ -218,7 +219,7 @@ std::vector<lanelet::validation::DetectedIssues> describe_unused_validators_to_j
   }
 
   if (issues.size() > 0) {
-    detected_issues.push_back({"invalid_prerequisites", issues});
+    detected_issues.push_back({"general.invalid_prerequisites", issues});
   }
   return detected_issues;
 }
@@ -248,7 +249,7 @@ std::vector<lanelet::validation::DetectedIssues> check_prerequisite_completion(
     issue.severity = lanelet::validation::Severity::Error;
     issue.primitive = lanelet::validation::Primitive::Primitive;
     issue.id = lanelet::InvalId;
-    issue.message = "Prerequisites didn't pass";
+    issue.message = "[General.PrerequisitesFailure-001] Prerequisites didn't pass.";
     issues.push_back(issue);
   }
 

diff --git a/...utoware_lanelet2_map_validator/test/data/json/test_describe_unused_validators_output.json b/...utoware_lanelet2_map_validator/test/data/json/test_describe_unused_validators_output.json
@@ -16,6 +16,7 @@
               "severity": "Error",
               "primitive": "primitive",
               "id": 0,
+              "issue-code": "General.InvalidPrerequisites-001",
               "message": "Prerequisites don't exist OR they are making a loop."
             }
           ]
@@ -33,6 +34,7 @@
               "severity": "Error",
               "primitive": "primitive",
               "id": 0,
+              "issue-code": "General.InvalidPrerequisites-001",
               "message": "Prerequisites don't exist OR they are making a loop."
             }
           ]
@@ -50,6 +52,7 @@
               "severity": "Error",
               "primitive": "primitive",
               "id": 0,
+              "issue-code": "General.InvalidPrerequisites-001",
               "message": "Prerequisites don't exist OR they are making a loop."
             }
           ]

diff --git a/...utoware_lanelet2_map_validator/test/data/json/test_summarize_validator_results_input.json b/...utoware_lanelet2_map_validator/test/data/json/test_summarize_validator_results_input.json
@@ -33,6 +33,7 @@
               "severity": "Error",
               "primitive": "primitive",
               "id": 0,
+              "issue-code": "General.InvalidPrerequisites-001",
               "message": "Prerequisites don't exist OR they are making a loop."
             }
           ]

diff --git a/...toware_lanelet2_map_validator/test/data/json/test_summarize_validator_results_output.json b/...toware_lanelet2_map_validator/test/data/json/test_summarize_validator_results_output.json
@@ -35,6 +35,7 @@
               "severity": "Error",
               "primitive": "primitive",
               "id": 0,
+              "issue-code": "General.InvalidPrerequisites-001",
               "message": "Prerequisites don't exist OR they are making a loop."
             }
           ]

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
@@ -132,7 +132,7 @@ TEST_F(JsonProcessingTest, DescribeUnusedValidatorsToJson)
   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");
+  EXPECT_EQ(detected_issues[0].checkName, "general.invalid_prerequisites");
   EXPECT_EQ(detected_issues[0].issues[0].severity, lanelet::validation::Severity::Error);
   EXPECT_EQ(detected_issues[0].issues[1].severity, lanelet::validation::Severity::Error);
   EXPECT_EQ(detected_issues[0].issues[2].severity, lanelet::validation::Severity::Error);