Combine prefix and regex for constraint error

GeoWerkstatt · Dec 18, 2023 · c8a1da7 · c8a1da7
1 parent 293c673
commit c8a1da7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/main/java/ch/geowerkstatt/interlis/testbed/runner/InterlisValidator.java b/src/main/java/ch/geowerkstatt/interlis/testbed/runner/InterlisValidator.java
@@ -10,7 +10,6 @@
 
 public final class InterlisValidator implements Validator {
     private static final Logger LOGGER = LogManager.getLogger();
-    private static final String CONSTRAINT_ERROR_PREFIX = "Error: ";
 
     private final TestOptions options;
 
@@ -51,11 +50,11 @@ public boolean validate(Path filePath, Path logFile) throws ValidatorException {
 
     @Override
     public boolean containsConstraintError(Path logFile, String constraintName) throws ValidatorException {
-        var constraintNameWithWordBoundaries = Pattern.compile("\\b" + Pattern.quote(constraintName) + "\\b");
+        var constraintPattern = Pattern.compile("^Error: .*\\b" + Pattern.quote(constraintName) + "\\b");
 
         try (var lines = Files.lines(logFile)) {
             return lines.anyMatch(line -> {
-                if (line.startsWith(CONSTRAINT_ERROR_PREFIX) && constraintNameWithWordBoundaries.matcher(line).find()) {
+                if (constraintPattern.matcher(line).find()) {
                     LOGGER.info("Found expected error for constraint " + constraintName + " in log file: " + line);
                     return true;
                 }