Applied suggested fixes

Used existing Pairs, removing old code.
Changed the way strings are matched via Regex.

Author: cheestree

liquidjava-example/src/main/java/testSuite/classes/overload_constructors_error/.expected

@@ -15,7 +15,7 @@
 import liquidjava.diagnostics.Diagnostics;
 
 import liquidjava.diagnostics.errors.LJError;
-import liquidjava.utils.TestUtils.Pair;
+import liquidjava.utils.Pair;
 
 import org.junit.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -55,22 +55,22 @@ else if (shouldFail(pathName)) {
                 fail();
             } else {
                 // check if expected error was found
-                List<Pair> expected = isDirectory ? getExpectedErrorsFromDirectory(path)
+                List<Pair<String, Integer>> expectedErrors = isDirectory ? getExpectedErrorsFromDirectory(path)
                         : getExpectedErrorsFromFile(path);
-                if (diagnostics.getErrors().size() > expected.size()) {
+                if (diagnostics.getErrors().size() != expectedErrors.size()) {
                     System.out.println("Multiple errors found in: " + pathName + " --- expected exactly "
-                            + expected.size() + " errors. \n" + diagnostics.getErrorOutput());
+                            + expectedErrors.size() + " errors. \n" + diagnostics.getErrorOutput());
                     fail();
                 }
-                if (!expected.isEmpty()) {
+                if (!expectedErrors.isEmpty()) {
                     for (LJError e : diagnostics.getErrors()) {
                         String foundError = e.getTitle();
                         int errorPosition = e.getPosition().getLine();
-                        boolean match = expected.stream().anyMatch(
-                                pair -> pair.errorMessage().equals(foundError) && pair.lineNumber() == errorPosition);
+                        boolean match = expectedErrors.stream().anyMatch(
+                                expected -> expected.first().equals(foundError) && expected.second() == errorPosition);
 
                         if (!match) {
-                            System.out.println("Error in: " + pathName + " --- expected errors: " + expected
+                            System.out.println("Error in: " + pathName + " --- expected errors: " + expectedErrors
                                     + ", but found: " + foundError + " at " + errorPosition + ". \n"
                                     + diagnostics.getErrorOutput());
                             fail();
@@ -79,7 +79,7 @@ else if (shouldFail(pathName)) {
                 } else {
                     System.out.println("No expected error messages found for: " + pathName);
                     System.out.println(
-                            "Please provide the expected errors in the test file as comments starting with // at the end of the supposed error line.");
+                            "Please specify each expected error in the test file as a comment on the line where the error should be reported.");
                     fail();
                 }
             }

liquidjava-verifier/src/test/java/liquidjava/api/tests/TestExamples.java

@@ -6,18 +6,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class TestUtils {
-    /*
-     * A simple record to store an error message and its line number, used for expected errors read from test files
-     */
-    public record Pair(String errorMessage, int lineNumber) {
-        @Override
-        public String toString() {
-            return errorMessage + " at " + lineNumber;
-        };
-    }
-
     /**
      * Determines if the given path indicates that the test should pass
      * 
@@ -45,23 +37,22 @@ public static boolean shouldFail(String path) {
      * @return list of expected error messages found in the file, or empty list if there was an error reading the file
      *         or if there are no expected error messages in the file
      */
-    public static List<Pair> getExpectedErrorsFromFile(Path filePath) {
-        List<Pair> expectedErrors = new ArrayList<>();
+    public static List<Pair<String, Integer>> getExpectedErrorsFromFile(Path filePath) {
+        List<Pair<String, Integer>> expectedErrors = new ArrayList<>();
         try (BufferedReader reader = Files.newBufferedReader(filePath)) {
             String line;
             int lineNumber = 0;
             while ((line = reader.readLine()) != null) {
                 lineNumber++;
-                int idx = line.indexOf("//");
-                if (idx != -1 && line.substring(idx).contains("Error")) {
-                    // only expects the error type, NOT the actual refinement error message, depends on deterministic
-                    // variable names
-                    String comment = line.substring(idx + 2).trim();
+                Pattern p = Pattern.compile("//\\s*(.*?\\bError\\b)", Pattern.CASE_INSENSITIVE);
+                Matcher m = p.matcher(line);
+                if (m.find()) {
+                    String comment = m.group(1).trim();
                     int dotIdx = comment.indexOf(":");
                     if (dotIdx != -1) {
                         comment = comment.substring(0, dotIdx).trim();
                     }
-                    expectedErrors.add(new Pair(comment, lineNumber));
+                    expectedErrors.add(new Pair<>(comment, lineNumber));
                 }
             }
         } catch (IOException e) {
@@ -78,8 +69,8 @@ public static List<Pair> getExpectedErrorsFromFile(Path filePath) {
      * @return list of expected error messages from all files in the directory, or empty list if there was an error
      *         reading the directory or if there are no files in the directory
      */
-    public static List<Pair> getExpectedErrorsFromDirectory(Path dirPath) {
-        List<Pair> expectedErrors = new ArrayList<>();
+    public static List<Pair<String, Integer>> getExpectedErrorsFromDirectory(Path dirPath) {
+        List<Pair<String, Integer>> expectedErrors = new ArrayList<>();
         try {
             List<Path> files = Files.list(dirPath).filter(Files::isRegularFile).toList();
             for (Path file : files) {