From d2bc0f37390567444d033e3ba38e745aac6b77ce Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 3 Dec 2016 11:31:01 +0100 Subject: [PATCH] Checkstyle fixes --- .../net/sourceforge/pmd/PMDConfiguration.java | 2 +- .../net/sourceforge/pmd/RuleSetFactory.java | 2 +- .../pmd/benchmark/Benchmarker.java | 1 - .../pmd/cache/AbstractAnalysisCache.java | 3 +- .../sourceforge/pmd/cache/AnalysisCache.java | 3 +- .../sourceforge/pmd/cache/AnalysisResult.java | 3 +- .../pmd/cache/FileAnalysisCache.java | 5 ++- .../pmd/cache/NoopAnalysisCache.java | 1 + .../pmd/processor/MultiThreadProcessor.java | 2 +- .../net/sourceforge/pmd/FileSelectorTest.java | 7 ++-- .../pmd/cache/FileAnalysisCacheTest.java | 1 + .../pmd/jaxen/MatchesFunctionTest.java | 5 ++- .../AbstractPropertyDescriptorTester.java | 3 ++ .../pmd/properties/BooleanPropertyTest.java | 3 ++ .../pmd/properties/CharacterPropertyTest.java | 3 ++ .../pmd/properties/DoublePropertyTest.java | 3 ++ .../properties/EnumeratedPropertyTest.java | 3 ++ .../pmd/properties/FloatPropertyTest.java | 3 ++ .../pmd/properties/IntegerPropertyTest.java | 3 ++ .../pmd/properties/MethodPropertyTest.java | 3 ++ .../NonRuleWithAllPropertyTypes.java | 3 ++ .../pmd/properties/StringPropertyTest.java | 3 ++ .../pmd/properties/TypePropertyTest.java | 3 ++ .../pmd/renderers/EmacsRendererTest.java | 7 ++-- .../pmd/renderers/HTMLRendererTest.java | 7 ++-- .../pmd/renderers/IDEAJRendererTest.java | 7 ++-- .../pmd/renderers/TextRendererTest.java | 7 ++-- .../pmd/renderers/VBHTMLRendererTest.java | 3 ++ .../pmd/renderers/YAHTMLRendererTest.java | 7 ++-- .../net/sourceforge/pmd/stat/MetricTest.java | 7 ++-- .../pmd/stat/MockStatisticalRule.java | 3 ++ .../net/sourceforge/pmd/stat/StatTests.java | 3 ++ .../pmd/stat/StatisticalRuleTest.java | 7 ++-- .../net/sourceforge/pmd/util/TypeMapTest.java | 11 ++---- .../UnnecessaryFullyQualifiedNameRule.java | 2 +- .../pmd/LanguageVersionDiscovererTest.java | 9 ++--- .../pmd/lang/java/ast/ASTAnnotationTest.java | 3 ++ .../lang/java/ast/ASTBlockStatementTest.java | 7 ++-- .../lang/java/ast/ASTBooleanLiteralTest.java | 3 ++ .../java/ast/ASTFieldDeclarationTest.java | 7 ++-- .../lang/java/ast/ASTFormalParameterTest.java | 3 ++ .../pmd/lang/java/ast/ASTInitializerTest.java | 3 ++ .../pmd/lang/java/ast/ASTLiteralTest.java | 3 ++ .../ast/ASTLocalVariableDeclarationTest.java | 7 ++-- .../java/ast/ASTMethodDeclarationTest.java | 7 ++-- .../lang/java/ast/ASTPrimarySuffixTest.java | 3 ++ .../pmd/lang/java/ast/ASTSwitchLabelTest.java | 3 ++ .../lang/java/ast/ASTThrowStatementTest.java | 7 ++-- .../pmd/lang/java/ast/JDKVersionTest.java | 3 ++ .../pmd/lang/java/dfa/VariableAccessTest.java | 7 ++-- .../rule/typeresolution/xml/MyInterface.java | 3 ++ .../rule/typeresolution/xml/MyTestCase.java | 3 ++ .../lang/java/symboltable/ClassScopeTest.java | 12 ++---- .../MethodNameDeclarationTest.java | 7 ++-- .../java/symboltable/MethodScopeTest.java | 7 ++-- .../pmd/lang/java/symboltable/STBBaseTst.java | 3 ++ .../java/symboltable/SourceFileScopeTest.java | 7 ++-- .../VariableUsageFinderFunctionTest.java | 7 ++-- .../java/symboltable/testdata/InnerClass.java | 39 ++++++++++--------- .../ClassWithImportOnDemand.java | 3 ++ .../typeresolution/PMDASMClassLoaderTest.java | 7 ++-- .../testdata/AnonymousInnerClass.java | 3 ++ .../testdata/DefaultJavaLangImport.java | 3 ++ .../testdata/EnumWithAnonymousInnerClass.java | 3 ++ .../testdata/ExtraTopLevelClass.java | 3 ++ .../typeresolution/testdata/InnerClass.java | 3 ++ .../ecmascript/EcmascriptLanguageModule.java | 3 ++ .../pmd/lang/jsp/JspLanguageModule.java | 4 +- .../pmd/LanguageVersionDiscovererTest.java | 9 ++--- .../pmd/lang/jsp/ast/JspDocStyleTest.java | 7 ++-- .../pmd/lang/jsp/ast/OpenTagRegisterTest.java | 3 ++ .../pmd/lang/plsql/PLSQLLanguageModule.java | 4 +- .../pmd/LanguageVersionDiscovererTest.java | 9 ++--- .../dfa/StatementAndBraceFinderTest.java | 3 ++ .../pmd/lang/xml/XmlLanguageModule.java | 4 +- .../pmd/lang/xsl/XslLanguageModule.java | 4 +- .../pmd/lang/xml/XmlParserTest.java | 2 +- 77 files changed, 232 insertions(+), 147 deletions(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java index 0d389f8939..3b0ee4e577 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/PMDConfiguration.java @@ -566,7 +566,7 @@ public class PMDConfiguration extends AbstractConfiguration { * @return The currently used analysis cache. Never null. */ public AnalysisCache getAnalysisCache() { - return analysisCache ; + return analysisCache; } /** diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java index 6d9b45f917..a6d6dd7272 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactory.java @@ -244,7 +244,7 @@ public class RuleSetFactory { private RuleSet parseRuleSetNode(RuleSetReferenceId ruleSetReferenceId, boolean withDeprecatedRuleReferences) throws RuleSetNotFoundException { try ( - final CheckedInputStream inputStream = new CheckedInputStream( + CheckedInputStream inputStream = new CheckedInputStream( ruleSetReferenceId.getInputStream(this.classLoader), new Adler32()); ) { if (!ruleSetReferenceId.isExternal()) { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java index 185ae83b0f..9484690676 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/benchmark/Benchmarker.java @@ -21,7 +21,6 @@ import net.sourceforge.pmd.PMDConfiguration; import net.sourceforge.pmd.PMDException; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleContext; -import net.sourceforge.pmd.RulePriority; import net.sourceforge.pmd.RuleSet; import net.sourceforge.pmd.RuleSetFactory; import net.sourceforge.pmd.RuleSetNotFoundException; diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java index b7a6bced17..5fa6d0a17d 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AbstractAnalysisCache.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import java.io.File; @@ -109,4 +110,4 @@ public abstract class AbstractAnalysisCache implements AnalysisCache { // Not interested in metrics } -} \ No newline at end of file +} diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java index c2bc2c9d60..f6ce68e4bd 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisCache.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import java.io.File; @@ -38,4 +39,4 @@ public interface AnalysisCache extends ReportListener { * @param classLoader The class loader configured for this analysis. */ void checkValidity(RuleSets ruleSets, ClassLoader classLoader); -} \ No newline at end of file +} diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisResult.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisResult.java index db5d90de21..223d64fcd0 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisResult.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/AnalysisResult.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import java.io.BufferedInputStream; @@ -36,7 +37,7 @@ public class AnalysisResult { private static long computeFileChecksum(final File sourceFile) { try ( - final CheckedInputStream stream = new CheckedInputStream( + CheckedInputStream stream = new CheckedInputStream( new BufferedInputStream(new FileInputStream(sourceFile)), new Adler32()); ) { // Just read it, the CheckedInputStream will update the checksum on it's own diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/FileAnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/FileAnalysisCache.java index b9c03980cf..45980b91b7 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/FileAnalysisCache.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/FileAnalysisCache.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import java.io.BufferedInputStream; @@ -41,7 +42,7 @@ public class FileAnalysisCache extends AbstractAnalysisCache { private void loadFromFile(final File cacheFile) { if (cacheFile.exists()) { try ( - final DataInputStream inputStream = new DataInputStream( + DataInputStream inputStream = new DataInputStream( new BufferedInputStream(new FileInputStream(cacheFile))); ) { final String cacheVersion = inputStream.readUTF(); @@ -74,7 +75,7 @@ public class FileAnalysisCache extends AbstractAnalysisCache { @Override public void persist() { try ( - final DataOutputStream outputStream = new DataOutputStream( + DataOutputStream outputStream = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(cacheFile))); ) { outputStream.writeUTF(pmdVersion); diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cache/NoopAnalysisCache.java b/pmd-core/src/main/java/net/sourceforge/pmd/cache/NoopAnalysisCache.java index 7d7537fb12..d2d3d841b7 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cache/NoopAnalysisCache.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cache/NoopAnalysisCache.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import java.io.File; diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java b/pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java index 87a158ad65..ff195a5591 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/processor/MultiThreadProcessor.java @@ -59,7 +59,7 @@ public class MultiThreadProcessor extends AbstractPMDProcessor { } - private void processReports(final List renderers, List> tasks) throws Error { + private void processReports(final List renderers, List> tasks) { while (!tasks.isEmpty()) { Future future = tasks.remove(0); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java index c51ac2c4d7..5f5ec141f5 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/FileSelectorTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd; @@ -59,8 +62,4 @@ public class FileSelectorTest { boolean selected = fileSelector.accept(javaFile.getParentFile(), javaFile.getName()); assertEquals("Unwanted java file must not be selected!", false, selected); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(FileSelectorTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java index 763f9a238f..ef0ebe48bc 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/cache/FileAnalysisCacheTest.java @@ -1,6 +1,7 @@ /** * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ + package net.sourceforge.pmd.cache; import static org.junit.Assert.assertFalse; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java index 953ae8a4a4..f5dfd14f05 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/jaxen/MatchesFunctionTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.jaxen; @@ -61,7 +64,7 @@ public class MatchesFunctionTest { list.add(attrs); list.add(exp); Context c = new Context(null); - c.setNodeSet(new ArrayList()); + c.setNodeSet(new ArrayList<>()); return function.call(c, list); } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java index 87973ff00a..2816820895 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/AbstractPropertyDescriptorTester.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java index 69227bf4a5..2ed4c68a0d 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/BooleanPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java index 8af8b73c4a..f2655ae5d3 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/CharacterPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java index 47eae63b8c..af730a1dcc 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/DoublePropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java index a229f0dbf5..d932793a1c 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/EnumeratedPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java index 55089f65f2..26a13b86e6 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/FloatPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java index 3587555b4e..f2a6fe00c4 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/IntegerPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java index 7d46df1f8a..f2d0e891cb 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/MethodPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java index c7788d580f..d87287c956 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java index 55b3105305..861cdacf71 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/StringPropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java index cf7f6c7696..e2802d0c27 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/TypePropertyTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.properties; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java index d458e5e6dc..1914f3f1c7 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/EmacsRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; @@ -24,8 +27,4 @@ public class EmacsRendererTest extends AbstractRendererTst { public String getExpectedMultiple() { return "n/a:1: blah" + PMD.EOL + "n/a:1: blah" + PMD.EOL; } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(EmacsRendererTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java index d4d172ba84..3982c273c6 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/HTMLRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; @@ -52,8 +55,4 @@ public class HTMLRendererTest extends AbstractRendererTst { + "file" + PMD.EOL + "Error" + PMD.EOL + "" + PMD.EOL + "" + PMD.EOL; } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(HTMLRendererTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java index 5c0d07fce9..e12b0b4ce4 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/IDEAJRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; @@ -29,8 +32,4 @@ public class IDEAJRendererTest extends AbstractRendererTst { return "blah" + PMD.EOL + " at Foo (Foo.java:1)" + PMD.EOL + "blah" + PMD.EOL + " at Foo (Foo.java:1)" + PMD.EOL; } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(IDEAJRendererTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java index dda48afdd4..fdece63ad7 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/TextRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; @@ -30,8 +33,4 @@ public class TextRendererTest extends AbstractRendererTst { public String getExpectedError(ProcessingError error) { return "file\t-\tError" + PMD.EOL; } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(TextRendererTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java index 5a90084f79..ecfca2b201 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java index 77d186224a..d786fd5671 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/renderers/YAHTMLRendererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.renderers; @@ -73,8 +76,4 @@ public class YAHTMLRendererTest extends AbstractRendererTst { public String getExpectedError(ProcessingError error) { return getExpected(); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(YAHTMLRendererTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java index 27d17a3247..45e6880fa5 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MetricTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ /** * * Copyright 1997-2002 BBNT Solutions, LLC @@ -84,8 +87,4 @@ public class MetricTest { Metric IUT = new Metric(testName, 0, 0.0, 0.0, 0.0, 0.0, stdev); assertEquals(stdev, IUT.getStandardDeviation(), 0.05); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(MetricTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java index 3b7f2f4236..d85e64f004 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/stat/MockStatisticalRule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ /** * * Copyright 1997-2002 BBNT Solutions, LLC diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java index 27c4d94b3e..1c7adcc0fb 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatTests.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.stat; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java index 428bfca6a5..623d15b133 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/stat/StatisticalRuleTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ /** * * Copyright 1997-2002 BBNT Solutions, LLC @@ -861,8 +864,4 @@ public class StatisticalRuleTest { return report; } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(StatisticalRuleTest.class); - } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java index 323744c094..08d277ee73 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/TypeMapTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.util; @@ -7,10 +10,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.Assert; import org.junit.Test; -import junit.framework.Assert; - /** * Evaluates all major functionality of the TypeMap class. * @@ -79,9 +81,4 @@ public class TypeMapTest { Assert.assertTrue(map.size() == 6); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(TypeMapTest.class); - } - } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java index 95047da57e..c7ca8f145f 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/imports/UnnecessaryFullyQualifiedNameRule.java @@ -180,7 +180,7 @@ public class UnnecessaryFullyQualifiedNameRule extends AbstractJavaRule { private String importStr; private String importType; - public PotentialViolation(JavaNode node, String importStr, String importType) { + PotentialViolation(JavaNode node, String importStr, String importType) { this.node = node; this.importStr = importStr; this.importType = importType; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java index f11326efaf..22b64d93b4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd; @@ -12,8 +15,6 @@ import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.LanguageVersionDiscoverer; import net.sourceforge.pmd.lang.java.JavaLanguageModule; -import junit.framework.JUnit4TestAdapter; - public class LanguageVersionDiscovererTest { /** @@ -56,8 +57,4 @@ public class LanguageVersionDiscovererTest { languageVersionDiscoverer .getDefaultLanguageVersion(LanguageRegistry.getLanguage(JavaLanguageModule.NAME))); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(LanguageVersionDiscovererTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java index ebf9a19e06..36725164bf 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java index 876358de3c..20817c8980 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBlockStatementTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; @@ -23,8 +26,4 @@ public class ASTBlockStatementTest extends ParserTst { bs.jjtAddChild(new ASTAssertStatement(1), 0); assertFalse(bs.isAllocation()); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ASTBlockStatementTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java index 808149029a..e7aaf802ea 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTBooleanLiteralTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java index 093db51368..9863b7bfc9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclarationTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; @@ -71,8 +74,4 @@ public class ASTFieldDeclarationTest extends ParserTst { assertEquals("foo", n.getVariableName()); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ASTFieldDeclarationTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java index cfd6df2a9b..915999c50a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java index 6a24d10e93..f5bc5e7789 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTInitializerTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java index 4002a47bf6..e5bbd3f60c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLiteralTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java index a3ff1d36c1..684ba6aba9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclarationTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; @@ -36,8 +39,4 @@ public class ASTLocalVariableDeclarationTest extends ParserTst { private static final String TEST2 = "class Foo {" + PMD.EOL + " void bar() {int x[][] = null;}" + PMD.EOL + "}"; private static final String TEST3 = "class Foo {" + PMD.EOL + " void bar() {int[] x[][] = null;}" + PMD.EOL + "}"; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ASTLocalVariableDeclarationTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java index b05fb5dd3e..b4c4cb6189 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTMethodDeclarationTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; @@ -18,8 +21,4 @@ public class ASTMethodDeclarationTest { assertEquals("foo", md.getMethodName()); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ASTMethodDeclarationTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java index 869a86c6cc..fecf84142c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPrimarySuffixTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java index 11dc74a1b8..d45be0b73e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabelTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java index 17475c5790..4c7d178cbb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTThrowStatementTest.java @@ -1,7 +1,5 @@ -/* - * Created on Jan 19, 2005 - * - * $Id$ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ package net.sourceforge.pmd.lang.java.ast; @@ -15,6 +13,7 @@ import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.lang.java.ParserTst; /** + * Created on Jan 19, 2005 * @author mgriffa */ public class ASTThrowStatementTest extends ParserTst { 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 4d6c9927f2..a45a541208 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 @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.ast; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java index 94e9ceb899..fcec9cbec8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/dfa/VariableAccessTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.dfa; @@ -20,8 +23,4 @@ public class VariableAccessTest { va = new VariableAccess(VariableAccess.DEFINITION, "foobar"); assertEquals("foobar", va.getVariableName()); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(VariableAccessTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java index c5d622b632..179be18d62 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyInterface.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.rule.typeresolution.xml; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java index d287a7ac11..24847e5172 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.rule.typeresolution.xml; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java index b7509c00b9..abc1934b4d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/ClassScopeTest.java @@ -346,12 +346,8 @@ public class ClassScopeTest extends STBBaseTst { + PMD.EOL + "}"; private static final String IMPORT_NESTED_CLASSES = - "import net.sourceforge.pmd.lang.java.symboltable.testdata.InnerClass.TheInnerClass.EnumTest;" + PMD.EOL + - "public class Foo {" + PMD.EOL + - " public EnumTest e;" + PMD.EOL + - "}" + PMD.EOL; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ClassScopeTest.class); - } + "import net.sourceforge.pmd.lang.java.symboltable.testdata.InnerClass.TheInnerClass.EnumTest;" + PMD.EOL + + "public class Foo {" + PMD.EOL + + " public EnumTest e;" + PMD.EOL + + "}" + PMD.EOL; } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java index 5066fcb574..284de9764e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodNameDeclarationTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.symboltable; @@ -29,8 +32,4 @@ public class MethodNameDeclarationTest extends STBBaseTst { private static final String SIMILAR = "public class Foo {" + PMD.EOL + " public void bar() {" + PMD.EOL + " bar(x, y);" + PMD.EOL + " }" + PMD.EOL + " private void bar(int x, int y) {}" + PMD.EOL + " private void bar(int x, int... y) {}" + PMD.EOL + "}"; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(MethodNameDeclarationTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java index 0356e55806..85256f57e7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/MethodScopeTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.symboltable; @@ -46,8 +49,4 @@ public class MethodScopeTest extends STBBaseTst { private static final String TEST_GENERICS = "public class Tree {" + PMD.EOL + " private List subForest;" + PMD.EOL + " public Tree fmap(final F f) { return Tree.foo(); }" + PMD.EOL + " public List subForest() { return null; }" + PMD.EOL + "}" + PMD.EOL; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(MethodScopeTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java index cb8d5e4827..2e4e3a8ee8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/STBBaseTst.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.symboltable; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java index 2af787dd4f..4f4958031f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/SourceFileScopeTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.symboltable; @@ -55,8 +58,4 @@ public class SourceFileScopeTest extends STBBaseTst { private static final String TEST3 = "public class Foo {" + PMD.EOL + " public class Bar {" + PMD.EOL + " }" + PMD.EOL + "}" + PMD.EOL; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(SourceFileScopeTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java index 6d5f4aecec..4c6f2f100b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/VariableUsageFinderFunctionTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.java.symboltable; @@ -36,8 +39,4 @@ public class VariableUsageFinderFunctionTest { Map> p = f.getUsed(); assertEquals(1, p.size()); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(VariableUsageFinderFunctionTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/testdata/InnerClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/testdata/InnerClass.java index d1a8ff8697..1c981bf0b4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/testdata/InnerClass.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symboltable/testdata/InnerClass.java @@ -1,23 +1,26 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + package net.sourceforge.pmd.lang.java.symboltable.testdata; public class InnerClass { - public static class TheInnerClass { - public static enum EnumTest { - THREE, FOUR; - } - } - - enum EnumTest { - ONE, - TWO; - } + public static class TheInnerClass { + public enum EnumTest { + THREE, FOUR; + } + } - public void foo(TheInnerClass arg) { - } - - public void bar(InnerClass.TheInnerClass arg) { - } - - public void baz(EnumTest e) { - } + enum EnumTest { + ONE, TWO; + } + + public void foo(TheInnerClass arg) { + } + + public void bar(InnerClass.TheInnerClass arg) { + } + + public void baz(EnumTest e) { + } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassWithImportOnDemand.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassWithImportOnDemand.java index e6a97cf1f9..5372ee5467 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassWithImportOnDemand.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/ClassWithImportOnDemand.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/PMDASMClassLoaderTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/PMDASMClassLoaderTest.java index de405099d2..cb29332561 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/PMDASMClassLoaderTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/PMDASMClassLoaderTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution; @@ -122,8 +125,4 @@ public class PMDASMClassLoaderTest { System.out.println((usedBytesAfter - usedBytesBefore) / (1024.0 * 1024.0) + " mb needed"); } - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(PMDASMClassLoaderTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/AnonymousInnerClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/AnonymousInnerClass.java index 1734626a44..adff4b4d37 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/AnonymousInnerClass.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/AnonymousInnerClass.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution.testdata; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/DefaultJavaLangImport.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/DefaultJavaLangImport.java index 482c35efd0..af163d0734 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/DefaultJavaLangImport.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/DefaultJavaLangImport.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution.testdata; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/EnumWithAnonymousInnerClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/EnumWithAnonymousInnerClass.java index 15af2a60ae..5ed15ae2ba 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/EnumWithAnonymousInnerClass.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/EnumWithAnonymousInnerClass.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution.testdata; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java index d08fe8e5ce..8244489fc0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution.testdata; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/InnerClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/InnerClass.java index c8156f53c1..8bed2e9e16 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/InnerClass.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/InnerClass.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.typeresolution.testdata; diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java index 7b79e178da..219ed2577b 100644 --- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java +++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/EcmascriptLanguageModule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.ecmascript; diff --git a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspLanguageModule.java b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspLanguageModule.java index abb821abfb..8fa12452f2 100644 --- a/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspLanguageModule.java +++ b/pmd-jsp/src/main/java/net/sourceforge/pmd/lang/jsp/JspLanguageModule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.jsp; @@ -16,5 +19,4 @@ public class JspLanguageModule extends BaseLanguageModule { super(NAME, "JSP", TERSE_NAME, JspRuleChainVisitor.class, "jsp"); addVersion("", new JspHandler(), true); } - } diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java index 63f0c5b804..50de2dfce9 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd; @@ -12,8 +15,6 @@ import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.LanguageVersionDiscoverer; import net.sourceforge.pmd.lang.jsp.JspLanguageModule; -import junit.framework.JUnit4TestAdapter; - public class LanguageVersionDiscovererTest { /** @@ -27,8 +28,4 @@ public class LanguageVersionDiscovererTest { assertEquals("LanguageVersion must be JSP!", LanguageRegistry.getLanguage(JspLanguageModule.NAME).getDefaultVersion(), languageVersion); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(LanguageVersionDiscovererTest.class); - } } diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java index 103a99f451..5a0e7c92c1 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/JspDocStyleTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.jsp.ast; @@ -956,8 +959,4 @@ public class JspDocStyleTest extends AbstractJspNodesTst { private static final String TEST_UNCLOSED_END_OF_DOC = " "; private static final String TEST_UNCLOSED_NO_QUOTE_ATTR = " "; - - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(JspDocStyleTest.class); - } } diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegisterTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegisterTest.java index 28930b399c..f84d15a930 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegisterTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/ast/OpenTagRegisterTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.jsp.ast; diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLLanguageModule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLLanguageModule.java index a9a87c09b6..2f165815af 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLLanguageModule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/PLSQLLanguageModule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.plsql; @@ -25,5 +28,4 @@ public class PLSQLLanguageModule extends BaseLanguageModule { ); addVersion("", new PLSQLHandler(), true); } - } diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java index 67d040eb0a..064ee8761e 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd; @@ -12,8 +15,6 @@ import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.LanguageVersionDiscoverer; import net.sourceforge.pmd.lang.plsql.PLSQLLanguageModule; -import junit.framework.JUnit4TestAdapter; - public class LanguageVersionDiscovererTest { /** @@ -28,8 +29,4 @@ public class LanguageVersionDiscovererTest { assertEquals("LanguageVersion must be PLSQL!", LanguageRegistry.getLanguage(PLSQLLanguageModule.NAME).getDefaultVersion(), languageVersion); } - - public static junit.framework.Test suite() { - return new JUnit4TestAdapter(LanguageVersionDiscovererTest.class); - } } diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java index dc3def6552..9dc7b86cfc 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinderTest.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.plsql.dfa; diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlLanguageModule.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlLanguageModule.java index 4ddffe380b..d6db2e732c 100644 --- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlLanguageModule.java +++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlLanguageModule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.xml; @@ -16,5 +19,4 @@ public class XmlLanguageModule extends BaseLanguageModule { super(NAME, null, TERSE_NAME, XmlRuleChainVisitor.class, "xml"); addVersion("", new XmlHandler(), true); } - } diff --git a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xsl/XslLanguageModule.java b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xsl/XslLanguageModule.java index 05c8e5191b..272d3c274f 100644 --- a/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xsl/XslLanguageModule.java +++ b/pmd-xml/src/main/java/net/sourceforge/pmd/lang/xsl/XslLanguageModule.java @@ -1,3 +1,6 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ package net.sourceforge.pmd.lang.xsl; @@ -17,5 +20,4 @@ public class XslLanguageModule extends BaseLanguageModule { super(NAME, null, TERSE_NAME, XmlRuleChainVisitor.class, "xsl", "xslt"); addVersion("", new XmlHandler(), true); } - } diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java index afc735724d..9513d773c0 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/XmlParserTest.java @@ -364,7 +364,7 @@ public class XmlParserTest { private Node parseXml(String xml) { LanguageVersionHandler xmlVersionHandler = LanguageRegistry.getLanguage(XmlLanguageModule.NAME).getDefaultVersion().getLanguageVersionHandler(); - XmlParserOptions options = (XmlParserOptions)xmlVersionHandler.getDefaultParserOptions(); + XmlParserOptions options = (XmlParserOptions) xmlVersionHandler.getDefaultParserOptions(); Parser parser = xmlVersionHandler.getParser(options); Node document = parser.parse(null, new StringReader(xml)); return document;