From af0f922b6778b0381fe4eb0e0d3b1ff43a864422 Mon Sep 17 00:00:00 2001 From: Luro02 <24826124+Luro02@users.noreply.github.com> Date: Sat, 13 Jul 2024 13:27:25 +0200 Subject: [PATCH] revert more changes --- .../firemage/autograder/cmd/Application.java | 2 +- .../de/firemage/autograder/core/Linter.java | 95 +++---------------- .../autograder/core/check/utils/Option.java | 8 -- .../autograder/core/compiler/Compiler.java | 1 - .../core/{ => compiler}/JavaVersion.java | 2 +- .../autograder/core/file/FileSourceInfo.java | 2 +- .../autograder/core/file/SourceInfo.java | 2 +- .../core/file/StringSourceInfo.java | 2 +- .../autograder/core/file/UploadedFile.java | 2 +- .../firemage/autograder/core/CheckTest.java | 1 + .../core/check/TestMergedProblems.java | 2 +- .../core/check/api/TestAvoidStringConcat.java | 2 +- .../core/check/api/TestCharRange.java | 2 +- .../api/TestCheckIterableDuplicates.java | 2 +- .../core/check/api/TestCollectionAddAll.java | 2 +- .../check/api/TestCollectionsNCopies.java | 2 +- .../check/api/TestImplementComparable.java | 2 +- .../api/TestIsEmptyReimplementationCheck.java | 2 +- .../check/api/TestMathReimplementation.java | 2 +- .../check/api/TestSimplifyArraysFill.java | 2 +- .../core/check/api/TestStringRepeat.java | 2 +- .../core/check/api/TestUseArrayCopy.java | 2 +- .../core/check/api/TestUseArraysFill.java | 2 +- .../core/check/api/TestUseEnumValues.java | 2 +- .../core/check/api/TestUseFormatString.java | 2 +- .../core/check/api/TestUseModuloOperator.java | 2 +- .../check/api/TestUseStringFormatted.java | 2 +- .../core/check/api/TestUseSubList.java | 2 +- .../comment/TestCommentedOutCodeCheck.java | 2 +- .../check/comment/TestFieldJavadocCheck.java | 2 +- .../check/comment/TestMethodJavadocCheck.java | 2 +- .../check/comment/TestUnnecessaryComment.java | 2 +- .../complexity/TestExtendsObjectCheck.java | 2 +- .../complexity/TestRedundantAssignment.java | 2 +- .../complexity/TestRedundantConstructor.java | 2 +- .../check/complexity/TestRedundantElse.java | 2 +- .../TestRedundantIfForBooleanCheck.java | 2 +- .../complexity/TestRedundantModifier.java | 2 +- .../TestRedundantNegationCheck.java | 2 +- .../TestRedundantUninitializedVariable.java | 2 +- .../complexity/TestRedundantVariable.java | 2 +- .../TestRepeatedMathOperationCheck.java | 2 +- .../complexity/TestTooManyExceptions.java | 2 +- .../complexity/TestTryCatchComplexity.java | 2 +- .../complexity/TestUnnecessaryBoxing.java | 2 +- .../check/complexity/TestUnusedImport.java | 2 +- .../TestWrapperInstantiationCheck.java | 2 +- .../TestCustomExceptionInheritanceCheck.java | 2 +- .../exceptions/TestExceptionMessageCheck.java | 2 +- .../TestNumberFormatExceptionIgnored.java | 2 +- .../check/general/TestAvoidShadowing.java | 2 +- .../check/general/TestCompareCharValue.java | 2 +- .../check/general/TestFieldShouldBeFinal.java | 2 +- .../check/general/TestForToForEachLoop.java | 2 +- .../core/check/general/TestImportTypes.java | 2 +- .../general/TestLoopShouldBeDoWhile.java | 2 +- .../check/general/TestLoopShouldBeFor.java | 2 +- .../core/check/general/TestMagicString.java | 2 +- .../check/general/TestObjectDatatype.java | 2 +- .../TestOverrideAnnotationMissing.java | 2 +- .../general/TestReassignedParameterCheck.java | 2 +- .../general/TestUseDifferentVisibility.java | 2 +- .../naming/TestPackageNamingConvention.java | 2 +- .../core/check/oop/TestClosedSetOfValues.java | 2 +- .../oop/TestConcreteCollectionCheck.java | 2 +- .../core/check/oop/TestIOUISeparation.java | 2 +- .../check/oop/TestLeakedCollectionCheck.java | 2 +- .../check/oop/TestMethodShouldBeStatic.java | 2 +- .../core/check/oop/TestStaticBlock.java | 2 +- .../TestStaticFieldShouldBeInstanceCheck.java | 2 +- .../structure/TestDefaultPackageCheck.java | 2 +- .../check/structure/TestDuplicateCode.java | 2 +- .../structure/TestTooFewPackagesCheck.java | 2 +- .../TestUnusedCodeElementCheck.java | 2 +- .../core/file/TestFileSourceInfo.java | 2 +- .../autograder/core/framework/TestInput.java | 2 +- .../core/integrated/MethodHierarchyTest.java | 2 +- .../TestStructuralEqualsVisitor.java | 5 +- .../extra/errorprone/ErrorProneCompiler.java | 2 +- .../extra/check/TestLocalizedStrings.java | 2 +- ...stProblematicEqualsHashCodeComparable.java | 2 +- .../complexity/TestDiamondOperatorCheck.java | 2 +- .../complexity/TestRedundantReturnCheck.java | 2 +- .../check/complexity/TestRegexCheck.java | 2 +- .../TestConstantNamingAndQualifierCheck.java | 2 +- .../TestDoubleBraceInitializationCheck.java | 2 +- .../general/TestUseDifferentVisibility.java | 2 +- .../naming/TestLinguisticNamingCheck.java | 2 +- ...estVariablesHaveDescriptiveNamesCheck.java | 2 +- .../oop/TestInheritanceBadPractices.java | 2 +- 90 files changed, 102 insertions(+), 178 deletions(-) rename autograder-core/src/main/java/de/firemage/autograder/core/{ => compiler}/JavaVersion.java (96%) diff --git a/autograder-cmd/src/main/java/de/firemage/autograder/cmd/Application.java b/autograder-cmd/src/main/java/de/firemage/autograder/cmd/Application.java index 11122a70..612393e7 100644 --- a/autograder-cmd/src/main/java/de/firemage/autograder/cmd/Application.java +++ b/autograder-cmd/src/main/java/de/firemage/autograder/cmd/Application.java @@ -12,7 +12,7 @@ import de.firemage.autograder.core.LinterStatus; import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.compiler.CompilationFailureException; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import de.firemage.autograder.core.file.UploadedFile; import de.firemage.autograder.span.Formatter; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/Linter.java b/autograder-core/src/main/java/de/firemage/autograder/core/Linter.java index ec96c8b2..fd7f8ded 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/Linter.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/Linter.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; import java.util.IdentityHashMap; @@ -36,55 +35,6 @@ public final class Linter { private final ClassLoader classLoader; private final int maxProblemsPerCheck; - - public static List> run( - ClassLoader classLoader, - Path submissionSource, - Collection problemTypes, - List excludedClasses, - Consumer statusConsumer, - Locale locale, - int threads, - TempLocation tempLocation, - int maxProblemsPerCheck) throws Exception { - Linter linter = Linter.builder(locale) - .classLoader(classLoader) - .threads(threads) - .tempLocation(TempLocation.random()) - .maxProblemsPerCheck(maxProblemsPerCheck) - .build(); - - Consumer statusConsumerWrapper = status -> statusConsumer.accept(linter.translateMessage(status.getMessage())); - - List> problems = new ArrayList<>(); - try (UploadedFile uploadedFile = UploadedFile.build( - submissionSource, - JavaVersion.latest(), - linter.tempLocation, - statusConsumerWrapper, - null)) { - var autograderProblems = linter.checkFile(uploadedFile, new CheckConfiguration( - problemTypes.stream().map(ProblemType::valueOf).toList(), - excludedClasses - ), statusConsumerWrapper); - - for (var problem : autograderProblems) { - /*problems.add(new Problem( - problem.getProblemType().toString(), - problem.getPosition(), - linter.translateMessage(problem.getExplanation()) - ));*/ - problems.add(List.of( - problem.getProblemType().toString(), - problem.getPosition(), - linter.translateMessage(problem.getExplanation()) - )); - } - } - - return problems; - } - private Linter( Locale locale, TempLocation tempLocation, @@ -317,21 +267,15 @@ public String translateMessage(Translatable message) { return output; } + private static final Collection> CHECKS = new LinkedHashSet<>( + new Reflections("de.firemage.autograder.", Scanners.TypesAnnotated) + .getTypesAnnotatedWith(ExecutableCheck.class) + ); + public List findChecksForProblemTypes(Collection problems) { - ClassLoader[] classLoaders = { this.classLoader }; - - // TODO: is the classLoader stuff necessary? or is it enough to use the old version? - Collection> checks = new LinkedHashSet<>( - new Reflections(new ConfigurationBuilder() - .forPackage("de.firemage.autograder.", classLoaders) - .addScanners(Scanners.TypesAnnotated) - .setClassLoaders(classLoaders) - ).getTypesAnnotatedWith(ExecutableCheck.class) - ); - - return checks + return CHECKS .stream() - .filter(check -> this.isRequiredCheck(check.getAnnotation(ExecutableCheck.class), problems)) + .filter(check -> isRequiredCheck(check.getAnnotation(ExecutableCheck.class), problems)) .map(check -> { try { return (Check) check.getConstructor().newInstance(); @@ -344,20 +288,13 @@ public List findChecksForProblemTypes(Collection problems) { .toList(); } - public List> findCodeLinter() { - ClassLoader[] classLoaders = { this.classLoader }; - - // TODO: is the classLoader stuff necessary? or is it enough to use the old version? - Collection> codeLinter = new LinkedHashSet<>( - new Reflections(new ConfigurationBuilder() - .forPackage("de.firemage.autograder.", classLoaders) - .addScanners(Scanners.SubTypes) - .setClassLoaders(classLoaders) - ).getSubTypesOf(CodeLinter.class) - ); + private static final Collection> CODE_LINTER = new LinkedHashSet<>( + new Reflections("de.firemage.autograder.", Scanners.SubTypes) + .getSubTypesOf(CodeLinter.class) + ); - - return codeLinter + public List> findCodeLinter() { + return CODE_LINTER .stream() .map(linter -> { try { @@ -373,10 +310,6 @@ public List> findCodeLinter() { private boolean isRequiredCheck(ExecutableCheck check, Collection problems) { - try { - return check.enabled() && problems.stream().anyMatch(p -> List.of(check.reportedProblems()).contains(p)); - } catch (EnumConstantNotPresentException e) { - return false; - } + return check.enabled() && problems.stream().anyMatch(p -> List.of(check.reportedProblems()).contains(p)); } } diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/check/utils/Option.java b/autograder-core/src/main/java/de/firemage/autograder/core/check/utils/Option.java index 02d29906..53193188 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/check/utils/Option.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/check/utils/Option.java @@ -30,14 +30,6 @@ default boolean isSome() { return this instanceof Some; } - default T or(T other) { - if (this.isSome()) { - return this.orElseThrow(); - } else { - return other; - } - } - default Option map(Function function) { return switch (this) { case Some(var value) -> new Some<>(function.apply(value)); diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/compiler/Compiler.java b/autograder-core/src/main/java/de/firemage/autograder/core/compiler/Compiler.java index d4061afa..5fc843c1 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/compiler/Compiler.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/compiler/Compiler.java @@ -2,7 +2,6 @@ import de.firemage.autograder.core.file.CompilationUnit; import de.firemage.autograder.core.file.SourceInfo; -import de.firemage.autograder.core.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import javax.tools.DiagnosticCollector; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/JavaVersion.java b/autograder-core/src/main/java/de/firemage/autograder/core/compiler/JavaVersion.java similarity index 96% rename from autograder-core/src/main/java/de/firemage/autograder/core/JavaVersion.java rename to autograder-core/src/main/java/de/firemage/autograder/core/compiler/JavaVersion.java index 949383df..b487e63f 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/JavaVersion.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/compiler/JavaVersion.java @@ -1,4 +1,4 @@ -package de.firemage.autograder.core; +package de.firemage.autograder.core.compiler; import java.util.Arrays; import java.util.Comparator; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/file/FileSourceInfo.java b/autograder-core/src/main/java/de/firemage/autograder/core/file/FileSourceInfo.java index 6e64527e..6be3eb7b 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/file/FileSourceInfo.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/file/FileSourceInfo.java @@ -1,7 +1,7 @@ package de.firemage.autograder.core.file; import de.firemage.autograder.core.SerializableCharset; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.compiler.PhysicalFileObject; import org.apache.commons.io.FileUtils; import org.mozilla.universalchardet.UniversalDetector; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/file/SourceInfo.java b/autograder-core/src/main/java/de/firemage/autograder/core/file/SourceInfo.java index a06ef9b6..be0c66fb 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/file/SourceInfo.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/file/SourceInfo.java @@ -1,6 +1,6 @@ package de.firemage.autograder.core.file; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import spoon.compiler.SpoonResource; import java.io.IOException; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/file/StringSourceInfo.java b/autograder-core/src/main/java/de/firemage/autograder/core/file/StringSourceInfo.java index a5b1d5a1..913678a1 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/file/StringSourceInfo.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/file/StringSourceInfo.java @@ -1,6 +1,6 @@ package de.firemage.autograder.core.file; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.apache.commons.io.FileUtils; import spoon.compiler.SpoonResource; import spoon.support.compiler.VirtualFile; diff --git a/autograder-core/src/main/java/de/firemage/autograder/core/file/UploadedFile.java b/autograder-core/src/main/java/de/firemage/autograder/core/file/UploadedFile.java index 1343e155..0bcd204c 100644 --- a/autograder-core/src/main/java/de/firemage/autograder/core/file/UploadedFile.java +++ b/autograder-core/src/main/java/de/firemage/autograder/core/file/UploadedFile.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.compiler.CompilationFailureException; import de.firemage.autograder.core.compiler.CompilationResult; import de.firemage.autograder.core.compiler.Compiler; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.integrated.ModelBuildException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/CheckTest.java b/autograder-core/src/test/java/de/firemage/autograder/core/CheckTest.java index 91340ce0..8c95da5b 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/CheckTest.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/CheckTest.java @@ -1,6 +1,7 @@ package de.firemage.autograder.core; import de.firemage.autograder.core.check.Check; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import de.firemage.autograder.core.file.UploadedFile; import org.junit.jupiter.api.DynamicTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/TestMergedProblems.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/TestMergedProblems.java index 469b57d9..e67f1455 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/TestMergedProblems.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/TestMergedProblems.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestAvoidStringConcat.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestAvoidStringConcat.java index 0046af7f..aa37f542 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestAvoidStringConcat.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestAvoidStringConcat.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCharRange.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCharRange.java index 235e3e24..27f585e9 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCharRange.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCharRange.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCheckIterableDuplicates.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCheckIterableDuplicates.java index c9dc9443..98ed0640 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCheckIterableDuplicates.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCheckIterableDuplicates.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java index a1b9c6ae..f9528854 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionAddAll.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionsNCopies.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionsNCopies.java index f28dd936..698dfdb5 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionsNCopies.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestCollectionsNCopies.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestImplementComparable.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestImplementComparable.java index 8affbb32..02624085 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestImplementComparable.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestImplementComparable.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestIsEmptyReimplementationCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestIsEmptyReimplementationCheck.java index 2eed88f9..760a1580 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestIsEmptyReimplementationCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestIsEmptyReimplementationCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestMathReimplementation.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestMathReimplementation.java index 1db2bb1b..b760ac8c 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestMathReimplementation.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestMathReimplementation.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestSimplifyArraysFill.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestSimplifyArraysFill.java index 0f7fbe75..737e9470 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestSimplifyArraysFill.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestSimplifyArraysFill.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestStringRepeat.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestStringRepeat.java index 0e90234e..e294d5b0 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestStringRepeat.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestStringRepeat.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArrayCopy.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArrayCopy.java index 21da79e5..f60ada61 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArrayCopy.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArrayCopy.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArraysFill.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArraysFill.java index 75cb3a71..e8467b2d 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArraysFill.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseArraysFill.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseEnumValues.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseEnumValues.java index bbf52b7f..1c810d77 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseEnumValues.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseEnumValues.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseFormatString.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseFormatString.java index cd683bdc..711df45a 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseFormatString.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseFormatString.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseModuloOperator.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseModuloOperator.java index 3901398b..167854d6 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseModuloOperator.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseModuloOperator.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseStringFormatted.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseStringFormatted.java index fbbb5c87..995a029e 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseStringFormatted.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseStringFormatted.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseSubList.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseSubList.java index 38ee04b7..42ae61b4 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseSubList.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/api/TestUseSubList.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestCommentedOutCodeCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestCommentedOutCodeCheck.java index ce551779..d370b8f7 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestCommentedOutCodeCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestCommentedOutCodeCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestFieldJavadocCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestFieldJavadocCheck.java index 51ca6cbd..15843ae6 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestFieldJavadocCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestFieldJavadocCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.SourceInfo; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestMethodJavadocCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestMethodJavadocCheck.java index 2b03ae91..acb81238 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestMethodJavadocCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestMethodJavadocCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.SourceInfo; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestUnnecessaryComment.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestUnnecessaryComment.java index 1231735e..1bffab33 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestUnnecessaryComment.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/comment/TestUnnecessaryComment.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestExtendsObjectCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestExtendsObjectCheck.java index 8e3b6773..6812ebd8 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestExtendsObjectCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestExtendsObjectCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantAssignment.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantAssignment.java index 772f238a..41210ee6 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantAssignment.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantAssignment.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantConstructor.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantConstructor.java index d0dd2462..2ad3627a 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantConstructor.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantConstructor.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.SourceInfo; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantElse.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantElse.java index b05933e8..c8b569d7 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantElse.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantElse.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantIfForBooleanCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantIfForBooleanCheck.java index fdc0a0b3..46642ba7 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantIfForBooleanCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantIfForBooleanCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantModifier.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantModifier.java index e97444d0..84282892 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantModifier.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantModifier.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantNegationCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantNegationCheck.java index cc511c2a..59fcb6e5 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantNegationCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantNegationCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantUninitializedVariable.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantUninitializedVariable.java index 1b33c304..8dabc6db 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantUninitializedVariable.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantUninitializedVariable.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantVariable.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantVariable.java index 018158e2..b5f3c0b9 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantVariable.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRedundantVariable.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRepeatedMathOperationCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRepeatedMathOperationCheck.java index ca035785..2d00521a 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRepeatedMathOperationCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestRepeatedMathOperationCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTooManyExceptions.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTooManyExceptions.java index e133891d..0eb33df2 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTooManyExceptions.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTooManyExceptions.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTryCatchComplexity.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTryCatchComplexity.java index 5384a450..46aa96f5 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTryCatchComplexity.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestTryCatchComplexity.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnnecessaryBoxing.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnnecessaryBoxing.java index b8b46eee..cd4520f8 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnnecessaryBoxing.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnnecessaryBoxing.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnusedImport.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnusedImport.java index f0cec51c..4156ee61 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnusedImport.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestUnusedImport.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestWrapperInstantiationCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestWrapperInstantiationCheck.java index bee8bcf0..0f60ca57 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestWrapperInstantiationCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/complexity/TestWrapperInstantiationCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestCustomExceptionInheritanceCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestCustomExceptionInheritanceCheck.java index 175df089..24032cb6 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestCustomExceptionInheritanceCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestCustomExceptionInheritanceCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestExceptionMessageCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestExceptionMessageCheck.java index 01570c85..4790f1ec 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestExceptionMessageCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestExceptionMessageCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestNumberFormatExceptionIgnored.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestNumberFormatExceptionIgnored.java index 4b225841..22302c6b 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestNumberFormatExceptionIgnored.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/exceptions/TestNumberFormatExceptionIgnored.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestAvoidShadowing.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestAvoidShadowing.java index d1577ca6..e611d4b9 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestAvoidShadowing.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestAvoidShadowing.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestCompareCharValue.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestCompareCharValue.java index afbe0911..03cc0bf3 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestCompareCharValue.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestCompareCharValue.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestFieldShouldBeFinal.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestFieldShouldBeFinal.java index d73aba3a..88f152bd 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestFieldShouldBeFinal.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestFieldShouldBeFinal.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestForToForEachLoop.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestForToForEachLoop.java index c2ae4c2b..f5483312 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestForToForEachLoop.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestForToForEachLoop.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java index 6a9aa75c..c87f00cb 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestImportTypes.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeDoWhile.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeDoWhile.java index 590d266a..7ba1820d 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeDoWhile.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeDoWhile.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeFor.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeFor.java index 1d665931..4d0eace6 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeFor.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestLoopShouldBeFor.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestMagicString.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestMagicString.java index 76c39fe0..e83275e3 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestMagicString.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestMagicString.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestObjectDatatype.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestObjectDatatype.java index e749dda8..17d25330 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestObjectDatatype.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestObjectDatatype.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestOverrideAnnotationMissing.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestOverrideAnnotationMissing.java index c3078be1..62ca6e0f 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestOverrideAnnotationMissing.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestOverrideAnnotationMissing.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestReassignedParameterCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestReassignedParameterCheck.java index 5237c15c..cc6e4ff0 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestReassignedParameterCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestReassignedParameterCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestUseDifferentVisibility.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestUseDifferentVisibility.java index 9a8af365..0dbaef3f 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestUseDifferentVisibility.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/general/TestUseDifferentVisibility.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/naming/TestPackageNamingConvention.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/naming/TestPackageNamingConvention.java index ad5461b2..8a868d43 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/naming/TestPackageNamingConvention.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/naming/TestPackageNamingConvention.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestClosedSetOfValues.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestClosedSetOfValues.java index c989a812..30329ee7 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestClosedSetOfValues.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestClosedSetOfValues.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestConcreteCollectionCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestConcreteCollectionCheck.java index a2c0bd02..3bb0e848 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestConcreteCollectionCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestConcreteCollectionCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestIOUISeparation.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestIOUISeparation.java index 8cc3057e..948c4f80 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestIOUISeparation.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestIOUISeparation.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestLeakedCollectionCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestLeakedCollectionCheck.java index 977706e1..3068a4c3 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestLeakedCollectionCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestLeakedCollectionCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestMethodShouldBeStatic.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestMethodShouldBeStatic.java index bf10daef..cdc5513b 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestMethodShouldBeStatic.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestMethodShouldBeStatic.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticBlock.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticBlock.java index bf166a21..a47d49c8 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticBlock.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticBlock.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticFieldShouldBeInstanceCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticFieldShouldBeInstanceCheck.java index ada335f0..ee0e74e3 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticFieldShouldBeInstanceCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/oop/TestStaticFieldShouldBeInstanceCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDefaultPackageCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDefaultPackageCheck.java index e866f612..4d57c5fd 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDefaultPackageCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDefaultPackageCheck.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDuplicateCode.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDuplicateCode.java index 70707ef1..3b23398f 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDuplicateCode.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestDuplicateCode.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestTooFewPackagesCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestTooFewPackagesCheck.java index 85c5db58..9cf3d7bd 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestTooFewPackagesCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/structure/TestTooFewPackagesCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/check/unnecessary/TestUnusedCodeElementCheck.java b/autograder-core/src/test/java/de/firemage/autograder/core/check/unnecessary/TestUnusedCodeElementCheck.java index 008b083d..5debecee 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/check/unnecessary/TestUnusedCodeElementCheck.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/check/unnecessary/TestUnusedCodeElementCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/file/TestFileSourceInfo.java b/autograder-core/src/test/java/de/firemage/autograder/core/file/TestFileSourceInfo.java index 7b070488..ca5e6c8f 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/file/TestFileSourceInfo.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/file/TestFileSourceInfo.java @@ -1,6 +1,6 @@ package de.firemage.autograder.core.file; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/framework/TestInput.java b/autograder-core/src/test/java/de/firemage/autograder/core/framework/TestInput.java index 463ebe61..d073c366 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/framework/TestInput.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/framework/TestInput.java @@ -1,7 +1,7 @@ package de.firemage.autograder.core.framework; import de.firemage.autograder.core.ProblemType; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.SourceInfo; import de.firemage.autograder.core.file.SourcePath; import de.firemage.autograder.core.file.StringSourceInfo; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/integrated/MethodHierarchyTest.java b/autograder-core/src/test/java/de/firemage/autograder/core/integrated/MethodHierarchyTest.java index b7d31756..0e4894a1 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/integrated/MethodHierarchyTest.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/integrated/MethodHierarchyTest.java @@ -2,7 +2,7 @@ import de.firemage.autograder.core.CodeModel; import de.firemage.autograder.core.LinterException; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import de.firemage.autograder.core.file.SourceInfo; import de.firemage.autograder.core.file.StringSourceInfo; diff --git a/autograder-core/src/test/java/de/firemage/autograder/core/integrated/structure/TestStructuralEqualsVisitor.java b/autograder-core/src/test/java/de/firemage/autograder/core/integrated/structure/TestStructuralEqualsVisitor.java index fcb3f70c..364d424b 100644 --- a/autograder-core/src/test/java/de/firemage/autograder/core/integrated/structure/TestStructuralEqualsVisitor.java +++ b/autograder-core/src/test/java/de/firemage/autograder/core/integrated/structure/TestStructuralEqualsVisitor.java @@ -1,10 +1,9 @@ package de.firemage.autograder.core.integrated.structure; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.file.UploadedFile; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import spoon.reflect.CtModel; @@ -59,7 +58,7 @@ private static void checkStructurallyEqual(CtElement left, CtElement right, CtRo )); } else { assertFalse(isEqual, "\"%s\" == \"%s\"".formatted(left, right)); - Assertions.assertEquals(mismatch, visitor.getNotEqualRole()); + assertEquals(mismatch, visitor.getNotEqualRole()); } } diff --git a/autograder-extra/src/main/java/de/firemage/autograder/extra/errorprone/ErrorProneCompiler.java b/autograder-extra/src/main/java/de/firemage/autograder/extra/errorprone/ErrorProneCompiler.java index f97ef5e6..c6697094 100644 --- a/autograder-extra/src/main/java/de/firemage/autograder/extra/errorprone/ErrorProneCompiler.java +++ b/autograder-extra/src/main/java/de/firemage/autograder/extra/errorprone/ErrorProneCompiler.java @@ -2,7 +2,7 @@ import de.firemage.autograder.core.file.CompilationUnit; import de.firemage.autograder.core.file.SourceInfo; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.TempLocation; import javax.tools.DiagnosticCollector; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/TestLocalizedStrings.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/TestLocalizedStrings.java index 51fff9dc..b432a7ce 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/TestLocalizedStrings.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/TestLocalizedStrings.java @@ -1,7 +1,7 @@ package de.firemage.autograder.extra.check; import de.firemage.autograder.core.Linter; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.integrated.SpoonUtil; import de.firemage.autograder.extra.check.naming.LinguisticNamingCheck; import de.firemage.autograder.extra.check.naming.VariablesHaveDescriptiveNamesCheck; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/api/TestProblematicEqualsHashCodeComparable.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/api/TestProblematicEqualsHashCodeComparable.java index afaf97de..22f5469e 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/api/TestProblematicEqualsHashCodeComparable.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/api/TestProblematicEqualsHashCodeComparable.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestDiamondOperatorCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestDiamondOperatorCheck.java index a25f2a87..d8a0f8f3 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestDiamondOperatorCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestDiamondOperatorCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRedundantReturnCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRedundantReturnCheck.java index 8a833cc2..dd05cd9b 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRedundantReturnCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRedundantReturnCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRegexCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRegexCheck.java index d4476d74..2e484862 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRegexCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/complexity/TestRegexCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestConstantNamingAndQualifierCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestConstantNamingAndQualifierCheck.java index 02f0ae07..c9790341 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestConstantNamingAndQualifierCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestConstantNamingAndQualifierCheck.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestDoubleBraceInitializationCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestDoubleBraceInitializationCheck.java index 505e9aaa..91599878 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestDoubleBraceInitializationCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestDoubleBraceInitializationCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestUseDifferentVisibility.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestUseDifferentVisibility.java index cd13cffd..aeff1ccf 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestUseDifferentVisibility.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/general/TestUseDifferentVisibility.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestLinguisticNamingCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestLinguisticNamingCheck.java index 10149e69..c10dccd7 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestLinguisticNamingCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestLinguisticNamingCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestVariablesHaveDescriptiveNamesCheck.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestVariablesHaveDescriptiveNamesCheck.java index b75dd115..bf9f55f5 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestVariablesHaveDescriptiveNamesCheck.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/naming/TestVariablesHaveDescriptiveNamesCheck.java @@ -5,7 +5,7 @@ import de.firemage.autograder.core.Problem; import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import de.firemage.autograder.core.file.StringSourceInfo; import org.junit.jupiter.api.Test; diff --git a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/oop/TestInheritanceBadPractices.java b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/oop/TestInheritanceBadPractices.java index 5abfa0c4..a45a39ac 100644 --- a/autograder-extra/src/test/java/de/firemage/autograder/extra/check/oop/TestInheritanceBadPractices.java +++ b/autograder-extra/src/test/java/de/firemage/autograder/extra/check/oop/TestInheritanceBadPractices.java @@ -6,7 +6,7 @@ import de.firemage.autograder.core.ProblemType; import de.firemage.autograder.core.file.StringSourceInfo; import de.firemage.autograder.core.check.AbstractCheckTest; -import de.firemage.autograder.core.JavaVersion; +import de.firemage.autograder.core.compiler.JavaVersion; import org.junit.jupiter.api.Test; import java.io.IOException;