fix tests

Feuermagier · Apr 26, 2024 · 18f83a6 · 18f83a6
1 parent ff64f5a
commit 18f83a6
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...grader-core/src/main/java/de/firemage/autograder/core/integrated/uses/BaseUsesFinder.java b/...grader-core/src/main/java/de/firemage/autograder/core/integrated/uses/BaseUsesFinder.java
@@ -3,8 +3,11 @@
 import de.firemage.autograder.core.integrated.SpoonUtil;
 import spoon.reflect.code.CtCatchVariable;
 import spoon.reflect.code.CtLocalVariable;
+import spoon.reflect.code.CtPattern;
 import spoon.reflect.code.CtResource;
+import spoon.reflect.code.CtTypePattern;
 import spoon.reflect.declaration.CtElement;
+import spoon.reflect.declaration.CtExecutable;
 import spoon.reflect.declaration.CtParameter;
 import spoon.reflect.declaration.CtTypeMember;
 import spoon.reflect.declaration.CtTypeParameter;
@@ -81,9 +84,11 @@ public CtQuery query() {
             switch (this.toSearchFor) {
                 // for local variables, one does not need to search the whole model, it is enough to search in the parent block
                 case CtLocalVariable<?> ctLocalVariable -> {
-                    searchScope = ctLocalVariable.getParent();
+                    if (ctLocalVariable.getParent(CtPattern.class) == null) {
+                        searchScope = ctLocalVariable.getParent();
+                    }
                 }
-                case CtParameter<?> ctParameter -> {
+                case CtParameter<?> ctParameter when ctParameter.getParent() instanceof CtExecutable<?> ctExecutable && ctExecutable.getBody() != null -> {
                     searchScope = ctParameter.getParent();
                 }
                 case CtCatchVariable<?> ctCatchVariable -> {
@@ -108,9 +113,4 @@ public CtQuery query() {
 
         return this.query(searchScope);
     }
-
-    @Override
-    public List<R> all() {
-        return this.query().list();
-    }
 }