Worked on error recovery tests

usethesource · Sep 1, 2024 · dec2b29 · dec2b29
1 parent bd2d1ee
commit dec2b29
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/org/rascalmpl/library/ParseTree.rsc b/src/org/rascalmpl/library/ParseTree.rsc
@@ -786,6 +786,11 @@ Tree findFirstError(Tree tree) {
     fail;
 }
 
+@synopsis{Find the best error from a tree containing errors.}
+Tree findBestError(Tree tree) {
+  return findFirstError(defaultErrorDisambiguationFilter(tree));
+}
+
 @synopsis{Get the symbol (sort) of the failing production}
 Symbol getErrorSymbol(appl(error(Symbol sym, _, _), _)) = sym;
 

diff --git a/src/org/rascalmpl/library/lang/rascal/tests/recovery/BasicRecoveryTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/recovery/BasicRecoveryTests.rsc
@@ -38,7 +38,7 @@ test bool abx() {
 
 test bool axc() {
     Tree t = parseS("a x c $", visualize=true);
-    return getErrorText(findFirstError(t)) != "x c";
+    return getErrorText(findFirstError(t)) == "x c";
 }
 
 test bool ax() {

diff --git a/src/org/rascalmpl/library/lang/rascal/tests/recovery/ToyRascalRecoveryTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/recovery/ToyRascalRecoveryTests.rsc
@@ -42,10 +42,10 @@ test bool toyRascalOk() {
 
 test bool toyRascalMissingOpenParen() {
     Tree t = parseToyRascal("f){}", visualize=true);
-    return hasErrors(t) && getErrorText(findFirstError(t)) == ")";
+    return hasErrors(t) && getErrorText(findBestError(t)) == ")";
 }
 
 test bool toyRascalMissingCloseParen() {
     Tree t = parseToyRascal("f({}", visualize=true);
-    return hasErrors(t) && getErrorText(findFirstError(t)) == ")";
+    return hasErrors(t) && getErrorText(findBestError(t)) == "(";
 }
diff --git a/...l/test/recovery/ErrorRecoveryModules.java → ...l/test/recovery/RunRascalTestModules.java b/...l/test/recovery/ErrorRecoveryModules.java → ...l/test/recovery/RunRascalTestModules.java
@@ -20,6 +20,6 @@
 
 @RunWith(RascalJUnitTestRunner.class)
 @RascalJUnitTestPrefix("lang::rascal::tests::recovery")
-public class ErrorRecoveryModules {
+public class RunRascalTestModules {
 
 }