From d88a3c50fe916497550ccfe772abbf5d249e6594 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 4 Apr 2024 10:46:05 +0200 Subject: [PATCH] Fix checkstyle config and checkstyle issues --- .../java/net/sourceforge/pmd/ant/CPDTaskTest.java | 1 - .../pmd/lang/apex/QuickstartRulesetTest.java | 2 +- .../pmd/lang/apex/cpd/ApexCpdLexerTest.java | 2 +- .../pmd/lang/coco/cpd/CocoCpdLexerTest.java | 2 +- .../sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java | 2 +- .../sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java | 2 +- .../pmd/lang/html/ast/HtmlParsingHelper.java | 2 +- .../pmd/lang/html/cpd/HtmlCpdLexerTest.java | 2 +- .../JUnitTestContainsTooManyAssertsRule.java | 7 +++---- .../JUnitTestsShouldIncludeAssertRule.java | 6 +++--- .../pmd/lang/java/rule/design/LawOfDemeterRule.java | 2 +- .../pmd/lang/java/JavaAttributesPrinter.java | 2 +- .../sourceforge/pmd/lang/java/JavaParsingHelper.java | 2 +- .../pmd/lang/java/LanguageVersionTest.java | 2 +- .../pmd/lang/java/QuickstartRulesetTest.java | 2 +- .../sourceforge/pmd/lang/java/ast/JDKVersionTest.java | 2 +- .../pmd/lang/java/ast/Java14TreeDumpTest.java | 2 +- .../pmd/lang/java/ast/Java15TreeDumpTest.java | 2 +- .../pmd/lang/java/ast/Java16TreeDumpTest.java | 2 +- .../pmd/lang/java/ast/Java17TreeDumpTest.java | 2 +- .../pmd/lang/java/ast/Java9TreeDumpTest.java | 2 +- .../pmd/lang/java/ast/ParserCornersTest.java | 2 +- .../pmd/lang/java/cpd/JavaCpdLexerTest.java | 4 ++-- .../JUnit4TestShouldUseAfterAnnotationTest.java | 1 + .../JUnit4TestShouldUseBeforeAnnotationTest.java | 1 + .../java/rule/internal/TestFrameworksUtilTest.java | 11 ++++++++--- .../pmd/lang/java/types/TypesTreeDumpTest.java | 6 +++--- .../pmd/lang/ecmascript/ast/EcmascriptParser.java | 1 - .../pmd/lang/ecmascript/ast/JsParsingHelper.java | 2 +- .../ecmascript/cpd/AnyCpdLexerForTypescriptTest.java | 2 +- .../lang/ecmascript/cpd/EcmascriptCpdLexerTest.java | 2 +- .../pmd/lang/jsp/ast/JspParsingHelper.java | 2 +- .../sourceforge/pmd/lang/jsp/cpd/JspCpdLexerTest.java | 2 +- .../pmd/lang/julia/cpd/JuliaCpdLexerTest.java | 2 +- .../pmd/lang/kotlin/ast/KotlinNameDictionary.java | 1 - .../pmd/lang/kotlin/ast/KotlinParsingHelper.java | 2 +- .../pmd/lang/modelica/ModelicaParsingHelper.java | 2 +- .../pmd/lang/plsql/PlsqlParsingHelper.java | 2 +- .../plsql/ast/ExecuteImmediateBulkCollectTest.java | 2 +- .../pmd/lang/plsql/ast/ParenthesisGroupTest.java | 2 +- .../pmd/lang/plsql/ast/PlsqlTreeDumpTest.java | 2 +- .../pmd/lang/plsql/cpd/PLSQLCpdLexerTest.java | 2 +- .../pmd/lang/scala/ScalaLanguageModule.java | 2 +- .../pmd/lang/scala/ast/ScalaParsingHelper.java | 2 +- .../pmd/lang/swift/ast/SwiftParsingHelper.java | 2 +- .../pmd/lang/swift/cpd/SwiftCpdLexerTest.java | 2 +- pmd-velocity/pmd-velocity-checkstyle-suppressions.xml | 4 ++-- .../pmd/lang/visualforce/LanguageVersionTest.java | 2 +- .../sourceforge/pmd/lang/xml/LanguageVersionTest.java | 2 +- pom.xml | 2 +- 50 files changed, 62 insertions(+), 59 deletions(-) diff --git a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java index 9bb924312d..79b50a0dee 100644 --- a/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java +++ b/pmd-ant/src/test/java/net/sourceforge/pmd/ant/CPDTaskTest.java @@ -8,7 +8,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java index b34849d528..dcde511529 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java @@ -9,9 +9,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import net.sourceforge.pmd.lang.rule.RuleSet; import net.sourceforge.pmd.lang.rule.RuleSetLoader; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import com.github.stefanbirkner.systemlambda.SystemLambda; diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexCpdLexerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexCpdLexerTest.java index c93950ac81..67c1da6555 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexCpdLexerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.apex.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class ApexCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-coco/src/test/java/net/sourceforge/pmd/lang/coco/cpd/CocoCpdLexerTest.java b/pmd-coco/src/test/java/net/sourceforge/pmd/lang/coco/cpd/CocoCpdLexerTest.java index 4804e2952a..97e1f4d7dc 100644 --- a/pmd-coco/src/test/java/net/sourceforge/pmd/lang/coco/cpd/CocoCpdLexerTest.java +++ b/pmd-coco/src/test/java/net/sourceforge/pmd/lang/coco/cpd/CocoCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.coco.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.coco.CocoLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class CocoCpdLexerTest extends CpdTextComparisonTest { CocoCpdLexerTest() { diff --git a/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java index e092b479f0..805bb9a86d 100644 --- a/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java +++ b/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java @@ -12,9 +12,9 @@ import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.CpdLanguageProperties; import net.sourceforge.pmd.cpd.CpdLexer; import net.sourceforge.pmd.cpd.Tokens; +import net.sourceforge.pmd.lang.cpp.CppLanguageModule; import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig; -import net.sourceforge.pmd.lang.cpp.CppLanguageModule; class CppCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java b/pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java index 936e5c7b45..6e4dfb0c7c 100644 --- a/pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java +++ b/pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java @@ -10,9 +10,9 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.CpdLanguageProperties; +import net.sourceforge.pmd.lang.ast.LexException; import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig; -import net.sourceforge.pmd.lang.ast.LexException; class CsCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java index a916551648..531577d920 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.lang.html.ast; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.html.HtmlLanguageModule; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public final class HtmlParsingHelper extends BaseParsingHelper { diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/cpd/HtmlCpdLexerTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/cpd/HtmlCpdLexerTest.java index 63bc1a03dd..04db5c6152 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/cpd/HtmlCpdLexerTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/cpd/HtmlCpdLexerTest.java @@ -7,8 +7,8 @@ package net.sourceforge.pmd.lang.html.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.html.HtmlLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class HtmlCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsRule.java index 9802718f18..e68ac3e9ac 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsRule.java @@ -4,6 +4,9 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; +import java.util.Set; +import java.util.stream.Collectors; + import net.sourceforge.pmd.lang.java.ast.ASTBlock; import net.sourceforge.pmd.lang.java.ast.ASTMethodCall; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; @@ -13,10 +16,6 @@ import net.sourceforge.pmd.properties.NumericConstraints; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - public class JUnitTestContainsTooManyAssertsRule extends AbstractJavaRulechainRule { private static final PropertyDescriptor MAX_ASSERTS = diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java index 02fda936ca..b5bf29134b 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertRule.java @@ -4,6 +4,9 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; +import java.util.Set; +import java.util.stream.Collectors; + import net.sourceforge.pmd.lang.java.ast.ASTBlock; import net.sourceforge.pmd.lang.java.ast.ASTMethodCall; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; @@ -12,9 +15,6 @@ import net.sourceforge.pmd.lang.java.rule.internal.TestFrameworksUtil; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; -import java.util.Set; -import java.util.stream.Collectors; - public class JUnitTestsShouldIncludeAssertRule extends AbstractJavaRulechainRule { private static final PropertyDescriptor> EXTRA_ASSERT_METHOD_NAMES = diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java index 106ba0314e..c3907702b9 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterRule.java @@ -55,8 +55,8 @@ import net.sourceforge.pmd.lang.java.types.TypeOps; import net.sourceforge.pmd.lang.java.types.TypeTestUtil; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.properties.PropertyFactory; -import net.sourceforge.pmd.util.OptionalBool; import net.sourceforge.pmd.reporting.RuleContext; +import net.sourceforge.pmd.util.OptionalBool; /** * This rule can detect possible violations of the Law of Demeter. The Law of diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java index fee672333d..8a7466118b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java @@ -11,13 +11,13 @@ import java.util.stream.Collectors; import org.checkerframework.checker.nullness.qual.NonNull; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; import net.sourceforge.pmd.lang.java.ast.ASTExpression; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTModifierList; import net.sourceforge.pmd.lang.java.ast.JModifier; import net.sourceforge.pmd.lang.java.ast.ModifierOwner; import net.sourceforge.pmd.lang.rule.xpath.Attribute; +import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; /** * Special tweak to remove deprecated attributes of {@link ModifierOwner} diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java index c5bcd3332e..5daedf1389 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java @@ -24,7 +24,6 @@ import net.sourceforge.pmd.lang.LanguageProcessor; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.SemanticErrorReporter; import net.sourceforge.pmd.lang.ast.SemanticException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.JavaParser; import net.sourceforge.pmd.lang.java.internal.JavaAstProcessor; @@ -33,6 +32,7 @@ import net.sourceforge.pmd.lang.java.types.TypeSystem; import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger; import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.SimpleLogger; import net.sourceforge.pmd.lang.java.types.internal.infer.TypeInferenceLogger.VerboseLogger; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.util.log.PmdReporter; import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java index 59d784aeec..58e66b93ea 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java @@ -10,8 +10,8 @@ import static net.sourceforge.pmd.test.AbstractLanguageVersionTest.TestDescripto import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.Language; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java index 5fa5b76c2a..15e89221e7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java @@ -9,9 +9,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import net.sourceforge.pmd.lang.rule.RuleSet; import net.sourceforge.pmd.lang.rule.RuleSetLoader; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import com.github.stefanbirkner.systemlambda.SystemLambda; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java index 44516d5d53..1d8b8459b6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JDKVersionTest.java @@ -16,9 +16,9 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class JDKVersionTest extends BaseJavaTreeDumpTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14TreeDumpTest.java index 0e75ba10c1..edddfaa6c6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14TreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14TreeDumpTest.java @@ -11,9 +11,9 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; /** * Tests new java14 standard features. diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java15TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java15TreeDumpTest.java index c8ed83bde6..28354890f8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java15TreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java15TreeDumpTest.java @@ -9,9 +9,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class Java15TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java15 = diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java16TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java16TreeDumpTest.java index 16324eef76..7eb809d001 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java16TreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java16TreeDumpTest.java @@ -18,11 +18,11 @@ import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.NodeStream; import net.sourceforge.pmd.lang.ast.ParseException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.symbols.JElementSymbol; import net.sourceforge.pmd.lang.java.types.JPrimitiveType; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class Java16TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java16 = diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java17TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java17TreeDumpTest.java index e27c306f8e..cdfa661c90 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java17TreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java17TreeDumpTest.java @@ -10,9 +10,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class Java17TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java17 = diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java index b29dab3f0a..a015033f1f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java9TreeDumpTest.java @@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.java.ast; import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class Java9TreeDumpTest extends BaseJavaTreeDumpTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java index 69f4fd13b7..826c2b4a74 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java @@ -20,12 +20,12 @@ import org.junit.jupiter.api.Timeout; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.impl.javacc.MalformedSourceException; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.document.FileId; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr; import net.sourceforge.pmd.lang.java.types.AstTestUtil; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; class ParserCornersTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java = JavaParsingHelper.DEFAULT.withResourceContext(getClass()); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/cpd/JavaCpdLexerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/cpd/JavaCpdLexerTest.java index 935b7c6b3c..b81820add1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/cpd/JavaCpdLexerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/cpd/JavaCpdLexerTest.java @@ -12,12 +12,12 @@ import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.CpdLanguageProperties; import net.sourceforge.pmd.cpd.CpdLexer; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; -import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig; import net.sourceforge.pmd.lang.ast.LexException; import net.sourceforge.pmd.lang.document.FileId; import net.sourceforge.pmd.lang.document.TextDocument; import net.sourceforge.pmd.lang.java.JavaLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; +import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig; class JavaCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseAfterAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseAfterAnnotationTest.java index 3f18cd195b..2ea2b290d2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseAfterAnnotationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseAfterAnnotationTest.java @@ -17,6 +17,7 @@ class JUnit4TestShouldUseAfterAnnotationTest extends PmdRuleTst { public void setUp() { // A setup code } + @After public void tearDown() { // A tear down code diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseBeforeAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseBeforeAnnotationTest.java index e6d1cb9700..6922491f02 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseBeforeAnnotationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseBeforeAnnotationTest.java @@ -17,6 +17,7 @@ class JUnit4TestShouldUseBeforeAnnotationTest extends PmdRuleTst { public void setUp() { // A setup code } + @After public void tearDown() { // A tear down code diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtilTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtilTest.java index 1f83662144..de4ee0a488 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtilTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/TestFrameworksUtilTest.java @@ -1,11 +1,16 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + package net.sourceforge.pmd.lang.java.rule.internal; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTMethodCall; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; class TestFrameworksUtilTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypesTreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypesTreeDumpTest.java index d85783803c..6827cc2a92 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypesTreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypesTreeDumpTest.java @@ -10,9 +10,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; -import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest; -import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; @@ -20,6 +17,9 @@ import net.sourceforge.pmd.lang.java.ast.ASTVariableId; import net.sourceforge.pmd.lang.java.ast.InvocationNode; import net.sourceforge.pmd.lang.java.ast.TypeNode; import net.sourceforge.pmd.lang.rule.xpath.Attribute; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; +import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest; +import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; /** * diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java index 6d2627eb92..eed4134d53 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParser.java @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Predicate; import java.util.stream.Collectors; import org.mozilla.javascript.CompilerEnvirons; diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java index 5fbc2a573d..74ca07591f 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsParsingHelper.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public final class JsParsingHelper extends BaseParsingHelper { diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/AnyCpdLexerForTypescriptTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/AnyCpdLexerForTypescriptTest.java index b7d8f05d88..96f87837e3 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/AnyCpdLexerForTypescriptTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/AnyCpdLexerForTypescriptTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.ecmascript.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; /** * diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptCpdLexerTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptCpdLexerTest.java index 35d420cdb3..71f234c947 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptCpdLexerTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/cpd/EcmascriptCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.ecmascript.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java index 83f7c1b6c9..a41f150d32 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspParsingHelper.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.lang.jsp.ast; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.jsp.JspLanguageModule; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public final class JspParsingHelper extends BaseParsingHelper { diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/cpd/JspCpdLexerTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/cpd/JspCpdLexerTest.java index 430e414a08..f753396fee 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/cpd/JspCpdLexerTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/cpd/JspCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.jsp.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.jsp.JspLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class JspCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-julia/src/test/java/net/sourceforge/pmd/lang/julia/cpd/JuliaCpdLexerTest.java b/pmd-julia/src/test/java/net/sourceforge/pmd/lang/julia/cpd/JuliaCpdLexerTest.java index bd0c16ff58..72fe0b9819 100644 --- a/pmd-julia/src/test/java/net/sourceforge/pmd/lang/julia/cpd/JuliaCpdLexerTest.java +++ b/pmd-julia/src/test/java/net/sourceforge/pmd/lang/julia/cpd/JuliaCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.julia.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.julia.JuliaLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class JuliaCpdLexerTest extends CpdTextComparisonTest { JuliaCpdLexerTest() { diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinNameDictionary.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinNameDictionary.java index d1a0a1313e..66689f415b 100644 --- a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinNameDictionary.java +++ b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinNameDictionary.java @@ -5,7 +5,6 @@ package net.sourceforge.pmd.lang.kotlin.ast; import org.antlr.v4.runtime.Vocabulary; -import org.checkerframework.checker.nullness.qual.Nullable; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrNameDictionary; diff --git a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinParsingHelper.java b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinParsingHelper.java index ff1ceb7d2a..e71e80ff13 100644 --- a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinParsingHelper.java +++ b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/ast/KotlinParsingHelper.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.kotlin.ast; import org.jetbrains.annotations.NotNull; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.kotlin.KotlinLanguageModule; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; /** * diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java index 1a9eb5c2fb..f3e5336902 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/ModelicaParsingHelper.java @@ -5,8 +5,8 @@ package net.sourceforge.pmd.lang.modelica; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.modelica.ast.ASTStoredDefinition; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public class ModelicaParsingHelper extends BaseParsingHelper { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java index 98ac1dec59..ad5a12313a 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/PlsqlParsingHelper.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.lang.plsql; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.plsql.ast.ASTInput; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public class PlsqlParsingHelper extends BaseParsingHelper { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java index 004a4eb830..6620445667 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ExecuteImmediateBulkCollectTest.java @@ -6,10 +6,10 @@ package net.sourceforge.pmd.lang.plsql.ast; import org.junit.jupiter.api.Test; +import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest; import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; -import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; class ExecuteImmediateBulkCollectTest extends BaseTreeDumpTest { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java index 1f058b7436..863189b4aa 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/ParenthesisGroupTest.java @@ -6,10 +6,10 @@ package net.sourceforge.pmd.lang.plsql.ast; import org.junit.jupiter.api.Test; +import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest; import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; -import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; class ParenthesisGroupTest extends BaseTreeDumpTest { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java index 3756f76abc..438184c677 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/ast/PlsqlTreeDumpTest.java @@ -6,10 +6,10 @@ package net.sourceforge.pmd.lang.plsql.ast; import org.junit.jupiter.api.Test; +import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest; import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter; -import net.sourceforge.pmd.lang.plsql.PlsqlParsingHelper; class PlsqlTreeDumpTest extends BaseTreeDumpTest { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLCpdLexerTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLCpdLexerTest.java index 777d48d8ca..7ed450b959 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLCpdLexerTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/cpd/PLSQLCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.plsql.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class PLSQLCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java index 2df08f131b..3f29f2a86d 100644 --- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ScalaLanguageModule.java @@ -5,10 +5,10 @@ package net.sourceforge.pmd.lang.scala; import net.sourceforge.pmd.cpd.CpdLexer; -import net.sourceforge.pmd.lang.scala.cpd.ScalaCpdLexer; import net.sourceforge.pmd.lang.LanguagePropertyBundle; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase; +import net.sourceforge.pmd.lang.scala.cpd.ScalaCpdLexer; /** * Language Module for Scala. diff --git a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java index 685d14c435..68f5a532af 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java +++ b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/ast/ScalaParsingHelper.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.lang.scala.ast; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.scala.ScalaLanguageModule; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public final class ScalaParsingHelper extends BaseParsingHelper { diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/ast/SwiftParsingHelper.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/ast/SwiftParsingHelper.java index efbf253913..0c69d405e0 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/ast/SwiftParsingHelper.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/ast/SwiftParsingHelper.java @@ -6,9 +6,9 @@ package net.sourceforge.pmd.lang.swift.ast; import org.checkerframework.checker.nullness.qual.NonNull; -import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; import net.sourceforge.pmd.lang.swift.SwiftLanguageModule; import net.sourceforge.pmd.lang.swift.ast.SwiftParser.SwTopLevel; +import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper; public class SwiftParsingHelper extends BaseParsingHelper { diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/cpd/SwiftCpdLexerTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/cpd/SwiftCpdLexerTest.java index fa9b0bca5e..03385bf136 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/cpd/SwiftCpdLexerTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/cpd/SwiftCpdLexerTest.java @@ -6,8 +6,8 @@ package net.sourceforge.pmd.lang.swift.cpd; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; import net.sourceforge.pmd.lang.swift.SwiftLanguageModule; +import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest; class SwiftCpdLexerTest extends CpdTextComparisonTest { diff --git a/pmd-velocity/pmd-velocity-checkstyle-suppressions.xml b/pmd-velocity/pmd-velocity-checkstyle-suppressions.xml index 2a19a99af3..2c0564940f 100644 --- a/pmd-velocity/pmd-velocity-checkstyle-suppressions.xml +++ b/pmd-velocity/pmd-velocity-checkstyle-suppressions.xml @@ -6,5 +6,5 @@ - - \ No newline at end of file + + diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/visualforce/LanguageVersionTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/visualforce/LanguageVersionTest.java index 42742da5be..9c98b4d64e 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/visualforce/LanguageVersionTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/visualforce/LanguageVersionTest.java @@ -7,8 +7,8 @@ package net.sourceforge.pmd.lang.visualforce; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java index 0a4bfe7f68..e0bc29110d 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java @@ -7,10 +7,10 @@ package net.sourceforge.pmd.lang.xml; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.xml.pom.PomLanguageModule; import net.sourceforge.pmd.lang.xml.wsdl.WsdlLanguageModule; import net.sourceforge.pmd.lang.xml.xsl.XslLanguageModule; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pom.xml b/pom.xml index a8ada19e64..44ae6e699f 100644 --- a/pom.xml +++ b/pom.xml @@ -475,7 +475,7 @@ /net/sourceforge/pmd/pmd-checkstyle-suppressions.xml true true - **/.java,**/*.kt + **/*.java,**/*.kt **/*.properties,**/*.less