fix #548

Feuermagier · Jun 30, 2024 · ff2f1ef · ff2f1ef
1 parent bdc5a7a
commit ff2f1ef
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/check/api/CollectionAddAll.java b/autograder-core/src/main/java/de/firemage/autograder/core/check/api/CollectionAddAll.java
@@ -198,6 +198,12 @@ private void checkAddAll(CtForEach ctFor) {
                 return;
             }
 
+            // handle edge case where the variable is implicitly cast in the invocation (Character in List, but char in iterable)
+            List<CtTypeReference<?>> actualTypeArguments = ctInvocation.getTarget().getType().getActualTypeArguments();
+            if (!actualTypeArguments.isEmpty() && !ctFor.getVariable().getType().equals(actualTypeArguments.getFirst())) {
+                return;
+            }
+
             String addAllArg = ctFor.getExpression().toString();
             if (ctFor.getExpression().getType().isArray()) {
                 addAllArg = "Arrays.asList(%s)".formatted(addAllArg);

diff --git a/...grader-core/src/main/java/de/firemage/autograder/core/check/oop/MethodShouldBeStatic.java b/...grader-core/src/main/java/de/firemage/autograder/core/check/oop/MethodShouldBeStatic.java
@@ -90,7 +90,6 @@ public void process(CtMethod<?> ctMethod) {
                     return;
                 }
 
-
                 if (!ctMethod.isStatic() && isEffectivelyStatic(ctMethod)) {
                     addLocalProblem(
                         ctMethod,

diff --git a/...grader-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java b/...grader-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java
@@ -256,4 +256,29 @@ public static <T, U> Collection<U> toCollection(Iterable<T> input) {
 
         problems.assertExhausted();
     }
-}
+
+    @Test
+    void testAddAllImplicitCast() throws LinterException, IOException {
+        ProblemIterator problems = this.checkIterator(StringSourceInfo.fromSourceString(
+            JavaVersion.JAVA_17,
+            "Main",
+            """
+                import java.util.Collection;
+                import java.util.ArrayList;
+
+                public class Main {
+                    public static Collection<Character> toCollection(char[] input) {
+                        Collection<Character> result = new ArrayList<>();
+                        
+                        for (char element : input) {
+                            result.add(element);
+                        }
+
+                        return result;
+                    }
+                }
+                """
+        ), PROBLEM_TYPES);
+
+        problems.assertExhausted();
+    }}