Revert change

StevenLooman · Nov 18, 2024 · 4b864c0 · 4b864c0
1 parent 5d11933
commit 4b864c0
Show file tree

Hide file tree

Showing 38 changed files with 127 additions and 89 deletions.
diff --git a/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/CommentedCodeCheckTest.java b/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/CommentedCodeCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -59,7 +60,7 @@ class CommentedCodeCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final CommentedCodeCheck check = new CommentedCodeCheck();
+    final MagikCheck check = new CommentedCodeCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -117,14 +118,14 @@ void testValid(final String code) {
         """,
       })
   void testInvalid(final String code) {
-    final CommentedCodeCheck check = new CommentedCodeCheck();
+    final MagikCheck check = new CommentedCodeCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }
 
   @Test
   void testInvalid2() {
-    final CommentedCodeCheck check = new CommentedCodeCheck();
+    final MagikCheck check = new CommentedCodeCheck();
     final String code =
         """
         _method a.b

diff --git a/.../src/test/java/nl/ramsolutions/sw/magik/checks/checks/DuplicateMethodInFileCheckTest.java b/.../src/test/java/nl/ramsolutions/sw/magik/checks/checks/DuplicateMethodInFileCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -45,7 +46,7 @@ class DuplicateMethodInFileCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final DuplicateMethodInFileCheck check = new DuplicateMethodInFileCheck();
+    final MagikCheck check = new DuplicateMethodInFileCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -85,7 +86,7 @@ void testValid(final String code) {
         """,
       })
   void testInvalid(final String code) {
-    final DuplicateMethodInFileCheck check = new DuplicateMethodInFileCheck();
+    final MagikCheck check = new DuplicateMethodInFileCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(2);
   }

diff --git a/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/EmptyBlockCheckTest.java b/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/EmptyBlockCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -47,7 +48,7 @@ class EmptyBlockCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final EmptyBlockCheck check = new EmptyBlockCheck();
+    final MagikCheck check = new EmptyBlockCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -97,7 +98,7 @@ void testValid(final String code) {
         """,
       })
   void testInvalid(final String code) {
-    final EmptyBlockCheck check = new EmptyBlockCheck();
+    final MagikCheck check = new EmptyBlockCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/...ecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/FileNotInLoadListCheckTest.java b/...ecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/FileNotInLoadListCheckTest.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 
@@ -16,7 +17,7 @@ void testNotInLoadList() throws IllegalArgumentException, IOException {
     final Path path =
         Path.of(
             "magik-checks/src/test/resources/test_product/test_module/source/not_in_load_list.magik");
-    final FileNotInLoadListCheck check = new FileNotInLoadListCheck();
+    final MagikCheck check = new FileNotInLoadListCheck();
     final List<MagikIssue> issues = this.runCheck(path, check);
     assertThat(issues).isNotEmpty();
   }
@@ -26,7 +27,7 @@ void testInLoadList() throws IllegalArgumentException, IOException {
     final Path path =
         Path.of(
             "magik-checks/src/test/resources/test_product/test_module/source/in_load_list.magik");
-    final FileNotInLoadListCheck check = new FileNotInLoadListCheck();
+    final MagikCheck check = new FileNotInLoadListCheck();
     final List<MagikIssue> issues = this.runCheck(path, check);
     assertThat(issues).isEmpty();
   }

diff --git a/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/ForbiddenCallCheckTest.java b/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/ForbiddenCallCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -17,7 +18,7 @@ class ForbiddenCallCheckTest extends MagikCheckTestBase {
         "sw:do_something(1)",
       })
   void testValid(final String code) {
-    final ForbiddenCallCheck check = new ForbiddenCallCheck();
+    final MagikCheck check = new ForbiddenCallCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -26,7 +27,7 @@ void testValid(final String code) {
   @ValueSource(
       strings = {"show(1)", "sw:show(1)", "a.sys!slot(:a)", "a.sys!perform(:|xyz()|, x, y, z)"})
   void testInvalid(final String code) {
-    final ForbiddenCallCheck check = new ForbiddenCallCheck();
+    final MagikCheck check = new ForbiddenCallCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/FormattingCheckTest.java b/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/FormattingCheckTest.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -44,7 +45,7 @@ class FormattingCheckTest extends MagikCheckTestBase {
         """,
       })
   void testProper(final String code) {
-    final FormattingCheck check = new FormattingCheck();
+    final MagikCheck check = new FormattingCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -62,14 +63,14 @@ void testProper(final String code) {
         "$\n$",
       })
   void testImproper(final String code) {
-    final FormattingCheck check = new FormattingCheck();
+    final MagikCheck check = new FormattingCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }
 
   @Test
   void testFile() throws IllegalArgumentException, IOException {
-    final FormattingCheck check = new FormattingCheck();
+    final MagikCheck check = new FormattingCheck();
     final Path path =
         Path.of(
             "magik-checks/src/test/resources/test_product/test_module/source/in_load_list.magik");
@@ -139,14 +140,14 @@ void testSpaceIndentLineStrtWithSpaces() {
       })
   @SuppressWarnings("java:S4144")
   void testMultipleWhitelines(final String code) {
-    final FormattingCheck check = new FormattingCheck();
+    final MagikCheck check = new FormattingCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }
 
   @Test
   void testMultipleWhitelinesMethodDoc() {
-    final FormattingCheck check = new FormattingCheck();
+    final MagikCheck check = new FormattingCheck();
     final String code =
         """
         _method object.method(param)

diff --git a/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/HidesVariableCheckTest.java b/...k-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/HidesVariableCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -39,7 +40,7 @@ class HidesVariableCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final HidesVariableCheck check = new HidesVariableCheck();
+    final MagikCheck check = new HidesVariableCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -89,7 +90,7 @@ void testValid(final String code) {
         """,
       })
   void testInvalid(final String code) {
-    final HidesVariableCheck check = new HidesVariableCheck();
+    final MagikCheck check = new HidesVariableCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/...rc/test/java/nl/ramsolutions/sw/magik/checks/checks/ImportMissingDefinitionCheckTest.java b/...rc/test/java/nl/ramsolutions/sw/magik/checks/checks/ImportMissingDefinitionCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -59,7 +60,7 @@ class ImportMissingDefinitionCheckTest extends MagikCheckTestBase {
         """,
       })
   void testImportValid(final String code) {
-    final ImportMissingDefinitionCheck check = new ImportMissingDefinitionCheck();
+    final MagikCheck check = new ImportMissingDefinitionCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -84,7 +85,7 @@ void testImportValid(final String code) {
         """,
       })
   void testImportInvalid(final String code) {
-    final ImportMissingDefinitionCheck check = new ImportMissingDefinitionCheck();
+    final MagikCheck check = new ImportMissingDefinitionCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/...hecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LhsRhsComparatorCheckTest.java b/...hecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LhsRhsComparatorCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -20,7 +21,7 @@ class LhsRhsComparatorCheckTest extends MagikCheckTestBase {
         "a >= b",
       })
   void testValid(final String code) {
-    final LhsRhsComparatorEqualCheck check = new LhsRhsComparatorEqualCheck();
+    final MagikCheck check = new LhsRhsComparatorEqualCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -35,7 +36,7 @@ void testValid(final String code) {
         "a >= a",
       })
   void testInvalid(final String code) {
-    final LhsRhsComparatorEqualCheck check = new LhsRhsComparatorEqualCheck();
+    final MagikCheck check = new LhsRhsComparatorEqualCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LineLengthCheckTest.java b/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LineLengthCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +13,7 @@ class LineLengthCheckTest extends MagikCheckTestBase {
 
   @Test
   void testLineNotTooLong1() {
-    final LineLengthCheck check = new LineLengthCheck();
+    final MagikCheck check = new LineLengthCheck();
     final String code =
         """
         # this is ok
@@ -24,7 +25,7 @@ void testLineNotTooLong1() {
 
   @Test
   void testLineNotTooLong2() {
-    final LineLengthCheck check = new LineLengthCheck();
+    final MagikCheck check = new LineLengthCheck();
     final String code =
         """
         l_23456789012345678901234567890

diff --git a/...s/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LocalImportProcedureCheckTest.java b/...s/src/test/java/nl/ramsolutions/sw/magik/checks/checks/LocalImportProcedureCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -40,7 +41,7 @@ class LocalImportProcedureCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final LocalImportProcedureCheck check = new LocalImportProcedureCheck();
+    final MagikCheck check = new LocalImportProcedureCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
@@ -59,7 +60,7 @@ void testValid(final String code) {
         """,
       })
   void testInvalid(final String code) {
-    final LocalImportProcedureCheck check = new LocalImportProcedureCheck();
+    final MagikCheck check = new LocalImportProcedureCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).hasSize(1);
   }

diff --git a/...hecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/MethodComplexityCheckTest.java b/...hecks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/MethodComplexityCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 
@@ -41,7 +42,7 @@ void testTooComplex() {
 
   @Test
   void testNotTooComplex() {
-    final MethodComplexityCheck check = new MethodComplexityCheck();
+    final MagikCheck check = new MethodComplexityCheck();
     final String code =
         """
         _method a.b

diff --git a/...checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/MethodLineCountCheckTest.java b/...checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/MethodLineCountCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 
@@ -73,7 +74,7 @@ void testProcedureOk() {
 
   @Test
   void testSyntaxError() {
-    final MethodLineCountCheck check = new MethodLineCountCheck();
+    final MagikCheck check = new MethodLineCountCheck();
     final String code =
         """
         _method a.b

diff --git a/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/NoSelfUseCheckTest.java b/magik-checks/src/test/java/nl/ramsolutions/sw/magik/checks/checks/NoSelfUseCheckTest.java
@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;
+import nl.ramsolutions.sw.magik.checks.MagikCheck;
 import nl.ramsolutions.sw.magik.checks.MagikIssue;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -40,14 +41,14 @@ class NoSelfUseCheckTest extends MagikCheckTestBase {
         """,
       })
   void testValid(final String code) {
-    final NoSelfUseCheck check = new NoSelfUseCheck();
+    final MagikCheck check = new NoSelfUseCheck();
     final List<MagikIssue> issues = this.runCheck(code, check);
     assertThat(issues).isEmpty();
   }
 
   @Test
   void testInvalid() {
-    final NoSelfUseCheck check = new NoSelfUseCheck();
+    final MagikCheck check = new NoSelfUseCheck();
     final String code =
         """
         _method a.b