ignore overridden methods for empty block check

Feuermagier · Apr 8, 2024 · 4c1663d · 4c1663d
1 parent 7252d45
commit 4c1663d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/...der-core/src/main/java/de/firemage/autograder/core/check/unnecessary/EmptyBlockCheck.java b/...der-core/src/main/java/de/firemage/autograder/core/check/unnecessary/EmptyBlockCheck.java
@@ -11,6 +11,7 @@
 import spoon.reflect.code.CtCatch;
 import spoon.reflect.code.CtComment;
 import spoon.reflect.code.CtSwitch;
+import spoon.reflect.declaration.CtMethod;
 import spoon.reflect.visitor.CtScanner;
 
 @ExecutableCheck(reportedProblems = {ProblemType.EMPTY_BLOCK, ProblemType.EMPTY_CATCH})
@@ -31,6 +32,12 @@ public <T> void visitCtBlock(CtBlock<T> ctBlock) {
                     return;
                 }
 
+                if (ctBlock.getParent() instanceof CtMethod<?> ctMethod
+                    && ctMethod.getBody().equals(ctBlock)
+                    && SpoonUtil.isInOverriddenMethod(ctBlock)) {
+                    return;
+                }
+
                 if (ctBlock.getParent() instanceof CtCatch ctCatch && ctCatch.getBody().equals(ctBlock)) {
                     addLocalProblem(
                         ctCatch,

diff --git a/...src/test/resources/de/firemage/autograder/core/check_tests/EmptyBlockCheck/code/Test.java b/...src/test/resources/de/firemage/autograder/core/check_tests/EmptyBlockCheck/code/Test.java
@@ -16,7 +16,7 @@ interface A {
 
     class B implements A {
         @Override
-        public void call() {} /*# not ok #*/
+        public void call() {} /*# ok #*/
     }
 
     class C implements A {

diff --git a/...ore/src/test/resources/de/firemage/autograder/core/check_tests/EmptyBlockCheck/config.txt b/...ore/src/test/resources/de/firemage/autograder/core/check_tests/EmptyBlockCheck/config.txt
@@ -5,7 +5,6 @@ Test.java:6
 Test.java:9-10
 Test.java:10
 
-Test.java:19
 Test.java:47
 Test.java:50-51
 Test.java:51-52