From 6627ac3974c94666e5986023e9bb09eae28a3d73 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 30 Jun 2022 10:26:56 +0200 Subject: [PATCH 01/31] [apex] Migrate tests to JUnit5 --- .../net/sourceforge/pmd/cpd/ApexCpdTest.java | 16 ++--- .../pmd/cpd/ApexTokenizerTest.java | 14 ++-- .../pmd/lang/apex/ast/ASTFieldTest.java | 24 +++---- .../pmd/lang/apex/ast/ASTMethodTest.java | 15 +++-- .../ASTNewKeyValueObjectExpressionTest.java | 19 +++--- .../lang/apex/ast/ASTSoqlExpressionTest.java | 11 ++-- .../lang/apex/ast/ASTSwitchStatementTest.java | 50 ++++++++------- .../ASTTryCatchFinallyBlockStatementTest.java | 51 ++++++++------- .../pmd/lang/apex/ast/ASTUserClassTest.java | 27 ++++---- .../pmd/lang/apex/ast/ASTUserEnumTest.java | 11 ++-- .../lang/apex/ast/ASTUserInterfaceTest.java | 23 +++---- .../pmd/lang/apex/ast/ASTUserTriggerTest.java | 18 +++--- .../lang/apex/ast/ApexCompilerSoqlTest.java | 6 +- .../pmd/lang/apex/ast/ApexCompilerTest.java | 12 ++-- .../pmd/lang/apex/ast/ApexLexerTest.java | 16 +++-- .../pmd/lang/apex/ast/ApexParserTest.java | 64 +++++++++---------- .../lang/apex/ast/ApexQualifiedNameTest.java | 25 ++++---- .../pmd/lang/apex/ast/ApexTreeDumpTest.java | 8 +-- 18 files changed, 214 insertions(+), 196 deletions(-) diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexCpdTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexCpdTest.java index 412c4ea024..7ce83fcfcb 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexCpdTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexCpdTest.java @@ -4,30 +4,30 @@ package net.sourceforge.pmd.cpd; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; import java.util.Iterator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; import net.sourceforge.pmd.util.IOUtil; -public class ApexCpdTest { +class ApexCpdTest { private File testdir; - @Before - public void setUp() { + @BeforeEach + void setUp() { String path = IOUtil.normalizePath("src/test/resources/net/sourceforge/pmd/cpd/issue427"); testdir = new File(path); } @Test - public void testIssue427() throws IOException { + void testIssue427() throws IOException { CPDConfiguration configuration = new CPDConfiguration(); configuration.setMinimumTileSize(10); configuration.setLanguage(LanguageFactory.createLanguage(ApexLanguageModule.TERSE_NAME)); diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexTokenizerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexTokenizerTest.java index 5e64f0082d..aeb4a51252 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexTokenizerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/cpd/ApexTokenizerTest.java @@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class ApexTokenizerTest extends CpdTextComparisonTest { +class ApexTokenizerTest extends CpdTextComparisonTest { - public ApexTokenizerTest() { + ApexTokenizerTest() { super(".cls"); } @@ -30,12 +30,12 @@ public class ApexTokenizerTest extends CpdTextComparisonTest { @Test - public void testTokenize() { + void testTokenize() { doTest("Simple"); } @Test - public void testTokenizeCaseSensitive() { + void testTokenizeCaseSensitive() { doTest("Simple", "_caseSensitive", caseSensitive()); } @@ -43,12 +43,12 @@ public class ApexTokenizerTest extends CpdTextComparisonTest { * Comments are ignored since using ApexLexer. */ @Test - public void testTokenizeWithComments() { + void testTokenizeWithComments() { doTest("comments"); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldTest.java index 4b9e418590..6c4797a7b6 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTFieldTest.java @@ -4,34 +4,36 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; -public class ASTFieldTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTFieldTest extends ApexParserTestBase { @Test - public void testGetType() { + void testGetType() { ASTField field = parse("public class Foo { private String myField = 'a'; }") .descendants(ASTField.class).firstOrThrow(); - Assert.assertEquals("myField", field.getImage()); - Assert.assertEquals("String", field.getType()); - Assert.assertEquals("a", field.getValue()); + assertEquals("myField", field.getImage()); + assertEquals("String", field.getType()); + assertEquals("a", field.getValue()); } @Test - public void testGetValue() { + void testGetValue() { ASTField field = parse("public class Foo { private String myField = 'a'; }") .descendants(ASTField.class).firstOrThrow(); - Assert.assertEquals("a", field.getValue()); + assertEquals("a", field.getValue()); } @Test - public void testGetNoValue() { + void testGetNoValue() { ASTField field = parse("public class Foo { private String myField; }") .descendants(ASTField.class).firstOrThrow(); - Assert.assertNull(field.getValue()); + assertNull(field.getValue()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodTest.java index 7ef6efbe66..0cd0033383 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTMethodTest.java @@ -4,19 +4,20 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ASTMethodTest extends ApexParserTestBase { +class ASTMethodTest extends ApexParserTestBase { @Test - public void testConstructorName() { + void testConstructorName() { ASTUserClass node = (ASTUserClass) parse("public class Foo { public Foo() {} public void bar() {} }"); List methods = node.children(ASTMethod.class).toList(); - Assert.assertEquals("Foo", methods.get(0).getImage()); // constructor - Assert.assertEquals("", methods.get(0).getCanonicalName()); - Assert.assertEquals("bar", methods.get(1).getImage()); // normal method + assertEquals("Foo", methods.get(0).getImage()); // constructor + assertEquals("", methods.get(0).getCanonicalName()); + assertEquals("bar", methods.get(1).getImage()); // normal method } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpressionTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpressionTest.java index 691372eaab..bd5e58553b 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpressionTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTNewKeyValueObjectExpressionTest.java @@ -4,15 +4,16 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ASTNewKeyValueObjectExpressionTest extends ApexParserTestBase { +class ASTNewKeyValueObjectExpressionTest extends ApexParserTestBase { @Test - public void testParameterName() { + void testParameterName() { ASTUserClassOrInterface node = parse("public class Foo { \n" + " public void foo(String newName, String tempID) { \n" + " if (Contact.sObjectType.getDescribe().isCreateable() && Contact.sObjectType.getDescribe().isUpdateable()) {\n" @@ -20,13 +21,13 @@ public class ASTNewKeyValueObjectExpressionTest extends ApexParserTestBase { + " }\n" + " } \n" + "}"); ASTNewKeyValueObjectExpression keyValueExpr = node.getFirstDescendantOfType(ASTNewKeyValueObjectExpression.class); - Assert.assertEquals(3, keyValueExpr.getParameterCount()); + assertEquals(3, keyValueExpr.getParameterCount()); List literals = keyValueExpr.findDescendantsOfType(ASTLiteralExpression.class); - Assert.assertEquals(3, literals.size()); - Assert.assertEquals("FirstName", literals.get(0).getName()); - Assert.assertEquals("LastName", literals.get(1).getName()); - Assert.assertEquals("Phone", literals.get(2).getName()); + assertEquals(3, literals.size()); + assertEquals("FirstName", literals.get(0).getName()); + assertEquals("LastName", literals.get(1).getName()); + assertEquals("Phone", literals.get(2).getName()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpressionTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpressionTest.java index 22ef9278b9..d8673390a3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpressionTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSoqlExpressionTest.java @@ -4,15 +4,16 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class ASTSoqlExpressionTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTSoqlExpressionTest extends ApexParserTestBase { @Test - public void testQuery() { + void testQuery() { ApexNode root = parse("class Foo { void test1() { Account acc = [SELECT col FROM Account]; } }"); ASTSoqlExpression soqlExpression = root.descendants(ASTSoqlExpression.class).firstOrThrow(); - Assert.assertEquals("SELECT col FROM Account", soqlExpression.getQuery()); + assertEquals("SELECT col FROM Account", soqlExpression.getQuery()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatementTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatementTest.java index f5dddb17c0..28feed0833 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatementTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTSwitchStatementTest.java @@ -4,41 +4,43 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ASTSwitchStatementTest extends ApexParserTestBase { +class ASTSwitchStatementTest extends ApexParserTestBase { @Test - public void testExamples() { + void testExamples() { ApexNode node = parseResource("SwitchStatements.cls"); List switchStatements = node.findDescendantsOfType(ASTSwitchStatement.class); - Assert.assertEquals(4, switchStatements.size()); + assertEquals(4, switchStatements.size()); - Assert.assertTrue(switchStatements.get(0).getChild(0) instanceof ASTVariableExpression); - Assert.assertEquals(5, switchStatements.get(0).findChildrenOfType(ASTValueWhenBlock.class).size()); - Assert.assertEquals(3, switchStatements.get(0).findChildrenOfType(ASTValueWhenBlock.class) - .get(1).findChildrenOfType(ASTLiteralCase.class).size()); - Assert.assertEquals(1, switchStatements.get(0).findChildrenOfType(ASTElseWhenBlock.class).size()); + assertTrue(switchStatements.get(0).getChild(0) instanceof ASTVariableExpression); + assertEquals(5, switchStatements.get(0).findChildrenOfType(ASTValueWhenBlock.class).size()); + assertEquals(3, switchStatements.get(0).findChildrenOfType(ASTValueWhenBlock.class) + .get(1).findChildrenOfType(ASTLiteralCase.class).size()); + assertEquals(1, switchStatements.get(0).findChildrenOfType(ASTElseWhenBlock.class).size()); - Assert.assertTrue(switchStatements.get(1).getChild(0) instanceof ASTMethodCallExpression); - Assert.assertEquals(2, switchStatements.get(1).findChildrenOfType(ASTValueWhenBlock.class).size()); - Assert.assertEquals(1, switchStatements.get(1).findChildrenOfType(ASTElseWhenBlock.class).size()); + assertTrue(switchStatements.get(1).getChild(0) instanceof ASTMethodCallExpression); + assertEquals(2, switchStatements.get(1).findChildrenOfType(ASTValueWhenBlock.class).size()); + assertEquals(1, switchStatements.get(1).findChildrenOfType(ASTElseWhenBlock.class).size()); - Assert.assertTrue(switchStatements.get(2).getChild(0) instanceof ASTVariableExpression); - Assert.assertEquals(2, switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class).size()); - Assert.assertEquals("Account", switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class) - .get(0).getType()); - Assert.assertEquals("a", switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class) - .get(0).getName()); - Assert.assertEquals(1, switchStatements.get(2).findChildrenOfType(ASTValueWhenBlock.class).size()); - Assert.assertEquals(1, switchStatements.get(2).findChildrenOfType(ASTElseWhenBlock.class).size()); + assertTrue(switchStatements.get(2).getChild(0) instanceof ASTVariableExpression); + assertEquals(2, switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class).size()); + assertEquals("Account", switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class) + .get(0).getType()); + assertEquals("a", switchStatements.get(2).findChildrenOfType(ASTTypeWhenBlock.class) + .get(0).getName()); + assertEquals(1, switchStatements.get(2).findChildrenOfType(ASTValueWhenBlock.class).size()); + assertEquals(1, switchStatements.get(2).findChildrenOfType(ASTElseWhenBlock.class).size()); - Assert.assertTrue(switchStatements.get(3).getChild(0) instanceof ASTVariableExpression); - Assert.assertEquals(2, switchStatements.get(3).findChildrenOfType(ASTValueWhenBlock.class).size()); - Assert.assertEquals(1, switchStatements.get(3).findChildrenOfType(ASTElseWhenBlock.class).size()); + assertTrue(switchStatements.get(3).getChild(0) instanceof ASTVariableExpression); + assertEquals(2, switchStatements.get(3).findChildrenOfType(ASTValueWhenBlock.class).size()); + assertEquals(1, switchStatements.get(3).findChildrenOfType(ASTElseWhenBlock.class).size()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatementTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatementTest.java index a6cd4df9b9..d71a59f6df 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatementTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTTryCatchFinallyBlockStatementTest.java @@ -4,44 +4,47 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -public class ASTTryCatchFinallyBlockStatementTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTTryCatchFinallyBlockStatementTest extends ApexParserTestBase { @Test - public void testTryFinally() { + void testTryFinally() { ApexNode node = parse("class Foo { void bar() { try { methodCall(); } finally { methodCall(); } } }"); ASTTryCatchFinallyBlockStatement statement = node.getFirstDescendantOfType(ASTTryCatchFinallyBlockStatement.class); - Assert.assertNotNull(statement.getTryBlock()); - Assert.assertEquals(0, statement.getTryBlock().getIndexInParent()); - Assert.assertNotNull(statement.getFinallyBlock()); - Assert.assertEquals(1, statement.getFinallyBlock().getIndexInParent()); - Assert.assertEquals(0, statement.getCatchClauses().size()); + assertNotNull(statement.getTryBlock()); + assertEquals(0, statement.getTryBlock().getIndexInParent()); + assertNotNull(statement.getFinallyBlock()); + assertEquals(1, statement.getFinallyBlock().getIndexInParent()); + assertEquals(0, statement.getCatchClauses().size()); } @Test - public void testTryCatch() { + void testTryCatch() { ApexNode node = parse("class Foo { void bar() { try { methodCall(); } catch (Exception e) { methodCall(); } } }"); ASTTryCatchFinallyBlockStatement statement = node.getFirstDescendantOfType(ASTTryCatchFinallyBlockStatement.class); - Assert.assertNotNull(statement.getTryBlock()); - Assert.assertEquals(0, statement.getTryBlock().getIndexInParent()); - Assert.assertNull(statement.getFinallyBlock()); - Assert.assertEquals(1, statement.getCatchClauses().size()); - Assert.assertNotNull(statement.getCatchClauses().get(0).getBody()); - Assert.assertEquals(1, statement.getCatchClauses().get(0).getIndexInParent()); + assertNotNull(statement.getTryBlock()); + assertEquals(0, statement.getTryBlock().getIndexInParent()); + assertNull(statement.getFinallyBlock()); + assertEquals(1, statement.getCatchClauses().size()); + assertNotNull(statement.getCatchClauses().get(0).getBody()); + assertEquals(1, statement.getCatchClauses().get(0).getIndexInParent()); } @Test - public void testTryCatchFinally() { + void testTryCatchFinally() { ApexNode node = parse("class Foo { void bar() { try { methodCall(); } catch (Exception e) { methodCall(); } finally { } } }"); ASTTryCatchFinallyBlockStatement statement = node.getFirstDescendantOfType(ASTTryCatchFinallyBlockStatement.class); - Assert.assertNotNull(statement.getTryBlock()); - Assert.assertEquals(0, statement.getTryBlock().getIndexInParent()); - Assert.assertNotNull(statement.getFinallyBlock()); - Assert.assertEquals(2, statement.getFinallyBlock().getIndexInParent()); - Assert.assertEquals(1, statement.getCatchClauses().size()); - Assert.assertNotNull(statement.getCatchClauses().get(0).getBody()); - Assert.assertEquals(1, statement.getCatchClauses().get(0).getIndexInParent()); + assertNotNull(statement.getTryBlock()); + assertEquals(0, statement.getTryBlock().getIndexInParent()); + assertNotNull(statement.getFinallyBlock()); + assertEquals(2, statement.getFinallyBlock().getIndexInParent()); + assertEquals(1, statement.getCatchClauses().size()); + assertNotNull(statement.getCatchClauses().get(0).getBody()); + assertEquals(1, statement.getCatchClauses().get(0).getIndexInParent()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassTest.java index ffa83ee1fa..97120ce364 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserClassTest.java @@ -4,41 +4,42 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ASTUserClassTest extends ApexParserTestBase { +class ASTUserClassTest extends ApexParserTestBase { @Test - public void testClassName() { + void testClassName() { ASTUserClass node = (ASTUserClass) parse("class Foo { }"); - Assert.assertEquals("Foo", node.getSimpleName()); + assertEquals("Foo", node.getSimpleName()); } @Test - public void testInnerClassName() { + void testInnerClassName() { ASTUserClass foo = (ASTUserClass) parse("class Foo { class Bar { } }"); ASTUserClass innerNode = foo.descendants(ASTUserClass.class).firstOrThrow(); - Assert.assertEquals("Bar", innerNode.getSimpleName()); + assertEquals("Bar", innerNode.getSimpleName()); } @Test - public void testSuperClassName() { + void testSuperClassName() { ASTUserClass toplevel = (ASTUserClass) parse("public class AccountTriggerHandler extends TriggerHandler {}"); - Assert.assertEquals("TriggerHandler", toplevel.getSuperClassName()); + assertEquals("TriggerHandler", toplevel.getSuperClassName()); } @Test - public void testSuperClassName2() { + void testSuperClassName2() { ASTUserClass toplevel = (ASTUserClass) parse("public class AccountTriggerHandler extends Other.TriggerHandler {}"); - Assert.assertEquals("Other.TriggerHandler", toplevel.getSuperClassName()); + assertEquals("Other.TriggerHandler", toplevel.getSuperClassName()); } @Test - public void testInterfaces() { + void testInterfaces() { ASTUserClass toplevel = (ASTUserClass) parse("public class AccountTriggerHandler implements TriggerHandler, Other.Interface2 {}"); - Assert.assertEquals(Arrays.asList("TriggerHandler", "Other.Interface2"), toplevel.getInterfaceNames()); + assertEquals(Arrays.asList("TriggerHandler", "Other.Interface2"), toplevel.getInterfaceNames()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnumTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnumTest.java index 9284c78e43..406177cc70 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnumTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserEnumTest.java @@ -4,15 +4,16 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class ASTUserEnumTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTUserEnumTest extends ApexParserTestBase { @Test - public void testEnumName() { + void testEnumName() { ASTUserClass node = (ASTUserClass) parse("class Foo { enum Bar { } }"); ASTUserEnum enumNode = node.descendants(ASTUserEnum.class).firstOrThrow(); - Assert.assertEquals("Bar", enumNode.getSimpleName()); + assertEquals("Bar", enumNode.getSimpleName()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterfaceTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterfaceTest.java index 3d6eace318..1786022e8a 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterfaceTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserInterfaceTest.java @@ -4,33 +4,34 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; -public class ASTUserInterfaceTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTUserInterfaceTest extends ApexParserTestBase { @Test - public void testInterfaceName() { + void testInterfaceName() { ASTUserInterface node = (ASTUserInterface) parse("interface Foo { }"); - Assert.assertEquals("Foo", node.getSimpleName()); + assertEquals("Foo", node.getSimpleName()); } @Test - public void testInnerInterfaceName() { + void testInnerInterfaceName() { ASTUserClass node = (ASTUserClass) parse("class Foo { interface Bar { } }"); ASTUserInterface innerNode = node.descendants(ASTUserInterface.class).firstOrThrow(); - Assert.assertEquals("Bar", innerNode.getSimpleName()); + assertEquals("Bar", innerNode.getSimpleName()); } @Test - public void testSuperInterface() { + void testSuperInterface() { ASTUserInterface toplevel = (ASTUserInterface) parse("public interface CustomInterface extends A {}"); - Assert.assertEquals("A", toplevel.getSuperInterfaceName()); + assertEquals("A", toplevel.getSuperInterfaceName()); } @Test - public void testSuperInterface2() { + void testSuperInterface2() { ASTUserInterface toplevel = (ASTUserInterface) parse("public interface CustomInterface extends Other.A {}"); - Assert.assertEquals("Other.A", toplevel.getSuperInterfaceName()); + assertEquals("Other.A", toplevel.getSuperInterfaceName()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTriggerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTriggerTest.java index 728588cd61..0195fcb0d9 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTriggerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ASTUserTriggerTest.java @@ -4,21 +4,23 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ASTUserTriggerTest extends ApexParserTestBase { +class ASTUserTriggerTest extends ApexParserTestBase { @Test - public void testTriggerName() { + void testTriggerName() { ApexNode node = parse("trigger HelloWorldTrigger on Book__c (before insert, after update) {\n" + " Book__c[] books = Trigger.new;\n" + " MyHelloWorld.applyDiscount(books);\n" + "}\n"); - Assert.assertSame(ASTUserTrigger.class, node.getClass()); - Assert.assertEquals("HelloWorldTrigger", node.getImage()); + assertSame(ASTUserTrigger.class, node.getClass()); + assertEquals("HelloWorldTrigger", node.getImage()); ASTUserTrigger trigger = (ASTUserTrigger) node; - Assert.assertEquals("Book__c", trigger.getTargetName()); - Assert.assertEquals(Arrays.asList(TriggerUsage.AFTER_UPDATE, TriggerUsage.BEFORE_INSERT), trigger.getUsages()); + assertEquals("Book__c", trigger.getTargetName()); + assertEquals(Arrays.asList(TriggerUsage.AFTER_UPDATE, TriggerUsage.BEFORE_INSERT), trigger.getUsages()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerSoqlTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerSoqlTest.java index 32a4914fef..e585078d7f 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerSoqlTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerSoqlTest.java @@ -4,9 +4,9 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ApexCompilerSoqlTest extends ApexParserTestBase { +class ApexCompilerSoqlTest extends ApexParserTestBase { private static final String CODE = "public class Foo {\n" + " public List test1() {\n" @@ -15,7 +15,7 @@ public class ApexCompilerSoqlTest extends ApexParserTestBase { + "}\n"; @Test - public void testSoqlCompilation() { + void testSoqlCompilation() { apex.parse(CODE); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerTest.java index 320e82b234..107da7d444 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCompilerTest.java @@ -4,14 +4,16 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; -public class ApexCompilerTest extends ApexParserTestBase { +class ApexCompilerTest extends ApexParserTestBase { - @Test(expected = ParseException.class) - public void compileShouldFail() { - apex.parse("public class Foo { private String myField = \"a\"; }"); + @Test + void compileShouldFail() { + assertThrows(ParseException.class, () -> apex.parse("public class Foo { private String myField = \"a\"; }")); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexLexerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexLexerTest.java index df56adb9d5..79d6b0e17a 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexLexerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexLexerTest.java @@ -4,18 +4,20 @@ package net.sourceforge.pmd.lang.apex.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.Token; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import apex.jorje.data.ast.CompilationUnit; import apex.jorje.parser.impl.ApexLexer; import apex.jorje.parser.impl.ApexParser; -public class ApexLexerTest { +class ApexLexerTest { private static final String CODE = "public class Foo {\n" + " public List test1() {\n" @@ -24,7 +26,7 @@ public class ApexLexerTest { + "}\n"; @Test - public void testLexer() throws Exception { + void testLexer() throws Exception { CharStream in = new ANTLRStringStream(CODE); ApexLexer lexer = new ApexLexer(in); @@ -34,15 +36,15 @@ public class ApexLexerTest { tokenCount++; token = lexer.nextToken(); } - Assert.assertEquals(43, tokenCount); + assertEquals(43, tokenCount); } @Test - public void testParser() throws Exception { + void testParser() throws Exception { CharStream in = new ANTLRStringStream(CODE); ApexLexer lexer = new ApexLexer(in); ApexParser parser = new ApexParser(new CommonTokenStream(lexer)); CompilationUnit compilationUnit = parser.compilationUnit(); - Assert.assertNotNull(compilationUnit); + assertNotNull(compilationUnit); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java index 3bf160b1a1..b2b7215234 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java @@ -7,24 +7,24 @@ package net.sourceforge.pmd.lang.apex.ast; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertPosition; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.util.IOUtil; -public class ApexParserTest extends ApexParserTestBase { +class ApexParserTest extends ApexParserTestBase { @Test - public void understandsSimpleFile() { + void understandsSimpleFile() { // Setup String code = "@isTest\n" @@ -43,7 +43,7 @@ public class ApexParserTest extends ApexParserTestBase { } @Test - public void fileName() { + void fileName() { String code = "class Outer { class Inner {}}"; ASTUserClass rootNode = (ASTUserClass) parse(code, "src/filename.cls"); @@ -60,13 +60,13 @@ public class ApexParserTest extends ApexParserTestBase { + "}\n"; // line 6 @Test - public void verifyLineColumnNumbers() { + void verifyLineColumnNumbers() { ASTUserClassOrInterface rootNode = parse(testCodeForLineNumbers); assertLineNumbersForTestCode(rootNode); } @Test - public void verifyLineColumnNumbersWithWindowsLineEndings() { + void verifyLineColumnNumbersWithWindowsLineEndings() { String windowsLineEndings = testCodeForLineNumbers.replaceAll(" \n", "\r\n"); ASTUserClassOrInterface rootNode = parse(windowsLineEndings); assertLineNumbersForTestCode(rootNode); @@ -100,7 +100,7 @@ public class ApexParserTest extends ApexParserTestBase { } @Test - public void verifyEndLine() { + void verifyEndLine() { String code = "public class SimpleClass {\n" // line 1 + " public void method1() {\n" // line 2 @@ -112,16 +112,16 @@ public class ApexParserTest extends ApexParserTestBase { ASTUserClassOrInterface rootNode = parse(code); Node method1 = rootNode.getChild(1); - assertEquals("Wrong begin line", 2, method1.getBeginLine()); - assertEquals("Wrong end line", 3, method1.getEndLine()); + assertEquals(2, method1.getBeginLine(), "Wrong begin line"); + assertEquals(3, method1.getEndLine(), "Wrong end line"); Node method2 = rootNode.getChild(2); - assertEquals("Wrong begin line", 4, method2.getBeginLine()); - assertEquals("Wrong end line", 5, method2.getEndLine()); + assertEquals(4, method2.getBeginLine(), "Wrong begin line"); + assertEquals(5, method2.getEndLine(), "Wrong end line"); } @Test - public void checkComments() { + void checkComments() { String code = "public /** Comment on Class */ class SimpleClass {\n" // line 1 + " /** Comment on m1 */" @@ -149,14 +149,14 @@ public class ApexParserTest extends ApexParserTestBase { } @Test - public void parsesRealWorldClasses() throws Exception { + void parsesRealWorldClasses() throws Exception { File directory = new File("src/test/resources"); File[] fList = directory.listFiles(); for (File file : fList) { if (file.isFile() && file.getName().endsWith(".cls")) { String sourceCode = IOUtil.readFileToString(file, StandardCharsets.UTF_8); - Assert.assertNotNull(parse(sourceCode)); + assertNotNull(parse(sourceCode)); } } } @@ -166,7 +166,7 @@ public class ApexParserTest extends ApexParserTestBase { * @see [apex] PMD parsing exception for Apex classes using 'inherited sharing' keyword */ @Test - public void parseInheritedSharingClass() throws IOException { + void parseInheritedSharingClass() throws IOException { String source = IOUtil.readToString(ApexParserTest.class.getResourceAsStream("InheritedSharing.cls"), StandardCharsets.UTF_8); parse(source); @@ -178,17 +178,17 @@ public class ApexParserTest extends ApexParserTestBase { * @see #1485 [apex] Analysis of some apex classes cause a stackoverflow error */ @Test - public void stackOverflowDuringClassParsing() throws Exception { + void stackOverflowDuringClassParsing() throws Exception { String source = IOUtil.readToString(ApexParserTest.class.getResourceAsStream("StackOverflowClass.cls"), StandardCharsets.UTF_8); ASTUserClassOrInterface rootNode = parse(source); int count = visitPosition(rootNode, 0); - Assert.assertEquals(487, count); + assertEquals(487, count); } @Test - public void verifyLineColumnNumbersInnerClasses() throws Exception { + void verifyLineColumnNumbersInnerClasses() throws Exception { String source = IOUtil.readToString(ApexParserTest.class.getResourceAsStream("InnerClassLocations.cls"), StandardCharsets.UTF_8); source = source.replaceAll("\r\n", "\n"); @@ -196,20 +196,20 @@ public class ApexParserTest extends ApexParserTestBase { visitPosition(rootNode, 0); - Assert.assertEquals("InnerClassLocations", rootNode.getSimpleName()); + assertEquals("InnerClassLocations", rootNode.getSimpleName()); // Note: Apex parser doesn't provide positions for "public class" keywords. The // position of the UserClass node is just the identifier. So, the node starts // with the identifier and not with the first keyword in the file... assertPosition(rootNode, 1, 14, 16, 2); List classes = rootNode.descendants(ASTUserClass.class).toList(); - Assert.assertEquals(2, classes.size()); - Assert.assertEquals("bar1", classes.get(0).getSimpleName()); + assertEquals(2, classes.size()); + assertEquals("bar1", classes.get(0).getSimpleName()); List methods = classes.get(0).findChildrenOfType(ASTMethod.class); - Assert.assertEquals(2, methods.size()); // m() and synthetic clone() - Assert.assertEquals("m", methods.get(0).getImage()); + assertEquals(2, methods.size()); // m() and synthetic clone() + assertEquals("m", methods.get(0).getImage()); assertPosition(methods.get(0), 4, 21, 7, 9); - Assert.assertEquals("clone", methods.get(1).getImage()); + assertEquals("clone", methods.get(1).getImage()); assertPosition(methods.get(1), 7, 9, 7, 9); // Position of the first inner class: starts with the identifier "bar1" and ends with @@ -217,7 +217,7 @@ public class ApexParserTest extends ApexParserTestBase { // don't see this in the AST. assertPosition(classes.get(0), 3, 18, 7, 9); - Assert.assertEquals("bar2", classes.get(1).getImage()); + assertEquals("bar2", classes.get(1).getImage()); assertPosition(classes.get(1), 10, 18, 14, 9); } @@ -225,10 +225,10 @@ public class ApexParserTest extends ApexParserTestBase { private int visitPosition(Node node, int count) { int result = count + 1; - Assert.assertTrue(node.getBeginLine() > 0); - Assert.assertTrue(node.getBeginColumn() > 0); - Assert.assertTrue(node.getEndLine() > 0); - Assert.assertTrue(node.getEndColumn() > 0); + assertTrue(node.getBeginLine() > 0); + assertTrue(node.getBeginColumn() > 0); + assertTrue(node.getEndLine() > 0); + assertTrue(node.getEndColumn() > 0); for (int i = 0; i < node.getNumChildren(); i++) { result = visitPosition(node.getChild(i), result); } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexQualifiedNameTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexQualifiedNameTest.java index 4384b4cca2..3c5ccd5f6a 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexQualifiedNameTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexQualifiedNameTest.java @@ -4,21 +4,20 @@ package net.sourceforge.pmd.lang.apex.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.Test; /** * @author Clément Fournier */ -public class ApexQualifiedNameTest extends ApexParserTestBase { +class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testClass() { + void testClass() { ASTUserClass root = (ASTUserClass) parse("public class Foo {}"); ApexQualifiedName qname = root.getQualifiedName(); @@ -30,7 +29,7 @@ public class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testNestedClass() { + void testNestedClass() { ASTUserClass root = (ASTUserClass) parse("public class Foo { class Bar {}}"); ASTUserClass inner = root.descendants(ASTUserClass.class).firstOrThrow(); @@ -43,7 +42,7 @@ public class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testSimpleMethod() { + void testSimpleMethod() { ASTUserClass root = (ASTUserClass) parse("public class Foo { String foo() {}}"); ApexQualifiedName qname = root.descendants(ASTMethod.class).firstOrThrow().getQualifiedName(); assertEquals("c__Foo#foo()", qname.toString()); @@ -54,7 +53,7 @@ public class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testMethodWithArguments() { + void testMethodWithArguments() { ASTUserClass root = (ASTUserClass) parse("public class Foo { String foo(String h, Foo g) {}}"); ApexQualifiedName qname = root.descendants(ASTMethod.class).firstOrThrow().getQualifiedName(); assertEquals("c__Foo#foo(String, Foo)", qname.toString()); @@ -65,7 +64,7 @@ public class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testOverLoads() { + void testOverLoads() { ASTUserClass root = (ASTUserClass) parse("public class Foo { " + "String foo(String h) {} " + "String foo(int c) {}" @@ -82,7 +81,7 @@ public class ApexQualifiedNameTest extends ApexParserTestBase { @Test - public void testTrigger() { + void testTrigger() { ASTUserTrigger root = (ASTUserTrigger) parse("trigger myAccountTrigger on Account (before insert, before update) {}"); diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeDumpTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeDumpTest.java index 6ce49d352e..13f8b60c68 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeDumpTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeDumpTest.java @@ -5,15 +5,15 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter; -public class ApexTreeDumpTest extends BaseTreeDumpTest { +class ApexTreeDumpTest extends BaseTreeDumpTest { - public ApexTreeDumpTest() { + ApexTreeDumpTest() { super(new RelevantAttributePrinter(), ".cls"); } @@ -23,7 +23,7 @@ public class ApexTreeDumpTest extends BaseTreeDumpTest { } @Test - public void safeNavigationOperator() { + void safeNavigationOperator() { doTest("SafeNavigationOperator"); } } From cb70ab5268aed4e683db9f5dbccc90204a542db7 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 1 Jul 2022 10:11:58 +0200 Subject: [PATCH 02/31] [apex] Migrate tests to JUnit5 --- pmd-apex/pom.xml | 2 +- .../pmd/lang/apex/DefaultRulesetTest.java | 28 +++++---- .../pmd/lang/apex/SuppressWarningsTest.java | 36 +++++------ .../apex/metrics/impl/AllMetricsTest.java | 2 +- .../multifile/ApexMultifileAnalysisTest.java | 61 ++++++++++--------- .../lang/apex/rule/AbstractApexRuleTest.java | 12 ++-- .../pmd/lang/apex/rule/ApexXPathRuleTest.java | 8 +-- ...pexAssertionsShouldIncludeMessageTest.java | 2 +- ...pexUnitTestClassShouldHaveAssertsTest.java | 2 +- ...tMethodShouldHaveIsTestAnnotationTest.java | 2 +- ...nitTestShouldNotUseSeeAllDataTrueTest.java | 2 +- .../AvoidGlobalModifierTest.java | 2 +- .../AvoidLogicInTriggerTest.java | 2 +- .../DebugsShouldUseLoggingLevelTest.java | 2 +- .../UnusedLocalVariableTest.java | 2 +- .../codestyle/ClassNamingConventionsTest.java | 2 +- .../FieldDeclarationsShouldBeAtStartTest.java | 2 +- .../codestyle/FieldNamingConventionsTest.java | 2 +- .../codestyle/ForLoopsMustUseBracesTest.java | 2 +- .../FormalParameterNamingConventionsTest.java | 2 +- .../IfElseStmtsMustUseBracesTest.java | 2 +- .../codestyle/IfStmtsMustUseBracesTest.java | 2 +- .../LocalVariableNamingConventionsTest.java | 2 +- .../MethodNamingConventionsTest.java | 2 +- .../codestyle/OneDeclarationPerLineTest.java | 2 +- .../PropertyNamingConventionsTest.java | 2 +- .../WhileLoopsMustUseBracesTest.java | 2 +- .../design/AvoidDeeplyNestedIfStmtsTest.java | 2 +- .../rule/design/CognitiveComplexityTest.java | 3 +- .../rule/design/CyclomaticComplexityTest.java | 3 +- .../rule/design/ExcessiveClassLengthTest.java | 2 +- .../design/ExcessiveParameterListTest.java | 2 +- .../rule/design/ExcessivePublicCountTest.java | 2 +- .../rule/design/NcssConstructorCountTest.java | 2 +- .../apex/rule/design/NcssMethodCountTest.java | 2 +- .../apex/rule/design/NcssTypeCountTest.java | 2 +- .../apex/rule/design/TooManyFieldsTest.java | 2 +- .../apex/rule/documentation/ApexDocTest.java | 2 +- .../apex/rule/errorprone/ApexCSRFTest.java | 2 +- .../AvoidDirectAccessTriggerMapTest.java | 2 +- .../errorprone/AvoidHardcodingIdTest.java | 2 +- .../AvoidNonExistentAnnotationsTest.java | 2 +- .../rule/errorprone/EmptyCatchBlockTest.java | 2 +- .../apex/rule/errorprone/EmptyIfStmtTest.java | 2 +- .../errorprone/EmptyStatementBlockTest.java | 2 +- .../EmptyTryOrFinallyBlockTest.java | 2 +- .../rule/errorprone/EmptyWhileStmtTest.java | 2 +- .../InaccessibleAuraEnabledGetterTest.java | 2 +- ...ethodWithSameNameAsEnclosingClassTest.java | 2 +- .../OverrideBothEqualsAndHashcodeTest.java | 2 +- .../TestMethodsMustBeInTestClassesTest.java | 2 +- .../performance/AvoidDebugStatementsTest.java | 2 +- .../AvoidDmlStatementsInLoopsTest.java | 2 +- .../performance/AvoidSoqlInLoopsTest.java | 2 +- .../performance/AvoidSoslInLoopsTest.java | 2 +- ...agerlyLoadedDescribeSObjectResultTest.java | 2 +- .../OperationWithLimitsInLoopTest.java | 2 +- .../apex/rule/security/ApexBadCryptoTest.java | 2 +- .../rule/security/ApexCRUDViolationTest.java | 2 +- .../security/ApexDangerousMethodsTest.java | 2 +- .../security/ApexInsecureEndpointTest.java | 2 +- .../rule/security/ApexOpenRedirectTest.java | 2 +- .../rule/security/ApexSOQLInjectionTest.java | 2 +- .../ApexSharingViolationsNestedClassTest.java | 46 ++++---------- .../security/ApexSharingViolationsTest.java | 2 +- .../ApexSuggestUsingNamedCredTest.java | 2 +- .../security/ApexXSSFromEscapeFalseTest.java | 2 +- .../security/ApexXSSFromURLParamTest.java | 2 +- 68 files changed, 151 insertions(+), 166 deletions(-) diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 08f0ea8b2a..8e607d3441 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -84,7 +84,7 @@ com.github.stefanbirkner - system-rules + system-lambda test diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java index d59ebf19b8..9f8dd289b3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/DefaultRulesetTest.java @@ -4,29 +4,31 @@ package net.sourceforge.pmd.lang.apex; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.SystemErrRule; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.RuleSet; import net.sourceforge.pmd.RuleSetLoader; -public class DefaultRulesetTest { - @Rule - public final SystemErrRule systemErrRule = new SystemErrRule().enableLog().muteForSuccessfulTests(); +import com.github.stefanbirkner.systemlambda.SystemLambda; + +class DefaultRulesetTest { @Test - public void loadDefaultRuleset() { + void loadDefaultRuleset() { RuleSet ruleset = rulesetLoader().loadFromResource("rulesets/apex/ruleset.xml"); - Assert.assertNotNull(ruleset); + assertNotNull(ruleset); } @Test - public void loadQuickstartRuleset() { - RuleSet ruleset = rulesetLoader().loadFromResource("rulesets/apex/quickstart.xml"); - Assert.assertNotNull(ruleset); - Assert.assertTrue("No Logging expected", systemErrRule.getLog().isEmpty()); + void loadQuickstartRuleset() throws Exception { + String log = SystemLambda.tapSystemErr(() -> { + RuleSet ruleset = rulesetLoader().loadFromResource("rulesets/apex/quickstart.xml"); + assertNotNull(ruleset); + }); + assertTrue(log.isEmpty(), "No Logging expected"); } private RuleSetLoader rulesetLoader() { diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java index abe3d1cad0..17c5eebf7d 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java @@ -6,11 +6,11 @@ package net.sourceforge.pmd.lang.apex; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.Report; @@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.apex.ast.ASTUserClass; import net.sourceforge.pmd.lang.apex.ast.ApexParserTestBase; import net.sourceforge.pmd.lang.apex.rule.AbstractApexRule; -public class SuppressWarningsTest extends ApexParserTestBase { +class SuppressWarningsTest extends ApexParserTestBase { // This could be a regular xml test @@ -45,7 +45,7 @@ public class SuppressWarningsTest extends ApexParserTestBase { } @Test - public void testClassLevelSuppression() { + void testClassLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST1); assertSize(rpt, 0); rpt = apex.executeRule(new FooRule(), TEST2); @@ -53,86 +53,86 @@ public class SuppressWarningsTest extends ApexParserTestBase { } @Test - public void testInheritedSuppression() { + void testInheritedSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST3); assertSize(rpt, 0); } @Test - public void testMethodLevelSuppression() { + void testMethodLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST4); assertSize(rpt, 1); } @Test - public void testConstructorLevelSuppression() { + void testConstructorLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST5); assertSize(rpt, 0); } @Test - public void testFieldLevelSuppression() { + void testFieldLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST6); assertSize(rpt, 1); } @Test - public void testParameterLevelSuppression() { + void testParameterLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST7); assertSize(rpt, 1); } @Test - public void testLocalVariableLevelSuppression() { + void testLocalVariableLevelSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST8); assertSize(rpt, 1); } @Test - public void testSpecificSuppression() { + void testSpecificSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST9); assertSize(rpt, 1); } @Test - public void testSpecificSuppressionMulitpleValues() { + void testSpecificSuppressionMulitpleValues() { Report rpt = apex.executeRule(new FooRule(), TEST9_MULTIPLE_VALUES); assertSize(rpt, 0); } @Test - public void testNoSuppressionBlank() { + void testNoSuppressionBlank() { Report rpt = apex.executeRule(new FooRule(), TEST10); assertSize(rpt, 2); } @Test - public void testNoSuppressionSomethingElseS() { + void testNoSuppressionSomethingElseS() { Report rpt = apex.executeRule(new FooRule(), TEST11); assertSize(rpt, 2); } @Test - public void testSuppressAll() { + void testSuppressAll() { Report rpt = apex.executeRule(new FooRule(), TEST12); assertSize(rpt, 0); } @Test - public void testSpecificSuppressionAtTopLevel() { + void testSpecificSuppressionAtTopLevel() { Report rpt = apex.executeRule(new BarRule(), TEST13); assertSize(rpt, 0); } @Test - public void testCommentSuppression() { + void testCommentSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST14); assertSize(rpt, 0); assertSuppressed(rpt, 1); } @Test - public void testMessageWithCommentSuppression() { + void testMessageWithCommentSuppression() { Report rpt = apex.executeRule(new FooRule(), TEST15); assertSize(rpt, 0); diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java index f0b8d664cc..2936a9d81a 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/AllMetricsTest.java @@ -13,7 +13,7 @@ import net.sourceforge.pmd.testframework.SimpleAggregatorTst; * * @author Clément Fournier */ -public class AllMetricsTest extends SimpleAggregatorTst { +class AllMetricsTest extends SimpleAggregatorTst { private static final String RULESET = "rulesets/apex/metrics_test.xml"; diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java index 7f3effa2b7..b2b54727e6 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java @@ -6,70 +6,73 @@ package net.sourceforge.pmd.lang.apex.multifile; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsStringIgnoringCase; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +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; +import java.nio.file.Path; import java.util.Arrays; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.SystemErrRule; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import net.sourceforge.pmd.util.IOUtil; +import com.github.stefanbirkner.systemlambda.SystemLambda; + public class ApexMultifileAnalysisTest { - @Rule - public final SystemErrRule systemErrRule = new SystemErrRule().muteForSuccessfulTests().enableLog(); - - @Rule - public final TemporaryFolder tempFolder = new TemporaryFolder(); + @TempDir + private Path tempFolder; @Test - public void testNoSfdxProjectJsonProducesFailedAnalysis() { - ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); + void testNoSfdxProjectJsonProducesFailedAnalysis() throws Exception { + String log = SystemLambda.tapSystemErr(() -> { + ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); - assertTrue(analysisInstance.isFailed()); - assertTrue(analysisInstance.getFileIssues("any file").isEmpty()); - assertThat(systemErrRule.getLog(), containsStringIgnoringCase("Missing project file")); + assertTrue(analysisInstance.isFailed()); + assertTrue(analysisInstance.getFileIssues("any file").isEmpty()); + }); + assertThat(log, containsStringIgnoringCase("Missing project file")); } @Test - public void testMalformedSfdxProjectJsonProducesFailedAnalysis() throws IOException { + void testMalformedSfdxProjectJsonProducesFailedAnalysis() throws Exception { copyResource("malformedSfdxFile.json", "sfdx-project.json"); - ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); + String log = SystemLambda.tapSystemErr(() -> { + ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); - assertTrue(analysisInstance.isFailed()); - assertTrue(analysisInstance.getFileIssues("any file").isEmpty()); - assertThat(systemErrRule.getLog(), + assertTrue(analysisInstance.isFailed()); + assertTrue(analysisInstance.getFileIssues("any file").isEmpty()); + }); + assertThat(log, containsStringIgnoringCase("error: 'path' is required for all 'packageDirectories' elements")); } @Test - public void testWellFormedSfdxProjectJsonProducesFunctionalAnalysis() throws IOException { + void testWellFormedSfdxProjectJsonProducesFunctionalAnalysis() throws Exception { copyResource("correctSfdxFile.json", "sfdx-project.json"); - ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); + String log = SystemLambda.tapSystemErr(() -> { + ApexMultifileAnalysis analysisInstance = getAnalysisForTempFolder(); - assertFalse(analysisInstance.isFailed()); - assertTrue(systemErrRule.getLog().isEmpty()); + assertFalse(analysisInstance.isFailed()); + }); + assertTrue(log.isEmpty()); } private @NonNull ApexMultifileAnalysis getAnalysisForTempFolder() { - return ApexMultifileAnalysis.getAnalysisInstance(tempFolder.getRoot().getAbsolutePath()); + return ApexMultifileAnalysis.getAnalysisInstance(tempFolder.toAbsolutePath().toString()); } private void copyResource(String resourcePath, String relativePathInTempDir) throws IOException { - File file = tempFolder.newFile(relativePathInTempDir); + Path file = tempFolder.resolve(relativePathInTempDir); String fileContents = IOUtil.readToString(getClass().getResourceAsStream(resourcePath), StandardCharsets.UTF_8); - Files.write(file.toPath(), Arrays.asList(fileContents.split("\\R").clone())); + Files.write(file, Arrays.asList(fileContents.split("\\R").clone())); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRuleTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRuleTest.java index bbc3a29a1a..cf2f2c3d6b 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRuleTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRuleTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Report; import net.sourceforge.pmd.lang.apex.ast.ASTAnonymousClass; @@ -15,25 +15,25 @@ import net.sourceforge.pmd.lang.apex.ast.ASTUserTrigger; import net.sourceforge.pmd.lang.apex.ast.ApexParserTestBase; import net.sourceforge.pmd.lang.ast.test.TestUtilsKt; -public class AbstractApexRuleTest extends ApexParserTestBase { +class AbstractApexRuleTest extends ApexParserTestBase { @Test - public void shouldVisitTopLevelClass() { + void shouldVisitTopLevelClass() { run("class Foo { }"); } @Test - public void shouldVisitTopLevelInterface() { + void shouldVisitTopLevelInterface() { run("interface Foo { }"); } @Test - public void shouldVisitTopLevelTrigger() { + void shouldVisitTopLevelTrigger() { run("trigger Foo on Account (before insert, before update) { }"); } @Test - public void shouldVisitTopLevelEnum() { + void shouldVisitTopLevelEnum() { run("enum Foo { }"); } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRuleTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRuleTest.java index b90d4a26ce..a0286ca0f7 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRuleTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRuleTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.apex.rule; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Report; import net.sourceforge.pmd.lang.LanguageRegistry; @@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.rule.xpath.XPathVersion; /** * @author daniels */ -public class ApexXPathRuleTest extends ApexParserTestBase { +class ApexXPathRuleTest extends ApexParserTestBase { private XPathRule makeXPath(String expression) { XPathRule rule = new XPathRule(XPathVersion.XPATH_2_0, expression); @@ -29,7 +29,7 @@ public class ApexXPathRuleTest extends ApexParserTestBase { @Test - public void testFileNameInXpath() { + void testFileNameInXpath() { Report report = apex.executeRule(makeXPath("/UserClass[pmd:fileName() = 'Foo.cls']"), "class Foo {}", "src/Foo.cls"); @@ -38,7 +38,7 @@ public class ApexXPathRuleTest extends ApexParserTestBase { } @Test - public void testBooleanExpressions() { + void testBooleanExpressions() { Report report = apex.executeRuleOnResource(makeXPath("//BooleanExpression[@Operator='&&']"), "BooleanExpressions.cls"); assertSize(report, 1); diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexAssertionsShouldIncludeMessageTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexAssertionsShouldIncludeMessageTest.java index 8b9464e9e9..46ab3aff19 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexAssertionsShouldIncludeMessageTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexAssertionsShouldIncludeMessageTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexAssertionsShouldIncludeMessageTest extends PmdRuleTst { +class ApexAssertionsShouldIncludeMessageTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveAssertsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveAssertsTest.java index 5c3d68226e..8da6170cb0 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveAssertsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveAssertsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexUnitTestClassShouldHaveAssertsTest extends PmdRuleTst { +class ApexUnitTestClassShouldHaveAssertsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestMethodShouldHaveIsTestAnnotationTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestMethodShouldHaveIsTestAnnotationTest.java index b753e8fb8a..983448dce7 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestMethodShouldHaveIsTestAnnotationTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestMethodShouldHaveIsTestAnnotationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexUnitTestMethodShouldHaveIsTestAnnotationTest extends PmdRuleTst { +class ApexUnitTestMethodShouldHaveIsTestAnnotationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestShouldNotUseSeeAllDataTrueTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestShouldNotUseSeeAllDataTrueTest.java index 00084bc52e..150bcfecd6 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestShouldNotUseSeeAllDataTrueTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestShouldNotUseSeeAllDataTrueTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexUnitTestShouldNotUseSeeAllDataTrueTest extends PmdRuleTst { +class ApexUnitTestShouldNotUseSeeAllDataTrueTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidGlobalModifierTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidGlobalModifierTest.java index 6a1780bfc9..eff39e8739 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidGlobalModifierTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidGlobalModifierTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidGlobalModifierTest extends PmdRuleTst { +class AvoidGlobalModifierTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidLogicInTriggerTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidLogicInTriggerTest.java index 08cfa53ada..21cd2021d9 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidLogicInTriggerTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/AvoidLogicInTriggerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidLogicInTriggerTest extends PmdRuleTst { +class AvoidLogicInTriggerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/DebugsShouldUseLoggingLevelTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/DebugsShouldUseLoggingLevelTest.java index 4632c9a051..939ad1b510 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/DebugsShouldUseLoggingLevelTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/DebugsShouldUseLoggingLevelTest.java @@ -7,6 +7,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DebugsShouldUseLoggingLevelTest extends PmdRuleTst { +class DebugsShouldUseLoggingLevelTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/UnusedLocalVariableTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/UnusedLocalVariableTest.java index cef1960afc..fe40d55ecc 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/UnusedLocalVariableTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/UnusedLocalVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedLocalVariableTest extends PmdRuleTst { +class UnusedLocalVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsTest.java index 6e44c82f66..0ebe54c2a2 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ClassNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ClassNamingConventionsTest extends PmdRuleTst { +class ClassNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldDeclarationsShouldBeAtStartTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldDeclarationsShouldBeAtStartTest.java index c22140d52d..3a3224f1dc 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldDeclarationsShouldBeAtStartTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldDeclarationsShouldBeAtStartTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FieldDeclarationsShouldBeAtStartTest extends PmdRuleTst { +class FieldDeclarationsShouldBeAtStartTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldNamingConventionsTest.java index 823a7f32fc..cc04dbc5ca 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FieldNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FieldNamingConventionsTest extends PmdRuleTst { +class FieldNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ForLoopsMustUseBracesTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ForLoopsMustUseBracesTest.java index 32e64fa7c8..22891df41c 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ForLoopsMustUseBracesTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/ForLoopsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ForLoopsMustUseBracesTest extends PmdRuleTst { +class ForLoopsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FormalParameterNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FormalParameterNamingConventionsTest.java index 45dba2964e..79561ea4a8 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FormalParameterNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/FormalParameterNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FormalParameterNamingConventionsTest extends PmdRuleTst { +class FormalParameterNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfElseStmtsMustUseBracesTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfElseStmtsMustUseBracesTest.java index 8c118c38d7..a5b04aaf90 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfElseStmtsMustUseBracesTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfElseStmtsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IfElseStmtsMustUseBracesTest extends PmdRuleTst { +class IfElseStmtsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfStmtsMustUseBracesTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfStmtsMustUseBracesTest.java index 049d251fbd..8d91dd649b 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfStmtsMustUseBracesTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/IfStmtsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IfStmtsMustUseBracesTest extends PmdRuleTst { +class IfStmtsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/LocalVariableNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/LocalVariableNamingConventionsTest.java index 6ddf91a354..0915626fce 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/LocalVariableNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/LocalVariableNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LocalVariableNamingConventionsTest extends PmdRuleTst { +class LocalVariableNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsTest.java index 2be02e5acb..291fa815fc 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/MethodNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodNamingConventionsTest extends PmdRuleTst { +class MethodNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/OneDeclarationPerLineTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/OneDeclarationPerLineTest.java index fa97125829..37fbf81509 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/OneDeclarationPerLineTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/OneDeclarationPerLineTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OneDeclarationPerLineTest extends PmdRuleTst { +class OneDeclarationPerLineTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/PropertyNamingConventionsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/PropertyNamingConventionsTest.java index 413e80ed09..6e78c8d37f 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/PropertyNamingConventionsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/PropertyNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class PropertyNamingConventionsTest extends PmdRuleTst { +class PropertyNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/WhileLoopsMustUseBracesTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/WhileLoopsMustUseBracesTest.java index e5a005e726..03b7109932 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/WhileLoopsMustUseBracesTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/codestyle/WhileLoopsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class WhileLoopsMustUseBracesTest extends PmdRuleTst { +class WhileLoopsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsTest.java index abf3e78e0c..5002fe75d2 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/AvoidDeeplyNestedIfStmtsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDeeplyNestedIfStmtsTest extends PmdRuleTst { +class AvoidDeeplyNestedIfStmtsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityTest.java index 3258d92160..07ece5a9a3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CognitiveComplexityTest extends PmdRuleTst { +class CognitiveComplexityTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityTest.java index 50ffb556ea..e0c5c3696d 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CyclomaticComplexityTest extends PmdRuleTst { +class CyclomaticComplexityTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveClassLengthTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveClassLengthTest.java index 5cde5c180c..99b4becd66 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveClassLengthTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveClassLengthTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveClassLengthTest extends PmdRuleTst { +class ExcessiveClassLengthTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListTest.java index d2263e88b6..78bb4a0c43 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessiveParameterListTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveParameterListTest extends PmdRuleTst { +class ExcessiveParameterListTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountTest.java index 20a52344b1..256d0f3847 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/ExcessivePublicCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessivePublicCountTest extends PmdRuleTst { +class ExcessivePublicCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssConstructorCountTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssConstructorCountTest.java index ec837f8518..100985cb5c 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssConstructorCountTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssConstructorCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NcssConstructorCountTest extends PmdRuleTst { +class NcssConstructorCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssMethodCountTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssMethodCountTest.java index 8f9b35c018..af10fcdbfd 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssMethodCountTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssMethodCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NcssMethodCountTest extends PmdRuleTst { +class NcssMethodCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssTypeCountTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssTypeCountTest.java index 3416a142c9..92ec3a77be 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssTypeCountTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/NcssTypeCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NcssTypeCountTest extends PmdRuleTst { +class NcssTypeCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/TooManyFieldsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/TooManyFieldsTest.java index 71becae7c6..cdd02ad007 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/TooManyFieldsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/design/TooManyFieldsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TooManyFieldsTest extends PmdRuleTst { +class TooManyFieldsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/documentation/ApexDocTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/documentation/ApexDocTest.java index 93273a11ad..080b396560 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/documentation/ApexDocTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/documentation/ApexDocTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.documentation; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexDocTest extends PmdRuleTst { +class ApexDocTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/ApexCSRFTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/ApexCSRFTest.java index 5549abc726..85f7f104e0 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/ApexCSRFTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/ApexCSRFTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexCSRFTest extends PmdRuleTst { +class ApexCSRFTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidDirectAccessTriggerMapTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidDirectAccessTriggerMapTest.java index fbe6cd530e..09f59fac05 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidDirectAccessTriggerMapTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidDirectAccessTriggerMapTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDirectAccessTriggerMapTest extends PmdRuleTst { +class AvoidDirectAccessTriggerMapTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidHardcodingIdTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidHardcodingIdTest.java index 51f261aec0..2a88bb417b 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidHardcodingIdTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidHardcodingIdTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidHardcodingIdTest extends PmdRuleTst { +class AvoidHardcodingIdTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidNonExistentAnnotationsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidNonExistentAnnotationsTest.java index 45139b9d0a..b6519db2cd 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidNonExistentAnnotationsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/AvoidNonExistentAnnotationsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidNonExistentAnnotationsTest extends PmdRuleTst { +class AvoidNonExistentAnnotationsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyCatchBlockTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyCatchBlockTest.java index a6c0dc0cea..1bc971edbc 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyCatchBlockTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyCatchBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyCatchBlockTest extends PmdRuleTst { +class EmptyCatchBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyIfStmtTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyIfStmtTest.java index cc8f0a982e..4c131f7cd4 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyIfStmtTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyIfStmtTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyIfStmtTest extends PmdRuleTst { +class EmptyIfStmtTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyStatementBlockTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyStatementBlockTest.java index 7a39e1aba5..44cad0042f 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyStatementBlockTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyStatementBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyStatementBlockTest extends PmdRuleTst { +class EmptyStatementBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyTryOrFinallyBlockTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyTryOrFinallyBlockTest.java index d2d24d91af..1e68857b57 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyTryOrFinallyBlockTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyTryOrFinallyBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyTryOrFinallyBlockTest extends PmdRuleTst { +class EmptyTryOrFinallyBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyWhileStmtTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyWhileStmtTest.java index 3a98d7a9cd..a7a297124d 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyWhileStmtTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/EmptyWhileStmtTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyWhileStmtTest extends PmdRuleTst { +class EmptyWhileStmtTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/InaccessibleAuraEnabledGetterTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/InaccessibleAuraEnabledGetterTest.java index 61ee79a54f..31e1ebd383 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/InaccessibleAuraEnabledGetterTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/InaccessibleAuraEnabledGetterTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InaccessibleAuraEnabledGetterTest extends PmdRuleTst { +class InaccessibleAuraEnabledGetterTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java index 87e1ce6431..3a15b5dae8 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodWithSameNameAsEnclosingClassTest extends PmdRuleTst { +class MethodWithSameNameAsEnclosingClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java index 0b334a5f9f..29ab1310c3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst { +class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/TestMethodsMustBeInTestClassesTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/TestMethodsMustBeInTestClassesTest.java index 6557797677..1d4f6539a5 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/TestMethodsMustBeInTestClassesTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/errorprone/TestMethodsMustBeInTestClassesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TestMethodsMustBeInTestClassesTest extends PmdRuleTst { +class TestMethodsMustBeInTestClassesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDebugStatementsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDebugStatementsTest.java index 53aa68ae84..38e591773e 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDebugStatementsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDebugStatementsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDebugStatementsTest extends PmdRuleTst { +class AvoidDebugStatementsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDmlStatementsInLoopsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDmlStatementsInLoopsTest.java index e63930e585..9ceb16e5d1 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDmlStatementsInLoopsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidDmlStatementsInLoopsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDmlStatementsInLoopsTest extends PmdRuleTst { +class AvoidDmlStatementsInLoopsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoqlInLoopsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoqlInLoopsTest.java index cec9d93bf4..af15d9ce39 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoqlInLoopsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoqlInLoopsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidSoqlInLoopsTest extends PmdRuleTst { +class AvoidSoqlInLoopsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoslInLoopsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoslInLoopsTest.java index ce3a33a7c8..c0657a5904 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoslInLoopsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/AvoidSoslInLoopsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidSoslInLoopsTest extends PmdRuleTst { +class AvoidSoslInLoopsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/EagerlyLoadedDescribeSObjectResultTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/EagerlyLoadedDescribeSObjectResultTest.java index 3a50ee847e..ddc191c0a6 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/EagerlyLoadedDescribeSObjectResultTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/EagerlyLoadedDescribeSObjectResultTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EagerlyLoadedDescribeSObjectResultTest extends PmdRuleTst { +class EagerlyLoadedDescribeSObjectResultTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithLimitsInLoopTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithLimitsInLoopTest.java index 56a609bad8..e80764adbc 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithLimitsInLoopTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithLimitsInLoopTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OperationWithLimitsInLoopTest extends PmdRuleTst { +class OperationWithLimitsInLoopTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexBadCryptoTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexBadCryptoTest.java index 05134ff78c..280a1c8cb2 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexBadCryptoTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexBadCryptoTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexBadCryptoTest extends PmdRuleTst { +class ApexBadCryptoTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexCRUDViolationTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexCRUDViolationTest.java index 4d4e8a6e22..c6310ba371 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexCRUDViolationTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexCRUDViolationTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexCRUDViolationTest extends PmdRuleTst { +class ApexCRUDViolationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsTest.java index 74fe589b3d..8796b360a4 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexDangerousMethodsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexDangerousMethodsTest extends PmdRuleTst { +class ApexDangerousMethodsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexInsecureEndpointTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexInsecureEndpointTest.java index c118cbb916..000e2544c3 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexInsecureEndpointTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexInsecureEndpointTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexInsecureEndpointTest extends PmdRuleTst { +class ApexInsecureEndpointTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexOpenRedirectTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexOpenRedirectTest.java index 5cf72744fa..4108b3b9a0 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexOpenRedirectTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexOpenRedirectTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexOpenRedirectTest extends PmdRuleTst { +class ApexOpenRedirectTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSOQLInjectionTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSOQLInjectionTest.java index a9a619d356..cde095f6e4 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSOQLInjectionTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSOQLInjectionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexSOQLInjectionTest extends PmdRuleTst { +class ApexSOQLInjectionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java index 4d87add0c5..dd2ae6531b 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsNestedClassTest.java @@ -4,16 +4,15 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import net.sourceforge.pmd.Report; import net.sourceforge.pmd.RuleViolation; @@ -27,8 +26,7 @@ import net.sourceforge.pmd.lang.apex.ast.ApexParserTestBase; * based on the boolean permutations. Any classes that includes data access cod, but doesn't declare a sharing setting * should trigger a violation.

*/ -@RunWith(Parameterized.class) -public class ApexSharingViolationsNestedClassTest extends ApexParserTestBase { +class ApexSharingViolationsNestedClassTest extends ApexParserTestBase { /** * Type of operation that may require a sharing declaration. */ @@ -56,45 +54,25 @@ public class ApexSharingViolationsNestedClassTest extends ApexParserTestBase { /** * The permutations used for class generation. See {@link #generateClass(boolean, Operation, boolean, Operation)} */ - private final boolean outerSharingDeclared; - private final Operation outerOperation; - private final boolean innerSharingDeclared; - private final Operation innerOperation; - - /** - * Track the expected violations based on the permutations. - */ - private final int expectedViolations; - private final List expectedLineNumbers; - - public ApexSharingViolationsNestedClassTest(boolean outerSharingDeclared, Operation outerOperation, - boolean innerSharingDeclared, Operation innerOperation, - int expectedViolations, List expectedLineNumbers) { - this.outerSharingDeclared = outerSharingDeclared; - this.outerOperation = outerOperation; - this.innerSharingDeclared = innerSharingDeclared; - this.innerOperation = innerOperation; - this.expectedViolations = expectedViolations; - this.expectedLineNumbers = expectedLineNumbers; - } - - @Test - public void testSharingPermutation() { + @ParameterizedTest + @MethodSource("data") + void testSharingPermutation(boolean outerSharingDeclared, Operation outerOperation, + boolean innerSharingDeclared, Operation innerOperation, + int expectedViolations, List expectedLineNumbers) { String apexClass = generateClass(outerSharingDeclared, outerOperation, innerSharingDeclared, innerOperation); ApexSharingViolationsRule rule = new ApexSharingViolationsRule(); rule.setMessage("a message"); Report rpt = apex.executeRule(rule, apexClass); List violations = rpt.getViolations(); - assertEquals("Unexpected Violation Size\n" + apexClass, expectedViolations, violations.size()); + assertEquals(expectedViolations, violations.size(), "Unexpected Violation Size\n" + apexClass); List lineNumbers = violations.stream().map(v -> v.getBeginLine()).collect(Collectors.toList()); - assertEquals("Unexpected Line Numbers\n" + apexClass, expectedLineNumbers, lineNumbers); + assertEquals(expectedLineNumbers, lineNumbers, "Unexpected Line Numbers\n" + apexClass); } /** * Parameter provider that covers are all permutations */ - @Parameterized.Parameters - public static Collection data() { + static Collection data() { List data = new ArrayList<>(); boolean[] boolPermutations = {false, true}; diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsTest.java index e083382550..2e918f1e56 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSharingViolationsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexSharingViolationsTest extends PmdRuleTst { +class ApexSharingViolationsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSuggestUsingNamedCredTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSuggestUsingNamedCredTest.java index 231f15313e..442ed24f96 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSuggestUsingNamedCredTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexSuggestUsingNamedCredTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexSuggestUsingNamedCredTest extends PmdRuleTst { +class ApexSuggestUsingNamedCredTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromEscapeFalseTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromEscapeFalseTest.java index 9acbd35642..6ede53430d 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromEscapeFalseTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromEscapeFalseTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexXSSFromEscapeFalseTest extends PmdRuleTst { +class ApexXSSFromEscapeFalseTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromURLParamTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromURLParamTest.java index a0f8bdc72d..0286092d14 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromURLParamTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/security/ApexXSSFromURLParamTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.apex.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ApexXSSFromURLParamTest extends PmdRuleTst { +class ApexXSSFromURLParamTest extends PmdRuleTst { // no additional unit tests } From 02db84a48c17595e865cf8a16b49504ad05d3370 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:15:09 +0200 Subject: [PATCH 03/31] [cpp] Migrate tests to JUnit5 --- pmd-apex/pom.xml | 5 -- pmd-cpp/pom.xml | 4 +- .../sourceforge/pmd/cpd/CPPTokenizerTest.java | 48 +++++++++---------- .../pmd/lang/cpp/ast/CppCharStreamTest.java | 12 ++--- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/pmd-apex/pom.xml b/pmd-apex/pom.xml index 8e607d3441..9e1d37e0be 100644 --- a/pmd-apex/pom.xml +++ b/pmd-apex/pom.xml @@ -72,11 +72,6 @@ hamcrest test - - junit - junit - test - org.junit.jupiter junit-jupiter diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index 06093bc6d9..beb01403db 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -74,8 +74,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java index 899f7f3af8..b4746b7f64 100644 --- a/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java +++ b/pmd-cpp/src/test/java/net/sourceforge/pmd/cpd/CPPTokenizerTest.java @@ -4,17 +4,17 @@ package net.sourceforge.pmd.cpd; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class CPPTokenizerTest extends CpdTextComparisonTest { +class CPPTokenizerTest extends CpdTextComparisonTest { - public CPPTokenizerTest() { + CPPTokenizerTest() { super(".cpp"); } @@ -36,106 +36,106 @@ public class CPPTokenizerTest extends CpdTextComparisonTest { } @Test - public void testUTFwithBOM() { + void testUTFwithBOM() { Tokenizer tokenizer = newTokenizer(dontSkipBlocks()); Tokens tokens = tokenize(tokenizer, "\ufeffint start()\n{ int ret = 1;\nreturn ret;\n}\n"); assertEquals(15, tokens.size()); } @Test - public void testContinuation() { + void testContinuation() { doTest("continuation"); } @Test - public void testContinuationInIdent() { + void testContinuationInIdent() { doTest("continuation_intra_token"); } @Test - public void testContinuationBetweenTokens() { + void testContinuationBetweenTokens() { doTest("continuation_inter_token"); } @Test - public void testUnicodeStringSupport() { + void testUnicodeStringSupport() { doTest("unicodeStrings"); } @Test - public void testIgnoreBetweenSpecialComments() { + void testIgnoreBetweenSpecialComments() { doTest("specialComments"); } @Test - public void testMultiLineMacros() { + void testMultiLineMacros() { doTest("multilineMacros"); } @Test - public void testIdentifierValidChars() { + void testIdentifierValidChars() { doTest("identifierChars"); } @Test - public void testWrongUnicodeInIdentifier() { + void testWrongUnicodeInIdentifier() { expectTokenMgrError(" void main() { int ⚜ = __; }"); } @Test - public void testTokenizerWithSkipBlocks() { + void testTokenizerWithSkipBlocks() { doTest("simpleSkipBlocks", "_skipDefault", skipBlocks()); } @Test - public void testTokenizerWithSkipBlocksPattern() { + void testTokenizerWithSkipBlocksPattern() { doTest("simpleSkipBlocks", "_skipDebug", skipBlocks("#if debug|#endif")); } @Test - public void testTokenizerWithoutSkipBlocks() { + void testTokenizerWithoutSkipBlocks() { doTest("simpleSkipBlocks", "_noSkip", dontSkipBlocks()); } @Test - public void testAsm() { + void testAsm() { // ASM code containing the '@' character doTest("asm", "", dontSkipBlocks()); } @Test - public void testPreprocessingDirectives() { + void testPreprocessingDirectives() { doTest("preprocessorDirectives"); } @Test - public void testLiterals() { + void testLiterals() { doTest("literals"); } @Test - public void testLexicalErrorFilename() { + void testLexicalErrorFilename() { expectTokenMgrError(sourceText("issue-1559"), dontSkipBlocks()); } @Test - public void testRawStringLiterals() { + void testRawStringLiterals() { doTest("issue-1784"); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } @Test - public void testLongListsOfNumbersAreNotIgnored() { + void testLongListsOfNumbersAreNotIgnored() { doTest("listOfNumbers"); } @Test - public void testLongListsOfNumbersAreIgnored() { + void testLongListsOfNumbersAreIgnored() { doTest("listOfNumbers", "_ignored", skipLiteralSequences()); } diff --git a/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ast/CppCharStreamTest.java b/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ast/CppCharStreamTest.java index 49b256550b..aa2243a3cd 100644 --- a/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ast/CppCharStreamTest.java +++ b/pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/ast/CppCharStreamTest.java @@ -4,29 +4,29 @@ package net.sourceforge.pmd.lang.cpp.ast; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.io.StringReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class CppCharStreamTest { +class CppCharStreamTest { @Test - public void testContinuationUnix() throws IOException { + void testContinuationUnix() throws IOException { CppCharStream stream = CppCharStream.newCppCharStream(new StringReader("a\\\nb")); assertStream(stream, "ab"); } @Test - public void testContinuationWindows() throws IOException { + void testContinuationWindows() throws IOException { CppCharStream stream = CppCharStream.newCppCharStream(new StringReader("a\\\r\nb")); assertStream(stream, "ab"); } @Test - public void testBackup() throws IOException { + void testBackup() throws IOException { CppCharStream stream = CppCharStream.newCppCharStream(new StringReader("a\\b\\\rc")); assertStream(stream, "a\\b\\\rc"); } From 6086beb4dd62289d47316a902f49e9ec3c513a2c Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:17:36 +0200 Subject: [PATCH 04/31] [cs] Migrate tests to Junit5 --- pmd-cs/pom.xml | 4 +- .../sourceforge/pmd/cpd/CsTokenizerTest.java | 47 +++++++++---------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/pmd-cs/pom.xml b/pmd-cs/pom.xml index d003846560..4af69e4c3c 100644 --- a/pmd-cs/pom.xml +++ b/pmd-cs/pom.xml @@ -63,8 +63,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java b/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java index d05797d726..0901187e79 100644 --- a/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java +++ b/pmd-cs/src/test/java/net/sourceforge/pmd/cpd/CsTokenizerTest.java @@ -4,20 +4,18 @@ package net.sourceforge.pmd.cpd; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Properties; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; import net.sourceforge.pmd.lang.ast.TokenMgrError; -public class CsTokenizerTest extends CpdTextComparisonTest { +class CsTokenizerTest extends CpdTextComparisonTest { - @org.junit.Rule - public ExpectedException ex = ExpectedException.none(); - - public CsTokenizerTest() { + CsTokenizerTest() { super(".cs"); } @@ -34,84 +32,83 @@ public class CsTokenizerTest extends CpdTextComparisonTest { } @Test - public void testSimpleClass() { + void testSimpleClass() { doTest("simpleClass"); } @Test - public void testSimpleClassMethodMultipleLines() { + void testSimpleClassMethodMultipleLines() { doTest("simpleClassMethodMultipleLines"); } @Test - public void testStrings() { + void testStrings() { doTest("strings"); } @Test - public void testOpenString() { - ex.expect(TokenMgrError.class); - doTest("unlexable_string"); + void testOpenString() { + assertThrows(TokenMgrError.class, () -> doTest("unlexable_string")); } @Test - public void testCommentsIgnored1() { + void testCommentsIgnored1() { doTest("comments"); } @Test - public void testIgnoreBetweenSpecialComments() { + void testIgnoreBetweenSpecialComments() { doTest("specialComments"); } @Test - public void testOperators() { + void testOperators() { doTest("operatorsAndStuff"); } @Test - public void testLineNumberAfterMultilineString() { + void testLineNumberAfterMultilineString() { doTest("strings"); } @Test - public void testDoNotIgnoreUsingDirectives() { + void testDoNotIgnoreUsingDirectives() { doTest("usingDirectives"); } @Test - public void testIgnoreUsingDirectives() { + void testIgnoreUsingDirectives() { doTest("usingDirectives", "_ignored", ignoreUsings()); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } @Test - public void testLongListsOfNumbersAreNotIgnored() { + void testLongListsOfNumbersAreNotIgnored() { doTest("listOfNumbers"); } @Test - public void testLongListsOfNumbersAreIgnored() { + void testLongListsOfNumbersAreIgnored() { doTest("listOfNumbers", "_ignored", skipLiteralSequences()); } @Test - public void testCSharp7And8Additions() { + void testCSharp7And8Additions() { doTest("csharp7And8Additions"); } @Test - public void testAttributesAreNotIgnored() { + void testAttributesAreNotIgnored() { doTest("attributes"); } @Test - public void testAttributesAreIgnored() { + void testAttributesAreIgnored() { doTest("attributes", "_ignored", skipAttributes()); } From 378c77f60f99486fc866b67c79356b5fdcfd8d82 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:19:12 +0200 Subject: [PATCH 05/31] [dart] Migrate tests to Junit5 --- pmd-dart/pom.xml | 4 +-- .../pmd/cpd/DartTokenizerTest.java | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pmd-dart/pom.xml b/pmd-dart/pom.xml index 0c8af18fe3..dede831b74 100644 --- a/pmd-dart/pom.xml +++ b/pmd-dart/pom.xml @@ -62,8 +62,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java index 93231d4b26..5d08b1b849 100644 --- a/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java +++ b/pmd-dart/src/test/java/net/sourceforge/pmd/cpd/DartTokenizerTest.java @@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class DartTokenizerTest extends CpdTextComparisonTest { +class DartTokenizerTest extends CpdTextComparisonTest { - public DartTokenizerTest() { + DartTokenizerTest() { super(".dart"); } @@ -23,75 +23,75 @@ public class DartTokenizerTest extends CpdTextComparisonTest { @Test - public void testComment() { + void testComment() { doTest("comment"); } @Test - public void testEscapeSequences() { + void testEscapeSequences() { doTest("escape_sequences"); } @Test - public void testEscapedBackslash() { + void testEscapedBackslash() { doTest("escaped_backslash"); } @Test - public void testEscapedString() { + void testEscapedString() { doTest("escaped_string"); } @Test - public void testIncrement() { + void testIncrement() { doTest("increment"); } @Test - public void testImports() { + void testImports() { doTest("imports"); } @Test - public void testStringInterpolation() { + void testStringInterpolation() { doTest("string_interpolation"); } @Test - public void testEscapedDollar() { + void testEscapedDollar() { doTest("escaped_dollar"); } @Test - public void testRegex() { + void testRegex() { doTest("regex"); } @Test - public void testRegex2() { + void testRegex2() { doTest("regex2"); } @Test - public void testRegex3() { + void testRegex3() { doTest("regex3"); } @Test - public void testStringWithBackslashes() { + void testStringWithBackslashes() { doTest("string_with_backslashes"); } @Test - public void testMultiline() { + void testMultiline() { doTest("string_multiline"); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } From 9f340bd1c0bd30cf3d1d6157011c26ac231f0ca8 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:20:58 +0200 Subject: [PATCH 06/31] [fortran] Migrate tests to Junit5 --- pmd-fortran/pom.xml | 4 ++-- .../net/sourceforge/pmd/cpd/FortranTokenizerTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index 4c3371d21c..5aa05f62c3 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -31,8 +31,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java b/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java index 2346ac13ee..c07b363a0a 100644 --- a/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java +++ b/pmd-fortran/src/test/java/net/sourceforge/pmd/cpd/FortranTokenizerTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; @@ -14,9 +14,9 @@ import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; * @author rpelisse * */ -public class FortranTokenizerTest extends CpdTextComparisonTest { +class FortranTokenizerTest extends CpdTextComparisonTest { - public FortranTokenizerTest() { + FortranTokenizerTest() { super(".for"); } @@ -31,7 +31,7 @@ public class FortranTokenizerTest extends CpdTextComparisonTest { } @Test - public void testSample() { + void testSample() { doTest("sample"); } } From 4284583261548c331cdd9a4d2037d3753c08c32f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:22:24 +0200 Subject: [PATCH 07/31] [go] Migrate tests to Junit5 --- pmd-go/pom.xml | 4 ++-- .../net/sourceforge/pmd/cpd/GoTokenizerTest.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pmd-go/pom.xml b/pmd-go/pom.xml index f4faa32bd4..060920664c 100644 --- a/pmd-go/pom.xml +++ b/pmd-go/pom.xml @@ -60,8 +60,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java index 0a21eb2e1b..eada52e8f1 100644 --- a/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java +++ b/pmd-go/src/test/java/net/sourceforge/pmd/cpd/GoTokenizerTest.java @@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class GoTokenizerTest extends CpdTextComparisonTest { +class GoTokenizerTest extends CpdTextComparisonTest { - public GoTokenizerTest() { + GoTokenizerTest() { super(".go"); } @@ -27,22 +27,22 @@ public class GoTokenizerTest extends CpdTextComparisonTest { } @Test - public void simpleTest() { + void simpleTest() { doTest("hello"); } @Test - public void bigFileTest() { + void bigFileTest() { doTest("btrfs"); } @Test - public void testIssue1751() { + void testIssue1751() { doTest("issue-1751"); } @Test - public void testUnicode() { + void testUnicode() { // https://github.com/pmd/pmd/issues/2752 doTest("sample_unicode"); } From f79d2389b0be7b40a74e534c89a5e51c87f1c199 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:23:37 +0200 Subject: [PATCH 08/31] [groovy] Migrate tests to Junit5 --- pmd-groovy/pom.xml | 4 ++-- .../java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pmd-groovy/pom.xml b/pmd-groovy/pom.xml index f50f8a4ff9..1a5e3fbef9 100644 --- a/pmd-groovy/pom.xml +++ b/pmd-groovy/pom.xml @@ -36,8 +36,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java index ba6e2d1d65..a11b546a87 100644 --- a/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java +++ b/pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java @@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class GroovyTokenizerTest extends CpdTextComparisonTest { +class GroovyTokenizerTest extends CpdTextComparisonTest { - public GroovyTokenizerTest() { + GroovyTokenizerTest() { super(".groovy"); } @@ -27,7 +27,7 @@ public class GroovyTokenizerTest extends CpdTextComparisonTest { } @Test - public void testSample() { + void testSample() { doTest("sample"); } } From 917b9df957d03ad9363e37319852b5eb4015d997 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:28:46 +0200 Subject: [PATCH 09/31] [html] Migrate tests to Junit5 --- pmd-html/pom.xml | 4 +- .../pmd/lang/html/HtmlJavaRuleTest.java | 15 ++++--- .../pmd/lang/html/HtmlTokenizerTest.java | 8 ++-- .../pmd/lang/html/HtmlXPathRuleTest.java | 45 ++++++++++--------- .../pmd/lang/html/ast/HtmlTreeDumpTest.java | 12 ++--- .../pmd/lang/html/ast/PositionTest.java | 8 ++-- .../bestpractices/AvoidInlineStylesTest.java | 2 +- .../UnnecessaryTypeAttributeTest.java | 2 +- .../UseAltAttributeForImagesTest.java | 2 +- 9 files changed, 50 insertions(+), 48 deletions(-) diff --git a/pmd-html/pom.xml b/pmd-html/pom.xml index ae841490fd..2d7ea3f407 100644 --- a/pmd-html/pom.xml +++ b/pmd-html/pom.xml @@ -35,8 +35,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java index 6f0acc19b9..0701b8d7a4 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlJavaRuleTest.java @@ -4,11 +4,12 @@ package net.sourceforge.pmd.lang.html; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.RuleContext; @@ -23,7 +24,7 @@ import net.sourceforge.pmd.lang.html.ast.ASTHtmlElement; import net.sourceforge.pmd.lang.html.rule.AbstractHtmlRule; import net.sourceforge.pmd.lang.rule.xpath.Attribute; -public class HtmlJavaRuleTest { +class HtmlJavaRuleTest { // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter private static final String LIGHTNING_WEB_COMPONENT = "\n" + ""; @Test - public void findAllAttributesWithInvalidExpression() { + void findAllAttributesWithInvalidExpression() { // "Don’t add spaces around the property, for example, { data } is not valid HTML." Rule rule = new AbstractHtmlRule() { @Override @@ -57,9 +58,9 @@ public class HtmlJavaRuleTest { } }; List violations = runRule(LIGHTNING_WEB_COMPONENT, rule); - Assert.assertEquals(2, violations.size()); - Assert.assertEquals(4, violations.get(0).getBeginLine()); - Assert.assertEquals(6, violations.get(1).getBeginLine()); + assertEquals(2, violations.size()); + assertEquals(4, violations.get(0).getBeginLine()); + assertEquals(6, violations.get(1).getBeginLine()); } private List runRule(String html, Rule rule) { diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java index 046e092a38..f98bf2ed96 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlTokenizerTest.java @@ -7,15 +7,15 @@ package net.sourceforge.pmd.lang.html; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.Tokenizer; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; import net.sourceforge.pmd.lang.html.ast.HtmlTokenizer; -public class HtmlTokenizerTest extends CpdTextComparisonTest { +class HtmlTokenizerTest extends CpdTextComparisonTest { - public HtmlTokenizerTest() { + HtmlTokenizerTest() { super(".html"); } @@ -30,7 +30,7 @@ public class HtmlTokenizerTest extends CpdTextComparisonTest { } @Test - public void testSimpleHtmlFile() { + void testSimpleHtmlFile() { doTest("SimpleHtmlFile"); } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java index 13666f89a0..092a371248 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/HtmlXPathRuleTest.java @@ -4,11 +4,12 @@ package net.sourceforge.pmd.lang.html; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.RuleContext; import net.sourceforge.pmd.RuleViolation; @@ -25,7 +26,7 @@ import net.sourceforge.pmd.lang.html.ast.HtmlParsingHelper; import net.sourceforge.pmd.lang.rule.XPathRule; import net.sourceforge.pmd.lang.rule.xpath.XPathVersion; -public class HtmlXPathRuleTest { +class HtmlXPathRuleTest { // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter private static final String LIGHTNING_WEB_COMPONENT = "\n" + ""; @Test - public void selectTextNode() { + void selectTextNode() { // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter // "Don’t add spaces around the property, for example, { data } is not valid HTML." String xpath = "//text()[contains(., '{ ')]"; List violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath); - Assert.assertEquals(1, violations.size()); - Assert.assertEquals(3, violations.get(0).getBeginLine()); + assertEquals(1, violations.size()); + assertEquals(3, violations.get(0).getBeginLine()); } @Test - public void selectTextNodeByNodeNameShouldNotWork() { + void selectTextNodeByNodeNameShouldNotWork() { String xpath = "//*[local-name() = '#text']"; List violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath); - Assert.assertEquals(0, violations.size()); + assertEquals(0, violations.size()); } @Test - public void verifyTextNodeName() { + void verifyTextNodeName() { ASTHtmlDocument document = HtmlParsingHelper.DEFAULT.parse("

foobar

"); ASTHtmlTextNode textNode = document.getFirstDescendantOfType(ASTHtmlTextNode.class); - Assert.assertEquals("#text", textNode.getXPathNodeName()); + assertEquals("#text", textNode.getXPathNodeName()); } @Test - public void verifyCommentNodeName() { + void verifyCommentNodeName() { ASTHtmlDocument document = HtmlParsingHelper.DEFAULT.parse("

"); ASTHtmlComment comment = document.getFirstDescendantOfType(ASTHtmlComment.class); - Assert.assertEquals("#comment", comment.getXPathNodeName()); + assertEquals("#comment", comment.getXPathNodeName()); } @Test - public void selectAttributes() { + void selectAttributes() { // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter // "Don’t add spaces around the property, for example, { data } is not valid HTML." String xpath = "//*[@value = '{']"; List violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath); - Assert.assertEquals(1, violations.size()); - Assert.assertEquals(4, violations.get(0).getBeginLine()); + assertEquals(1, violations.size()); + assertEquals(4, violations.get(0).getBeginLine()); } @Test - public void selectAttributesMultiple() { + void selectAttributesMultiple() { // from https://developer.salesforce.com/docs/component-library/documentation/en/lwc/lwc.js_props_getter // "Don’t add spaces around the property, for example, { data } is not valid HTML." String xpath = "//*[@*[local-name() = ('value', 'onchange')] = '{']"; List violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath); - Assert.assertEquals(2, violations.size()); - Assert.assertEquals(4, violations.get(0).getBeginLine()); - Assert.assertEquals(6, violations.get(1).getBeginLine()); + assertEquals(2, violations.size()); + assertEquals(4, violations.get(0).getBeginLine()); + assertEquals(6, violations.get(1).getBeginLine()); } @Test - public void selectAttributeByName() { + void selectAttributeByName() { String xpath = "//*[@*[local-name() = 'if:true']]"; List violations = runXPath(LIGHTNING_WEB_COMPONENT, xpath); - Assert.assertEquals(1, violations.size()); - Assert.assertEquals(10, violations.get(0).getBeginLine()); + assertEquals(1, violations.size()); + assertEquals(10, violations.get(0).getBeginLine()); } private List runXPath(String html, String xpath) { diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java index 05f83eb600..864e9a04ed 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java @@ -5,14 +5,14 @@ package net.sourceforge.pmd.lang.html.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter; -public class HtmlTreeDumpTest extends BaseTreeDumpTest { - public HtmlTreeDumpTest() { +class HtmlTreeDumpTest extends BaseTreeDumpTest { + HtmlTreeDumpTest() { super(new RelevantAttributePrinter(), ".html"); } @@ -22,17 +22,17 @@ public class HtmlTreeDumpTest extends BaseTreeDumpTest { } @Test - public void simpleHtmlFile() { + void simpleHtmlFile() { doTest("SimpleHtmlFile"); } @Test - public void templateFragment() { + void templateFragment() { doTest("TemplateFragment"); } @Test - public void simpleXmlFile() { + void simpleXmlFile() { doTest("SimpleXmlFile"); } } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java index 52a484d0ce..2979e52a47 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java @@ -4,14 +4,14 @@ package net.sourceforge.pmd.lang.html.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.CoordinatesPrinter; -public class PositionTest extends BaseTreeDumpTest { - public PositionTest() { +class PositionTest extends BaseTreeDumpTest { + PositionTest() { super(CoordinatesPrinter.INSTANCE, ".html"); } @@ -21,7 +21,7 @@ public class PositionTest extends BaseTreeDumpTest { } @Test - public void testPositions() { + void testPositions() { doTest("SimpleHtmlFile2"); } } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java index 204c2c9909..ca4314861d 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/AvoidInlineStylesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidInlineStylesTest extends PmdRuleTst { +class AvoidInlineStylesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java index b955463364..ade5f87078 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UnnecessaryTypeAttributeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryTypeAttributeTest extends PmdRuleTst { +class UnnecessaryTypeAttributeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java index 9bca187b2e..c4904a4aee 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/rule/bestpractices/UseAltAttributeForImagesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseAltAttributeForImagesTest extends PmdRuleTst { +class UseAltAttributeForImagesTest extends PmdRuleTst { // no additional unit tests } From ba72505e1f5cc3b72bd3f038a60ae5bc474aac87 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 7 Jul 2022 17:47:07 +0200 Subject: [PATCH 10/31] [javascript] Migrate tests to Junit5 --- pmd-javascript/pom.xml | 4 +- .../java/net/sourceforge/pmd/ReportTest.java | 6 +- .../cpd/AnyTokenizerForTypescriptTest.java | 8 +-- .../pmd/cpd/EcmascriptTokenizerTest.java | 22 +++---- .../lang/ecmascript/ast/ASTForInLoopTest.java | 20 +++--- .../ecmascript/ast/ASTFunctionNodeTest.java | 20 +++--- .../ecmascript/ast/ASTTryStatementTest.java | 63 ++++++++++--------- .../ast/ASTVariableDeclarationTest.java | 14 +++-- .../ecmascript/ast/EcmascriptParserTest.java | 38 +++++------ .../lang/ecmascript/ast/JsTreeDumpTest.java | 16 ++--- .../ecmascript/ast/TrailingCommaTest.java | 38 ++++++----- .../bestpractices/AvoidWithStatementTest.java | 2 +- .../bestpractices/ConsistentReturnTest.java | 2 +- .../bestpractices/GlobalVariableTest.java | 2 +- .../bestpractices/ScopeForInVariableTest.java | 2 +- .../UseBaseWithParseIntTest.java | 2 +- .../codestyle/AssignmentInOperandTest.java | 2 +- .../codestyle/ForLoopsMustUseBracesTest.java | 2 +- .../IfElseStmtsMustUseBracesTest.java | 2 +- .../codestyle/IfStmtsMustUseBracesTest.java | 2 +- .../rule/codestyle/NoElseReturnTest.java | 2 +- .../rule/codestyle/UnnecessaryBlockTest.java | 2 +- .../codestyle/UnnecessaryParenthesesTest.java | 2 +- .../rule/codestyle/UnreachableCodeTest.java | 2 +- .../WhileLoopsMustUseBracesTest.java | 2 +- .../errorprone/AvoidTrailingCommaTest.java | 2 +- .../rule/errorprone/EqualComparisonTest.java | 2 +- .../InnaccurateNumericLiteralTest.java | 2 +- 28 files changed, 150 insertions(+), 133 deletions(-) diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index af760b1a97..bca334d6fa 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -88,8 +88,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/ReportTest.java index 79a6ba397c..afcbe068d3 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/ReportTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/ReportTest.java @@ -7,16 +7,16 @@ package net.sourceforge.pmd; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ecmascript.ast.ASTFunctionNode; import net.sourceforge.pmd.lang.ecmascript.ast.EcmascriptParserTestBase; import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule; -public class ReportTest extends EcmascriptParserTestBase { +class ReportTest extends EcmascriptParserTestBase { @Test - public void testExclusionsInReportWithNOPMDEcmascript() { + void testExclusionsInReportWithNOPMDEcmascript() { Rule rule = new AbstractEcmascriptRule() { @Override public Object visit(ASTFunctionNode node, Object data) { diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerForTypescriptTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerForTypescriptTest.java index 217ace1133..79a48c9ea6 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerForTypescriptTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/AnyTokenizerForTypescriptTest.java @@ -6,16 +6,16 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; /** * */ -public class AnyTokenizerForTypescriptTest extends CpdTextComparisonTest { +class AnyTokenizerForTypescriptTest extends CpdTextComparisonTest { - public AnyTokenizerForTypescriptTest() { + AnyTokenizerForTypescriptTest() { super(".ts"); } @@ -30,7 +30,7 @@ public class AnyTokenizerForTypescriptTest extends CpdTextComparisonTest { } @Test - public void testFile1() { + void testFile1() { doTest("SampleTypeScript"); } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java index 06fbaadc0a..9554a436d9 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java @@ -6,13 +6,13 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class EcmascriptTokenizerTest extends CpdTextComparisonTest { +class EcmascriptTokenizerTest extends CpdTextComparisonTest { - public EcmascriptTokenizerTest() { + EcmascriptTokenizerTest() { super(".js"); } @@ -27,17 +27,17 @@ public class EcmascriptTokenizerTest extends CpdTextComparisonTest { } @Test - public void testSimple() { + void testSimple() { doTest("simple"); } @Test - public void testSimplewithSemis() { + void testSimplewithSemis() { doTest("simpleWithSemis"); } @Test - public void testIgnoreBetweenSpecialComments() { + void testIgnoreBetweenSpecialComments() { doTest("specialComments"); } @@ -45,27 +45,27 @@ public class EcmascriptTokenizerTest extends CpdTextComparisonTest { * See: https://sourceforge.net/p/pmd/bugs/1239/ */ @Test - public void parseStringNotAsMultiline() { + void parseStringNotAsMultiline() { doTest("lineContinuations"); } @Test - public void testIgnoreSingleLineComments() { + void testIgnoreSingleLineComments() { doTest("singleLineCommentIgnore"); } @Test - public void testIgnoreMultiLineComments() { + void testIgnoreMultiLineComments() { doTest("multilineCommentIgnore"); } @Test - public void testTemplateStrings() { + void testTemplateStrings() { doTest("templateStrings"); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoopTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoopTest.java index 2f35c9f1c0..4dace739ba 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoopTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTForInLoopTest.java @@ -5,10 +5,12 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class ASTForInLoopTest extends EcmascriptParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTForInLoopTest extends EcmascriptParserTestBase { /** * Note: for each loops are deprecated. @@ -16,18 +18,18 @@ public class ASTForInLoopTest extends EcmascriptParserTestBase { * @see for each...in */ @Test - public void testForEachLoop() { + void testForEachLoop() { ASTAstRoot node = js.parse("for each (var item in items) {}"); ASTForInLoop loop = (ASTForInLoop) node.getChild(0); - Assert.assertFalse(loop.isForOf()); - Assert.assertTrue(loop.isForEach()); + assertFalse(loop.isForOf()); + assertTrue(loop.isForEach()); } @Test - public void testForOfLoop() { + void testForOfLoop() { ASTAstRoot node = js.parse("for (var item of items) {}"); ASTForInLoop loop = (ASTForInLoop) node.getChild(0); - Assert.assertTrue(loop.isForOf()); - Assert.assertFalse(loop.isForEach()); + assertTrue(loop.isForOf()); + assertFalse(loop.isForEach()); } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java index b963ac7e75..0fde30852f 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNodeTest.java @@ -4,27 +4,29 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class ASTFunctionNodeTest extends EcmascriptParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTFunctionNodeTest extends EcmascriptParserTestBase { @Test public void testGetBody() { ASTAstRoot node = js.parse("function foo() { var a = 'a'; }"); ASTFunctionNode fn = node.getFirstDescendantOfType(ASTFunctionNode.class); - Assert.assertFalse(fn.isClosure()); + assertFalse(fn.isClosure()); EcmascriptNode body = fn.getBody(); - Assert.assertTrue(body instanceof ASTBlock); + assertTrue(body instanceof ASTBlock); } @Test - public void testGetBodyFunctionClosureExpression() { + void testGetBodyFunctionClosureExpression() { ASTAstRoot node = js.parse("(function(x) x*x)"); ASTFunctionNode fn = node.getFirstDescendantOfType(ASTFunctionNode.class); - Assert.assertTrue(fn.isClosure()); + assertTrue(fn.isClosure()); EcmascriptNode body = fn.getBody(); - Assert.assertTrue(body instanceof ASTBlock); - Assert.assertTrue(body.getChild(0) instanceof ASTReturnStatement); + assertTrue(body instanceof ASTBlock); + assertTrue(body.getChild(0) instanceof ASTReturnStatement); } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java index 40dcb6c097..a92424fe57 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTTryStatementTest.java @@ -4,66 +4,71 @@ package net.sourceforge.pmd.lang.ecmascript.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mozilla.javascript.ast.AstRoot; /** * See the following bugs: #1141 ECMAScript: getFinallyBlock() is buggy. #1142 * ECMAScript: getCatchClause() is buggy */ -public class ASTTryStatementTest extends EcmascriptParserTestBase { +class ASTTryStatementTest extends EcmascriptParserTestBase { private ASTTryStatement getTryStmt(String js) { EcmascriptNode node = this.js.parse(js); List trys = node.findDescendantsOfType(ASTTryStatement.class); - Assert.assertEquals(1, trys.size()); + assertEquals(1, trys.size()); ASTTryStatement tryStmt = trys.get(0); return tryStmt; } @Test - public void testFinallyBlockOnly() { + void testFinallyBlockOnly() { ASTTryStatement tryStmt = getTryStmt("function() { try { } finally { } }"); - Assert.assertNull(tryStmt.getCatchClause(0)); - Assert.assertFalse(tryStmt.hasCatch()); - Assert.assertEquals(0, tryStmt.getNumCatchClause()); - Assert.assertNotNull(tryStmt.getFinallyBlock()); - Assert.assertTrue(tryStmt.hasFinally()); + assertNull(tryStmt.getCatchClause(0)); + assertFalse(tryStmt.hasCatch()); + assertEquals(0, tryStmt.getNumCatchClause()); + assertNotNull(tryStmt.getFinallyBlock()); + assertTrue(tryStmt.hasFinally()); } @Test - public void testCatchBlockOnly() { + void testCatchBlockOnly() { ASTTryStatement tryStmt = getTryStmt("function() { try { } catch (error) { } }"); - Assert.assertNotNull(tryStmt.getCatchClause(0)); - Assert.assertTrue(tryStmt.hasCatch()); - Assert.assertEquals(1, tryStmt.getNumCatchClause()); - Assert.assertNull(tryStmt.getFinallyBlock()); - Assert.assertFalse(tryStmt.hasFinally()); + assertNotNull(tryStmt.getCatchClause(0)); + assertTrue(tryStmt.hasCatch()); + assertEquals(1, tryStmt.getNumCatchClause()); + assertNull(tryStmt.getFinallyBlock()); + assertFalse(tryStmt.hasFinally()); } @Test - public void testCatchAndFinallyBlock() { + void testCatchAndFinallyBlock() { ASTTryStatement tryStmt = getTryStmt("function() { try { } catch (error) { } finally { } }"); - Assert.assertNotNull(tryStmt.getCatchClause(0)); - Assert.assertTrue(tryStmt.hasCatch()); - Assert.assertEquals(1, tryStmt.getNumCatchClause()); - Assert.assertNotNull(tryStmt.getFinallyBlock()); - Assert.assertTrue(tryStmt.hasFinally()); + assertNotNull(tryStmt.getCatchClause(0)); + assertTrue(tryStmt.hasCatch()); + assertEquals(1, tryStmt.getNumCatchClause()); + assertNotNull(tryStmt.getFinallyBlock()); + assertTrue(tryStmt.hasFinally()); } @Test - public void testMultipleCatchAndFinallyBlock() { + void testMultipleCatchAndFinallyBlock() { ASTTryStatement tryStmt = getTryStmt( "function() { " + "try { } " + "catch (error if error instanceof BadError) { } " + "catch (error2 if error2 instanceof OtherError) { } " + "finally { } }"); - Assert.assertNotNull(tryStmt.getCatchClause(0)); - Assert.assertNotNull(tryStmt.getCatchClause(1)); - Assert.assertTrue(tryStmt.hasCatch()); - Assert.assertEquals(2, tryStmt.getNumCatchClause()); - Assert.assertNotNull(tryStmt.getFinallyBlock()); - Assert.assertTrue(tryStmt.hasFinally()); + assertNotNull(tryStmt.getCatchClause(0)); + assertNotNull(tryStmt.getCatchClause(1)); + assertTrue(tryStmt.hasCatch()); + assertEquals(2, tryStmt.getNumCatchClause()); + assertNotNull(tryStmt.getFinallyBlock()); + assertTrue(tryStmt.hasFinally()); } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclarationTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclarationTest.java index ec8aae6f06..e622098b92 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclarationTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTVariableDeclarationTest.java @@ -5,20 +5,22 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class ASTVariableDeclarationTest extends EcmascriptParserTestBase { +import org.junit.jupiter.api.Test; + +class ASTVariableDeclarationTest extends EcmascriptParserTestBase { @Test - public void testLet() { + void testLet() { ASTAstRoot node = js.parse("let x = 1;"); ASTVariableDeclaration varDecl = (ASTVariableDeclaration) node.getChild(0); - Assert.assertTrue(varDecl.isLet()); + assertTrue(varDecl.isLet()); ASTVariableInitializer varInit = (ASTVariableInitializer) varDecl.getChild(0); ASTName name = (ASTName) varInit.getChild(0); - Assert.assertEquals("x", name.getImage()); + assertEquals("x", name.getImage()); } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java index 2827f1461f..2dd0eaad9f 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java @@ -4,15 +4,16 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import org.mozilla.javascript.ast.AstRoot; import net.sourceforge.pmd.PMD; @@ -20,13 +21,13 @@ import net.sourceforge.pmd.Report; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule; -public class EcmascriptParserTest extends EcmascriptParserTestBase { +class EcmascriptParserTest extends EcmascriptParserTestBase { /** * https://sourceforge.net/p/pmd/bugs/1043/ */ @Test - public void testLineNumbers() { + void testLineNumbers() { final String SOURCE_CODE = "function a() {" + PMD.EOL + " alert('hello');" + PMD.EOL + "}" + PMD.EOL; EcmascriptNode node = js.parse(SOURCE_CODE); assertEquals(1, node.getBeginLine()); @@ -51,7 +52,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * https://sourceforge.net/p/pmd/bugs/1149/ */ @Test - public void testLineNumbersWithinEcmascriptRules() { + void testLineNumbersWithinEcmascriptRules() { String source = "function f(x){\n" + " if (x) {\n" @@ -72,7 +73,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { rule.setLanguage(js.getLanguage()); Report report = js.executeRule(rule, source); - assertEquals("Expecting 2 violations", 2, report.getViolations().size()); + assertEquals(2, report.getViolations().size(), "Expecting 2 violations"); assertEquals("Scope from 2 to 4", report.getViolations().get(0).getDescription()); assertEquals("Scope from 4 to 6", report.getViolations().get(1).getDescription()); } @@ -81,7 +82,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * Test bug https://sourceforge.net/p/pmd/bugs/1118/ */ @Test - public void testArrayAccess() { + void testArrayAccess() { EcmascriptNode node = js.parse("function a() { b['a'] = 1; c[1] = 2; }"); List arrays = node.findDescendantsOfType(ASTElementGet.class); assertEquals("b", arrays.get(0).getTarget().getImage()); @@ -95,7 +96,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * getRight() */ @Test - public void testArrayMethod() { + void testArrayMethod() { EcmascriptNode rootNode = js.parse( "function test(){\n" + " a(); // OK\n" + " b.c(); // OK\n" + " d[0](); // OK\n" + " e[0].f(); // OK\n" + " y.z[0](); // FAIL ==> java.lang.NullPointerException\n" + "}"); @@ -130,7 +131,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * valid statements! */ @Test - public void testCaseAsIdentifier() { + void testCaseAsIdentifier() { ASTAstRoot rootNode = js.parse("function f(a){\n" + " a.case.flag = 1;\n" + " return;\n" + "}"); ASTBlock block = rootNode.getFirstDescendantOfType(ASTBlock.class); assertFalse(block.getChild(0) instanceof ASTEmptyExpression); @@ -143,7 +144,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * not implemented) with ECMAscript */ @Test - public void testSuppressionComment() { + void testSuppressionComment() { ASTAstRoot root = js.parse("function(x) {\n" + "x = x; //NOPMD I know what I'm doing\n" + "}\n"); @@ -160,7 +161,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * #1191 Ecmascript fails to parse "void(0)" */ @Test - public void testVoidKeyword() { + void testVoidKeyword() { ASTAstRoot rootNode = js.parse("function f(matchFn, fieldval, n){\n" + " return (matchFn)?(matcharray = eval(matchFn+\"('\"+fieldval+\"','\"+n.id+\"')\")):void(0);\n" + "}\n"); @@ -172,7 +173,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { * #1192 Ecmascript fails to parse this operator " ^= " */ @Test - public void testXorAssignment() { + void testXorAssignment() { ASTAstRoot rootNode = js.parse("function f() { var x = 2; x ^= 2; x &= 2; x |= 2; " + "x &&= true; x ||= false; x *= 2; x /= 2; x %= 2; x += 2; x -= 2; " + "x <<= 2; x >>= 2; x >>>= 2; }"); @@ -181,7 +182,7 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { } @Test - public void testUnicodeCjk() { + void testUnicodeCjk() { // the first is u+4F60 js.parse("import { Test } from 'test2'\n" + "define('element', class extends Test {\n" @@ -193,8 +194,9 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase { /** * [javascript] Failing with OutOfMemoryError parsing a Javascript file #2081 */ - @Test(timeout = 5000L) - public void shouldNotFailWithOutOfMemory() { + @Test + @Timeout(5) + void shouldNotFailWithOutOfMemory() { ASTAstRoot rootNode = js.parse("(``\n);"); assertNotNull(rootNode); } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsTreeDumpTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsTreeDumpTest.java index 69bc444437..cdff450c60 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsTreeDumpTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/JsTreeDumpTest.java @@ -5,14 +5,14 @@ package net.sourceforge.pmd.lang.ecmascript.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.NodePrintersKt; -public class JsTreeDumpTest extends BaseTreeDumpTest { - public JsTreeDumpTest() { +class JsTreeDumpTest extends BaseTreeDumpTest { + JsTreeDumpTest() { super(NodePrintersKt.getSimpleNodePrinter(), ".js"); } @@ -22,27 +22,27 @@ public class JsTreeDumpTest extends BaseTreeDumpTest { } @Test - public void simpleJavascriptFile() { + void simpleJavascriptFile() { doTest("SimpleJavascriptFile"); } @Test - public void jquerySelector() { + void jquerySelector() { doTest("jquery-selector"); } @Test - public void decorators() { + void decorators() { doTest("decorators"); } @Test - public void templateStrings() { + void templateStrings() { doTest("templateStrings"); } @Test - public void issue3948() { + void issue3948() { // https://github.com/pmd/pmd/issues/3948 doTest("issue3948"); } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaTest.java index 82318930b2..2e43dc2aaa 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/TrailingCommaTest.java @@ -4,38 +4,42 @@ package net.sourceforge.pmd.lang.ecmascript.ast; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Locale; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; - -public class TrailingCommaTest extends EcmascriptParserTestBase { - - @Rule - public DefaultLocale defaultLocale = new DefaultLocale(); +import org.junit.jupiter.api.Test; +class TrailingCommaTest extends EcmascriptParserTestBase { @Test - public void testTrailingCommaDefaultLocale() { + void testTrailingCommaDefaultLocale() { testTrailingComma(); } @Test - public void testTrailingCommaFrFr() { - defaultLocale.set(Locale.FRANCE); - testTrailingComma(); + void testTrailingCommaFrFr() { + runWithLocale(Locale.FRANCE, () -> testTrailingComma()); } @Test - public void testTrailingCommaRootLocale() { - defaultLocale.set(Locale.ROOT); - testTrailingComma(); + void testTrailingCommaRootLocale() { + runWithLocale(Locale.ROOT, () -> testTrailingComma()); } - public void testTrailingComma() { + private void testTrailingComma() { ASTAstRoot node = js.parse("x = {a : 1, };\n"); ASTObjectLiteral fn = node.getFirstDescendantOfType(ASTObjectLiteral.class); - Assert.assertTrue(fn.isTrailingComma()); + assertTrue(fn.isTrailingComma()); + } + + private void runWithLocale(Locale locale, Runnable runnable) { + Locale prev = Locale.getDefault(); + try { + Locale.setDefault(locale); + runnable.run(); + } finally { + Locale.setDefault(prev); + } } } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/AvoidWithStatementTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/AvoidWithStatementTest.java index bd5518696b..5d308cf576 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/AvoidWithStatementTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/AvoidWithStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidWithStatementTest extends PmdRuleTst { +class AvoidWithStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ConsistentReturnTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ConsistentReturnTest.java index aae6a135d4..65afa849ce 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ConsistentReturnTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ConsistentReturnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConsistentReturnTest extends PmdRuleTst { +class ConsistentReturnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/GlobalVariableTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/GlobalVariableTest.java index 683d24de02..0645d97bd6 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/GlobalVariableTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/GlobalVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class GlobalVariableTest extends PmdRuleTst { +class GlobalVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ScopeForInVariableTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ScopeForInVariableTest.java index 6956e4511d..03052f13ed 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ScopeForInVariableTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/ScopeForInVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ScopeForInVariableTest extends PmdRuleTst { +class ScopeForInVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/UseBaseWithParseIntTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/UseBaseWithParseIntTest.java index 4e9682176f..c3dc0e1f8a 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/UseBaseWithParseIntTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/bestpractices/UseBaseWithParseIntTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseBaseWithParseIntTest extends PmdRuleTst { +class UseBaseWithParseIntTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/AssignmentInOperandTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/AssignmentInOperandTest.java index 7016e982b5..09d7db44c8 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/AssignmentInOperandTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/AssignmentInOperandTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AssignmentInOperandTest extends PmdRuleTst { +class AssignmentInOperandTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/ForLoopsMustUseBracesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/ForLoopsMustUseBracesTest.java index 13d9908bc6..1ad9afc710 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/ForLoopsMustUseBracesTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/ForLoopsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ForLoopsMustUseBracesTest extends PmdRuleTst { +class ForLoopsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfElseStmtsMustUseBracesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfElseStmtsMustUseBracesTest.java index ff854d637c..b122d7a4b6 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfElseStmtsMustUseBracesTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfElseStmtsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IfElseStmtsMustUseBracesTest extends PmdRuleTst { +class IfElseStmtsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfStmtsMustUseBracesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfStmtsMustUseBracesTest.java index dfaef80b32..0d8595570d 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfStmtsMustUseBracesTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/IfStmtsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IfStmtsMustUseBracesTest extends PmdRuleTst { +class IfStmtsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/NoElseReturnTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/NoElseReturnTest.java index 5d928fcf6d..92b91cd7d7 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/NoElseReturnTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/NoElseReturnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NoElseReturnTest extends PmdRuleTst { +class NoElseReturnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java index 013c249c5e..53c6ceb9c4 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryBlockTest extends PmdRuleTst { +class UnnecessaryBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryParenthesesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryParenthesesTest.java index 818c4375a6..c94b0b9e40 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryParenthesesTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnnecessaryParenthesesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryParenthesesTest extends PmdRuleTst { +class UnnecessaryParenthesesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnreachableCodeTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnreachableCodeTest.java index 42bb27eaf0..e60cb484c9 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnreachableCodeTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/UnreachableCodeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnreachableCodeTest extends PmdRuleTst { +class UnreachableCodeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/WhileLoopsMustUseBracesTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/WhileLoopsMustUseBracesTest.java index 6b822a35ba..d681626c2c 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/WhileLoopsMustUseBracesTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/codestyle/WhileLoopsMustUseBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class WhileLoopsMustUseBracesTest extends PmdRuleTst { +class WhileLoopsMustUseBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/AvoidTrailingCommaTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/AvoidTrailingCommaTest.java index e4ce7c8244..d865674576 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/AvoidTrailingCommaTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/AvoidTrailingCommaTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidTrailingCommaTest extends PmdRuleTst { +class AvoidTrailingCommaTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/EqualComparisonTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/EqualComparisonTest.java index 5ec5a9088d..86e1b9defc 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/EqualComparisonTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/EqualComparisonTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EqualComparisonTest extends PmdRuleTst { +class EqualComparisonTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/InnaccurateNumericLiteralTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/InnaccurateNumericLiteralTest.java index f2dc5217c0..4cdd66abbd 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/InnaccurateNumericLiteralTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/rule/errorprone/InnaccurateNumericLiteralTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InnaccurateNumericLiteralTest extends PmdRuleTst { +class InnaccurateNumericLiteralTest extends PmdRuleTst { // no additional unit tests } From f34c182f0689b50e014eb138d39908c786f61364 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Jul 2022 17:04:28 +0200 Subject: [PATCH 11/31] [jsp] Migrate tests to Junit5 --- pmd-jsp/pom.xml | 4 +- .../pmd/LanguageVersionDiscovererTest.java | 12 +- .../sourceforge/pmd/cpd/JSPTokenizerTest.java | 8 +- .../pmd/lang/jsp/JspParserTest.java | 25 +- .../pmd/lang/jsp/ast/JspDocStyleTest.java | 352 +++++++++--------- .../pmd/lang/jsp/ast/JspPageStyleTest.java | 76 ++-- .../pmd/lang/jsp/ast/OpenTagRegisterTest.java | 22 +- .../pmd/lang/jsp/ast/XPathJspRuleTest.java | 10 +- .../DontNestJsfInJstlIterationTest.java | 2 +- .../bestpractices/NoClassAttributeTest.java | 2 +- .../bestpractices/NoHtmlCommentsTest.java | 2 +- .../rule/bestpractices/NoJspForwardTest.java | 2 +- .../codestyle/DuplicateJspImportsTest.java | 2 +- .../jsp/rule/design/NoInlineScriptTest.java | 2 +- .../design/NoInlineStyleInformationTest.java | 2 +- .../jsp/rule/design/NoLongScriptsTest.java | 2 +- .../jsp/rule/design/NoScriptletsTest.java | 2 +- .../jsp/rule/errorprone/JspEncodingTest.java | 2 +- .../IframeMissingSrcAttributeTest.java | 2 +- .../NoUnsanitizedJSPExpressionTest.java | 2 +- 20 files changed, 265 insertions(+), 268 deletions(-) diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index 63505ded97..42bb314996 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -79,8 +79,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test 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 95bbe1d336..54ac07edf0 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java @@ -4,28 +4,28 @@ package net.sourceforge.pmd; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.LanguageVersionDiscoverer; import net.sourceforge.pmd.lang.jsp.JspLanguageModule; -public class LanguageVersionDiscovererTest { +class LanguageVersionDiscovererTest { /** * Test on JSP file. */ @Test - public void testJspFile() { + void testJspFile() { LanguageVersionDiscoverer discoverer = new LanguageVersionDiscoverer(); File jspFile = new File("/path/to/MyPage.jsp"); LanguageVersion languageVersion = discoverer.getDefaultLanguageVersionForFile(jspFile); - assertEquals("LanguageVersion must be JSP!", - LanguageRegistry.getLanguage(JspLanguageModule.NAME).getDefaultVersion(), languageVersion); + assertEquals(LanguageRegistry.getLanguage(JspLanguageModule.NAME).getDefaultVersion(), languageVersion, + "LanguageVersion must be JSP!"); } } diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java index 911eec8acc..fc4a29a13c 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/cpd/JSPTokenizerTest.java @@ -6,14 +6,14 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class JSPTokenizerTest extends CpdTextComparisonTest { +class JSPTokenizerTest extends CpdTextComparisonTest { - public JSPTokenizerTest() { + JSPTokenizerTest() { super(".jsp"); } @@ -28,7 +28,7 @@ public class JSPTokenizerTest extends CpdTextComparisonTest { } @Test - public void scriptletWithString() { + void scriptletWithString() { doTest("scriptletWithString"); } } diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/JspParserTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/JspParserTest.java index 0a1c3ff5d2..da947ad0d5 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/JspParserTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/JspParserTest.java @@ -4,11 +4,13 @@ package net.sourceforge.pmd.lang.jsp; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.io.File; import java.nio.file.Paths; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.LanguageVersion; @@ -19,22 +21,23 @@ import net.sourceforge.pmd.lang.jsp.ast.AbstractJspNodesTst; * Unit test for JSP parsing. * */ -public class JspParserTest extends AbstractJspNodesTst { +class JspParserTest extends AbstractJspNodesTst { /** * Verifies bug #939 Jsp parser fails on $ */ @Test - public void testParseDollar() { + void testParseDollar() { + jsp.parse("$129.00"); } @Test - public void testParseELAttribute() { + void testParseELAttribute() { jsp.parse("
Div content here.
"); } @Test - public void testParseELAttributeValue() { + void testParseELAttributeValue() { jsp.parse("
Div content here.
"); } @@ -42,24 +45,24 @@ public class JspParserTest extends AbstractJspNodesTst { * Verifies bug #311 Jsp parser fails on boolean attribute */ @Test - public void testParseBooleanAttribute() { + void testParseBooleanAttribute() { jsp.parse(""); } @Test - public void testParseJsp() { + void testParseJsp() { testInternalJspFile(Paths.get("sample.jsp").toFile()); testInternalJspFile(Paths.get("sample.jspx").toFile()); } @Test - public void testParseTag() { + void testParseTag() { testInternalJspFile(Paths.get("sample.tag").toFile()); } - @Test(expected = AssertionError.class) - public void testParseWrong() { - testInternalJspFile(Paths.get("sample.xxx").toFile()); + @Test + void testParseWrong() { + assertThrows(AssertionError.class, () -> testInternalJspFile(Paths.get("sample.xxx").toFile())); } private void testInternalJspFile(File jspFile) { 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 b3dfb67fae..936062bc64 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 @@ -4,15 +4,17 @@ package net.sourceforge.pmd.lang.jsp.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Iterator; import java.util.List; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * Test parsing of a JSP in document style, by checking the generated AST. @@ -20,40 +22,40 @@ import org.junit.Test; * @author pieter_van_raemdonck - Application Engineers NV/SA - www.ae.be * */ -public class JspDocStyleTest extends AbstractJspNodesTst { +class JspDocStyleTest extends AbstractJspNodesTst { /** * Smoke test for JSP parser. */ @Test - public void testSimplestJsp() { + void testSimplestJsp() { List nodes = jsp.getNodes(ASTElement.class, TEST_SIMPLEST_HTML); - assertEquals("Exactly " + 1 + " element(s) expected", 1, nodes.size()); + assertEquals(1, nodes.size(), "Exactly " + 1 + " element(s) expected"); } /** * Test the information on a Element and Attribute. */ @Test - public void testElementAttributeAndNamespace() { + void testElementAttributeAndNamespace() { ASTCompilationUnit root = jsp.parse(TEST_ELEMENT_AND_NAMESPACE); List elementNodes = root.findDescendantsOfType(ASTElement.class); - assertEquals("One element node expected!", 1, elementNodes.size()); + assertEquals(1, elementNodes.size(), "One element node expected!"); ASTElement element = elementNodes.get(0); - assertEquals("Correct name expected!", "h:html", element.getName()); - assertTrue("Has namespace prefix!", element.isHasNamespacePrefix()); - assertTrue("Element is empty!", element.isEmpty()); - assertEquals("Correct namespace prefix of element expected!", "h", element.getNamespacePrefix()); - assertEquals("Correct local name of element expected!", "html", element.getLocalName()); + assertEquals("h:html", element.getName(), "Correct name expected!"); + assertTrue(element.isHasNamespacePrefix(), "Has namespace prefix!"); + assertTrue(element.isEmpty(), "Element is empty!"); + assertEquals("h", element.getNamespacePrefix(), "Correct namespace prefix of element expected!"); + assertEquals("html", element.getLocalName(), "Correct local name of element expected!"); List attributeNodes = root.findDescendantsOfType(ASTAttribute.class); - assertEquals("One attribute node expected!", 1, attributeNodes.size()); + assertEquals(1, attributeNodes.size(), "One attribute node expected!"); ASTAttribute attribute = attributeNodes.get(0); - assertEquals("Correct name expected!", "MyNsPrefix:MyAttr", attribute.getName()); - assertTrue("Has namespace prefix!", attribute.isHasNamespacePrefix()); - assertEquals("Correct namespace prefix of element expected!", "MyNsPrefix", attribute.getNamespacePrefix()); - assertEquals("Correct local name of element expected!", "MyAttr", attribute.getLocalName()); + assertEquals("MyNsPrefix:MyAttr", attribute.getName(), "Correct name expected!"); + assertTrue(attribute.isHasNamespacePrefix(), "Has namespace prefix!"); + assertEquals("MyNsPrefix", attribute.getNamespacePrefix(), "Correct namespace prefix of element expected!"); + assertEquals("MyAttr", attribute.getLocalName(), "Correct local name of element expected!"); } @@ -63,59 +65,55 @@ public class JspDocStyleTest extends AbstractJspNodesTst { * */ @Test - public void testAttributeValueContainingHash() { + void testAttributeValueContainingHash() { ASTCompilationUnit root = jsp.parse(TEST_ATTRIBUTE_VALUE_CONTAINING_HASH); List attrsList = root.findDescendantsOfType(ASTAttribute.class); - assertEquals("Three attributes expected!", 3, attrsList.size()); + assertEquals(3, attrsList.size(), "Three attributes expected!"); ASTAttribute attr = attrsList.get(0); - assertEquals("Correct attribute name expected!", "something", attr.getName()); - assertEquals("Correct attribute value expected!", "#yes#", - attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage()); + assertEquals("something", attr.getName(), "Correct attribute name expected!"); + assertEquals("#yes#", attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage(), "Correct attribute value expected!"); attr = attrsList.get(1); - assertEquals("Correct attribute name expected!", "foo", attr.getName()); - assertEquals("Correct attribute value expected!", "CREATE", - attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage()); + assertEquals("foo", attr.getName(), "Correct attribute name expected!"); + assertEquals("CREATE", attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage(), "Correct attribute value expected!"); attr = attrsList.get(2); - assertEquals("Correct attribute name expected!", "href", attr.getName()); - assertEquals("Correct attribute value expected!", "#", - attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage()); + assertEquals("href", attr.getName(), "Correct attribute name expected!"); + assertEquals("#", attr.getFirstDescendantOfType(ASTAttributeValue.class).getImage(), "Correct attribute value expected!"); } /** * Test correct parsing of CDATA. */ @Test - public void testCData() { + void testCData() { List cdataNodes = jsp.getNodes(ASTCData.class, TEST_CDATA); - assertEquals("One CDATA node expected!", 1, cdataNodes.size()); + assertEquals(1, cdataNodes.size(), "One CDATA node expected!"); ASTCData cdata = cdataNodes.get(0); - assertEquals("Content incorrectly parsed!", " some ]] ]> ", cdata.getImage()); + assertEquals(" some ]] ]> ", cdata.getImage(), "Content incorrectly parsed!"); } /** * Test parsing of Doctype declaration. */ @Test - public void testDoctype() { + void testDoctype() { ASTCompilationUnit root = jsp.parse(TEST_DOCTYPE); List docTypeDeclarations = root.findDescendantsOfType(ASTDoctypeDeclaration.class); - assertEquals("One doctype declaration expected!", 1, docTypeDeclarations.size()); + assertEquals(1, docTypeDeclarations.size(), "One doctype declaration expected!"); ASTDoctypeDeclaration docTypeDecl = docTypeDeclarations.iterator().next(); - assertEquals("Correct doctype-name expected!", "html", docTypeDecl.getName()); + assertEquals("html", docTypeDecl.getName(), "Correct doctype-name expected!"); List externalIds = root.findDescendantsOfType(ASTDoctypeExternalId.class); - assertEquals("One doctype external id expected!", 1, externalIds.size()); + assertEquals(1, externalIds.size(), "One doctype external id expected!"); ASTDoctypeExternalId externalId = externalIds.iterator().next(); - assertEquals("Correct external public id expected!", "-//W3C//DTD XHTML 1.1//EN", externalId.getPublicId()); - assertEquals("Correct external uri expected!", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd", - externalId.getUri()); + assertEquals("-//W3C//DTD XHTML 1.1//EN", externalId.getPublicId(), "Correct external public id expected!"); + assertEquals("http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd", externalId.getUri(), "Correct external uri expected!"); } @@ -124,22 +122,22 @@ public class JspDocStyleTest extends AbstractJspNodesTst { * */ @Test - public void testComment() { + void testComment() { List comments = jsp.getNodes(ASTCommentTag.class, TEST_COMMENT); - assertEquals("One comment expected!", 1, comments.size()); + assertEquals(1, comments.size(), "One comment expected!"); ASTCommentTag comment = comments.iterator().next(); - assertEquals("Correct comment content expected!", "comment", comment.getImage()); + assertEquals("comment", comment.getImage(), "Correct comment content expected!"); } /** * Test parsing of HTML <script> element. */ @Test - public void testHtmlScript() { + void testHtmlScript() { List scripts = jsp.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT); - assertEquals("One script expected!", 1, scripts.size()); + assertEquals(1, scripts.size(), "One script expected!"); ASTHtmlScript script = scripts.iterator().next(); - assertEquals("Correct script content expected!", "Script!", script.getImage()); + assertEquals("Script!", script.getImage(), "Correct script content expected!"); } /** @@ -147,9 +145,9 @@ public class JspDocStyleTest extends AbstractJspNodesTst { * html but it is likely to appear in .JSP files. */ @Test - public void testImportHtmlScript() { + void testImportHtmlScript() { List scripts = jsp.getNodes(ASTHtmlScript.class, TEST_IMPORT_JAVASCRIPT); - assertEquals("One script expected!", 1, scripts.size()); + assertEquals(1, scripts.size(), "One script expected!"); ASTHtmlScript script = scripts.iterator().next(); List value = script.findDescendantsOfType(ASTAttributeValue.class); assertEquals("filename.js", value.get(0).getImage()); @@ -159,46 +157,46 @@ public class JspDocStyleTest extends AbstractJspNodesTst { * Test parsing of HTML <script> element. */ @Test - public void testHtmlScriptWithAttribute() { + void testHtmlScriptWithAttribute() { List scripts = jsp.getNodes(ASTHtmlScript.class, TEST_HTML_SCRIPT_WITH_ATTRIBUTE); - assertEquals("One script expected!", 1, scripts.size()); + assertEquals(1, scripts.size(), "One script expected!"); ASTHtmlScript script = scripts.iterator().next(); - assertEquals("Correct script content expected!", "Script!", script.getImage()); + assertEquals("Script!", script.getImage(), "Correct script content expected!"); List attrs = script.findDescendantsOfType(ASTAttributeValue.class); - assertTrue("text/javascript".equals(attrs.get(0).getImage())); + assertEquals("text/javascript", attrs.get(0).getImage()); } /** * A complex script containing HTML comments, escapes, quotes, etc. */ @Test - public void testComplexHtmlScript() { + void testComplexHtmlScript() { List script = jsp.getNodes(ASTHtmlScript.class, TEST_COMPLEX_SCRIPT); - assertEquals("One script expected!", 1, script.size()); + assertEquals(1, script.size(), "One script expected!"); ASTHtmlScript next = script.iterator().next(); - assertTrue(next.getImage().contains("\n" @@ -175,7 +175,7 @@ public class XmlXPathRuleTest { } @Test - public void testXmlNsFunctions() { + void testXmlNsFunctions() { // https://github.com/pmd/pmd/issues/2766 Report report = xml.executeRule( makeXPath("/manifest[namespace-uri-for-prefix('android', .) = 'http://schemas.android.com/apk/res/android']"), @@ -205,7 +205,7 @@ public class XmlXPathRuleTest { } @Test - public void testLocationFuns() { + void testLocationFuns() { Rule rule = makeXPath("//Flow[pmd:startLine(.) != pmd:endLine(.)]"); Report report = xml.executeRule(rule, ""); assertSize(report, 0); diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/errorprone/MistypedCDATASectionTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/errorprone/MistypedCDATASectionTest.java index f31e4aa014..d83318a1d0 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/errorprone/MistypedCDATASectionTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/errorprone/MistypedCDATASectionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.xml.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MistypedCDATASectionTest extends PmdRuleTst { +class MistypedCDATASectionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/codestyle/UseConcatOnceTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/codestyle/UseConcatOnceTest.java index a13e5e1f1f..6d5c00f87f 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/codestyle/UseConcatOnceTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/codestyle/UseConcatOnceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.xsl.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseConcatOnceTest extends PmdRuleTst { +class UseConcatOnceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/performance/AvoidAxisNavigationTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/performance/AvoidAxisNavigationTest.java index 597fe35c5d..c08d1e9c0c 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/performance/AvoidAxisNavigationTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xsl/rule/performance/AvoidAxisNavigationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.xsl.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidAxisNavigationTest extends PmdRuleTst { +class AvoidAxisNavigationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/xml/cpd/XmlCPDTokenizerTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/xml/cpd/XmlCPDTokenizerTest.java index 341419b374..194a219b2f 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/xml/cpd/XmlCPDTokenizerTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/xml/cpd/XmlCPDTokenizerTest.java @@ -6,14 +6,14 @@ package net.sourceforge.pmd.xml.cpd; import java.util.Properties; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.Tokenizer; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -public class XmlCPDTokenizerTest extends CpdTextComparisonTest { +class XmlCPDTokenizerTest extends CpdTextComparisonTest { - public XmlCPDTokenizerTest() { + XmlCPDTokenizerTest() { super(".xml"); } @@ -23,7 +23,7 @@ public class XmlCPDTokenizerTest extends CpdTextComparisonTest { } @Test - public void tokenizeTest() { + void tokenizeTest() { doTest("simple"); } } From e7a72df12ed937c935d196374ca0132b63c84195 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 3 Oct 2022 12:52:06 +0200 Subject: [PATCH 28/31] [java] Migrate tests to JUnit5 --- pmd-java/pom.xml | 20 +-- .../net/sourceforge/pmd/ExcludeLinesTest.java | 10 +- .../java/net/sourceforge/pmd/ReportTest.java | 18 +- .../pmd/coverage/PMDCoverageTest.java | 72 ++++---- .../pmd/cpd/JavaTokenizerTest.java | 35 ++-- .../pmd/cpd/MatchAlgorithmTest.java | 12 +- .../lang/java/ast/ASTBooleanLiteralTest.java | 12 +- .../java/ast/ASTImportDeclarationTest.java | 21 +-- .../pmd/lang/java/ast/ASTInitializerTest.java | 6 +- .../java/ast/ASTPackageDeclarationTest.java | 8 +- .../pmd/lang/java/ast/ASTSwitchLabelTest.java | 12 +- .../lang/java/ast/ASTSwitchStatementTest.java | 46 ++--- .../java/ast/ASTVariableDeclaratorIdTest.java | 23 ++- .../lang/java/ast/AllJavaAstTreeDumpTest.java | 11 +- .../lang/java/ast/CommentAssignmentTest.java | 27 +-- .../pmd/lang/java/ast/CommentTest.java | 55 +++--- .../java/ast/ConstantExpressionsTests.java | 50 +++--- .../pmd/lang/java/ast/EncodingTest.java | 8 +- .../pmd/lang/java/ast/FormalCommentTest.java | 23 ++- .../pmd/lang/java/ast/JDKVersionTest.java | 170 +++++++++--------- .../pmd/lang/java/ast/Java10Test.java | 48 ++--- .../pmd/lang/java/ast/Java14TreeDumpTest.java | 16 +- .../pmd/lang/java/ast/Java15TreeDumpTest.java | 26 +-- .../pmd/lang/java/ast/Java16TreeDumpTest.java | 86 ++++----- .../pmd/lang/java/ast/Java17TreeDumpTest.java | 47 ++--- .../java/ast/Java18PreviewTreeDumpTest.java | 59 +++--- .../java/ast/Java19PreviewTreeDumpTest.java | 79 +++----- .../pmd/lang/java/ast/Java8Test.java | 8 +- .../pmd/lang/java/ast/Java9TreeDumpTest.java | 8 +- .../lang/java/ast/JavaQualifiedNameTest.java | 39 ++-- .../pmd/lang/java/ast/ParserCornersTest.java | 106 +++++------ .../lang/java/ast/TextBlockEscapeTest.java | 127 +++++++------ .../java/ast/internal/JavaAstUtilTest.java | 8 +- .../ast/internal/PrettyPrintingUtilTest.java | 24 +-- 34 files changed, 638 insertions(+), 682 deletions(-) diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 77a2524d13..f023cb2790 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -119,16 +119,6 @@ pmd-java-checkstyle-suppressions.xml - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/net/sourceforge/pmd/coverage/PMDCoverageTest.java - - - @@ -184,12 +174,22 @@ junit-jupiter test + + org.junit.platform + junit-platform-suite + test + com.github.stefanbirkner system-rules test + + com.github.stefanbirkner + system-lambda + test + org.apache.ant ant-testutil diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java index fed8b1f0c8..8a48b275d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java @@ -7,21 +7,21 @@ package net.sourceforge.pmd; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; -public class ExcludeLinesTest extends BaseParserTest { +class ExcludeLinesTest extends BaseParserTest { @Test - public void testAcceptance() { + void testAcceptance() { assertSize(java.executeRule(getRule(), TEST1), 0); assertSize(java.executeRule(getRule(), TEST2), 1); } - public Rule getRule() { + Rule getRule() { return new AbstractJavaRule() { { setMessage("!"); @@ -36,7 +36,7 @@ public class ExcludeLinesTest extends BaseParserTest { } @Test - public void testAlternateMarker() { + void testAlternateMarker() { Report rpt = java.withSuppressMarker("FOOBAR").executeRule(getRule(), TEST3); assertSize(rpt, 0); assertSuppressed(rpt, 1); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java index 0e03f83cbe..8c334d27f5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java @@ -6,25 +6,25 @@ package net.sourceforge.pmd; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class ReportTest { +class ReportTest { private final JavaParsingHelper java = JavaParsingHelper.DEFAULT; @Test - public void testBasic() { + void testBasic() { Report r = java.executeRule(new FooRule(), TEST1); assertFalse(r.getViolations().isEmpty()); } @Test - public void testExclusionsInReportWithRuleViolationSuppressRegex() { + void testExclusionsInReportWithRuleViolationSuppressRegex() { Rule rule = new FooRule(); rule.setProperty(Rule.VIOLATION_SUPPRESS_REGEX_DESCRIPTOR, ".*No Foo.*"); Report rpt = java.executeRule(rule, TEST1); @@ -33,7 +33,7 @@ public class ReportTest { } @Test - public void testExclusionsInReportWithRuleViolationSuppressXPath() { + void testExclusionsInReportWithRuleViolationSuppressXPath() { Rule rule = new FooRule(); rule.setProperty(Rule.VIOLATION_SUPPRESS_XPATH_DESCRIPTOR, ".[@SimpleName = 'Foo']"); Report rpt = java.executeRule(rule, TEST1); @@ -42,7 +42,7 @@ public class ReportTest { } @Test - public void testExclusionsInReportWithAnnotations() { + void testExclusionsInReportWithAnnotations() { Report rpt = java.executeRule(new FooRule(), TEST2); assertSize(rpt, 0); @@ -50,14 +50,14 @@ public class ReportTest { } @Test - public void testExclusionsInReportWithAnnotationsFullName() { + void testExclusionsInReportWithAnnotationsFullName() { Report rpt = java.executeRule(new FooRule(), TEST2_FULL); assertSize(rpt, 0); assertSuppressed(rpt, 1); } @Test - public void testExclusionsInReportWithNOPMD() { + void testExclusionsInReportWithNOPMD() { Report rpt = java.executeRule(new FooRule(), TEST3); assertSize(rpt, 0); assertSuppressed(rpt, 1); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java index 992d008467..a54b5989a9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java @@ -4,53 +4,50 @@ package net.sourceforge.pmd.coverage; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; -import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Arrays; import java.util.List; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.SystemErrRule; -import org.junit.contrib.java.lang.system.SystemOutRule; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.java.JavaLanguageModule; import net.sourceforge.pmd.util.IOUtil; -public class PMDCoverageTest { +import com.github.stefanbirkner.systemlambda.SystemLambda; - @Rule - public SystemOutRule output = new SystemOutRule().muteForSuccessfulTests().enableLog(); +// TODO enable test +@Disabled("Test is failing and was excluded on PMD 7 branch") +class PMDCoverageTest { - @Rule - public SystemErrRule errorStream = new SystemErrRule().muteForSuccessfulTests().enableLog(); - - @Rule - public TemporaryFolder folder = new TemporaryFolder(); + @TempDir + private Path tempFolder; @Test - public void testPmdOptions() { + void testPmdOptions() { runPmd("-d src/main/java/net/sourceforge/pmd/lang/java/rule/design -f text -R rulesets/internal/all-java.xml -stress -benchmark"); } @Test - public void runAllJavaPmdOnSourceTree() { + void runAllJavaPmdOnSourceTree() { runPmd("-d src/main/java -f text -R rulesets/internal/all-java.xml"); } @Test - public void runAllJavaPmdOnTestResourcesWithLatestJavaVersion() { + void runAllJavaPmdOnTestResourcesWithLatestJavaVersion() { List versions = JavaLanguageModule.getInstance().getVersions(); LanguageVersion latest = versions.get(versions.size() - 1); @@ -63,40 +60,45 @@ public class PMDCoverageTest { * @param commandLine */ private void runPmd(String commandLine) { - String[] args = commandLine.split("\\s"); - String report = "missing report"; + StringBuilder report = new StringBuilder("missing report"); try { - - File f = folder.newFile(); - args = ArrayUtils.addAll( - args, + Path f = Files.createTempFile(tempFolder, PMDCoverageTest.class.getSimpleName(), null); + String[] args = ArrayUtils.addAll( + commandLine.split("\\s"), "-reportfile", - f.getAbsolutePath(), + f.toAbsolutePath().toString(), "-threads", String.valueOf(Runtime.getRuntime().availableProcessors()) ); System.err.println("Running PMD with: " + Arrays.toString(args)); - PMD.runPmd(args); - report = IOUtil.readFileToString(f, StandardCharsets.UTF_8); + String output = SystemLambda.tapSystemOut(() -> { + String errorOutput = SystemLambda.tapSystemErr(() -> { + PMD.runPmd(args); - assertEquals("Nothing should be output to stdout", 0, output.getLog().length()); + report.setLength(0); + report.append(IOUtil.readFileToString(f.toFile(), StandardCharsets.UTF_8)); + }); + assertEquals(0, StringUtils.countMatches(errorOutput, "Exception applying rule"), "No exceptions expected"); + assertFalse(errorOutput.contains("Ruleset not found"), "Wrong configuration? Ruleset not found"); + assertEquals(0, StringUtils.countMatches(errorOutput, "Use of deprecated attribute"), "No usage of deprecated XPath attributes expected"); + }); - assertEquals("No exceptions expected", 0, StringUtils.countMatches(errorStream.getLog(), "Exception applying rule")); - assertFalse("Wrong configuration? Ruleset not found", errorStream.getLog().contains("Ruleset not found")); - assertEquals("No usage of deprecated XPath attributes expected", 0, StringUtils.countMatches(errorStream.getLog(), "Use of deprecated attribute")); + assertEquals(0, output.length(), "Nothing should be output to stdout"); - assertEquals("No processing errors expected", 0, StringUtils.countMatches(report, "Error while processing")); + assertEquals(0, StringUtils.countMatches(report, "Error while processing"), "No processing errors expected"); // we might have explicit examples of parsing errors, so these are maybe false positives - assertEquals("No parsing error expected", 0, StringUtils.countMatches(report, "Error while parsing")); + assertEquals(0, StringUtils.countMatches(report, "Error while parsing"), "No parsing error expected"); } catch (IOException ioe) { fail("Problem creating temporary file: " + ioe.getLocalizedMessage()); } catch (AssertionError ae) { System.out.println("\nReport:\n"); System.out.println(report); throw ae; + } catch (Exception e) { + throw new RuntimeException(e); } } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/cpd/JavaTokenizerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/cpd/JavaTokenizerTest.java index 21329e9220..f2840b90f3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/cpd/JavaTokenizerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/cpd/JavaTokenizerTest.java @@ -6,15 +6,16 @@ package net.sourceforge.pmd.cpd; import java.util.Properties; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest; -@Ignore("Needs to be enabled after java-grammar changes are finalized") -public class JavaTokenizerTest extends CpdTextComparisonTest { +// TODO - enable test +@Disabled("Needs to be enabled after java-grammar changes are finalized") +class JavaTokenizerTest extends CpdTextComparisonTest { - public JavaTokenizerTest() { + JavaTokenizerTest() { super(".java"); } @@ -31,62 +32,62 @@ public class JavaTokenizerTest extends CpdTextComparisonTest { } @Test - public void testCommentsIgnored() { + void testCommentsIgnored() { doTest("simpleClassWithComments"); } @Test - public void testDiscardedElements() { + void testDiscardedElements() { doTest("discardedElements", "_ignore_annots", ignoreAnnotations()); } @Test - public void testDiscardedElementsExceptAnnots() { + void testDiscardedElementsExceptAnnots() { doTest("discardedElements", "_no_ignore_annots"); } @Test - public void testIgnoreBetweenSpecialComments() { + void testIgnoreBetweenSpecialComments() { doTest("specialComments"); } @Test - public void testIgnoreBetweenSpecialAnnotation() { + void testIgnoreBetweenSpecialAnnotation() { doTest("ignoreSpecialAnnotations"); } @Test - public void testIgnoreBetweenSpecialAnnotationAndIgnoreAnnotations() { + void testIgnoreBetweenSpecialAnnotationAndIgnoreAnnotations() { doTest("ignoreSpecialAnnotations", "_ignore_annots", ignoreAnnotations()); } @Test - public void testIgnoreIdentifiersDontAffectConstructors() { + void testIgnoreIdentifiersDontAffectConstructors() { doTest("ignoreIdentsPreservesCtor", "", ignoreIdents()); } @Test - public void testIgnoreIdentifiersHandlesEnums() { + void testIgnoreIdentifiersHandlesEnums() { doTest("ignoreIdentsPreservesEnum", "", ignoreIdents()); } @Test - public void testIgnoreIdentifiersWithClassKeyword() { + void testIgnoreIdentifiersWithClassKeyword() { doTest("ignoreIdentsPreservesClassLiteral", "", ignoreIdents()); } @Test - public void testIgnoreLiterals() { + void testIgnoreLiterals() { doTest("ignoreLiterals", "", ignoreLiterals()); } @Test - public void testNoIgnoreLiterals() { + void testNoIgnoreLiterals() { doTest("ignoreLiterals", "_noignore"); } @Test - public void testTabWidth() { + void testTabWidth() { doTest("tabWidth"); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/cpd/MatchAlgorithmTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/cpd/MatchAlgorithmTest.java index a4f74ba363..7920f70b7b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/cpd/MatchAlgorithmTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/cpd/MatchAlgorithmTest.java @@ -4,17 +4,17 @@ package net.sourceforge.pmd.cpd; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class MatchAlgorithmTest { +class MatchAlgorithmTest { private static final String LINE_1 = "public class Foo { "; private static final String LINE_2 = " public void bar() {"; @@ -31,7 +31,7 @@ public class MatchAlgorithmTest { } @Test - public void testSimple() throws IOException { + void testSimple() throws IOException { JavaTokenizer tokenizer = new JavaTokenizer(); SourceCode sourceCode = new SourceCode(new SourceCode.StringCodeLoader(getSampleCode(), "Foo.java")); Tokens tokens = new Tokens(); @@ -62,7 +62,7 @@ public class MatchAlgorithmTest { } @Test - public void testIgnore() throws IOException { + void testIgnore() throws IOException { JavaTokenizer tokenizer = new JavaTokenizer(); tokenizer.setIgnoreLiterals(true); tokenizer.setIgnoreIdentifiers(true); 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 b6319df5e8..a52aad4645 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 @@ -4,26 +4,26 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTBooleanLiteralTest extends BaseParserTest { +class ASTBooleanLiteralTest extends BaseParserTest { @Test - public void testTrue() { + void testTrue() { List ops = java.getNodes(ASTBooleanLiteral.class, TEST1); ASTBooleanLiteral b = ops.get(0); assertTrue(b.isTrue()); } @Test - public void testFalse() { + void testFalse() { List ops = java.getNodes(ASTBooleanLiteral.class, TEST2); ASTBooleanLiteral b = ops.get(0); assertFalse(b.isTrue()); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java index 070170b319..af22874655 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java @@ -4,40 +4,41 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTImportDeclarationTest extends BaseParserTest { +class ASTImportDeclarationTest extends BaseParserTest { @Test - public void testImportOnDemand() { + void testImportOnDemand() { List ops = java.getNodes(ASTImportDeclaration.class, TEST1); assertTrue(ops.get(0).isImportOnDemand()); } @Test - public void testGetImportedNameNode() { + void testGetImportedNameNode() { ASTImportDeclaration i = java.getNodes(ASTImportDeclaration.class, TEST2).get(0); assertEquals("foo.bar.Baz", i.getImportedName()); } @Test - public void testStaticImport() { + void testStaticImport() { List ops = java.getNodes(ASTImportDeclaration.class, TEST3); ASTImportDeclaration i = ops.get(0); assertTrue(i.isStatic()); } - @Test(expected = ParseException.class) - public void testStaticImportFailsWithJDK14() { - java.parse(TEST3, "1.4"); + @Test + void testStaticImportFailsWithJDK14() { + assertThrows(ParseException.class, () -> java.parse(TEST3, "1.4")); } private static final String TEST1 = "import foo.bar.*;\npublic class Foo {}"; 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 cbb3527f99..711312156f 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 @@ -4,14 +4,14 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTInitializerTest extends BaseParserTest { +class ASTInitializerTest extends BaseParserTest { @Test - public void testDontCrashOnBlockStatement() { + void testDontCrashOnBlockStatement() { java.parse("public class Foo { { x = 5; } }"); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java index 5fa767ab6f..60f0bb74a0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTPackageDeclarationTest.java @@ -4,13 +4,13 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTPackageDeclarationTest extends BaseParserTest { +class ASTPackageDeclarationTest extends BaseParserTest { private static final String PACKAGE_INFO_ANNOTATED = "@Deprecated\npackage net.sourceforge.pmd.foobar;\n"; @@ -18,7 +18,7 @@ public class ASTPackageDeclarationTest extends BaseParserTest { * Regression test for bug 3524607. */ @Test - public void testPackageName() { + void testPackageName() { ASTCompilationUnit nodes = java.parse(PACKAGE_INFO_ANNOTATED); assertEquals("net.sourceforge.pmd.foobar", nodes.getPackageDeclaration().getName()); 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 72c8447bdb..feb58e5fcb 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 @@ -4,25 +4,25 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTSwitchLabelTest extends BaseParserTest { +class ASTSwitchLabelTest extends BaseParserTest { @Test - public void testDefaultOff() { + void testDefaultOff() { List ops = java.getNodes(ASTSwitchLabel.class, "public class Foo {\n void bar() {\n switch (x) {\n case 1: y = 2;\n }\n }\n}"); assertFalse(ops.get(0).isDefault()); } @Test - public void testDefaultSet() { + void testDefaultSet() { List ops = java.getNodes(ASTSwitchLabel.class, TEST2); assertTrue(ops.get(0).isDefault()); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatementTest.java index f512d16415..3e8f16771c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchStatementTest.java @@ -4,48 +4,50 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ASTSwitchStatementTest extends BaseParserTest { +class ASTSwitchStatementTest extends BaseParserTest { @Test - public void exhaustiveEnumSwitchWithDefault() { + void exhaustiveEnumSwitchWithDefault() { ASTSwitchStatement switchStatement = java.parse( "import java.nio.file.AccessMode; class Foo { void bar(AccessMode m) {" + "switch (m) { case READ: break; default: break; } } }") .descendants(ASTSwitchStatement.class).firstOrThrow(); - Assert.assertFalse(switchStatement.isExhaustiveEnumSwitch()); // this should not throw a NPE... - Assert.assertTrue(switchStatement.hasDefaultCase()); - Assert.assertTrue(switchStatement.isFallthroughSwitch()); + assertFalse(switchStatement.isExhaustiveEnumSwitch()); // this should not throw a NPE... + assertTrue(switchStatement.hasDefaultCase()); + assertTrue(switchStatement.isFallthroughSwitch()); } @Test - public void defaultCaseWithArrowBlock() { + void defaultCaseWithArrowBlock() { ASTSwitchStatement switchStatement = java.parse("class Foo { void bar(int x) {switch (x) { default -> { } } } }") .descendants(ASTSwitchStatement.class).firstOrThrow(); - Assert.assertFalse(switchStatement.isExhaustiveEnumSwitch()); - Assert.assertTrue(switchStatement.iterator().hasNext()); - Assert.assertTrue(switchStatement.hasDefaultCase()); - Assert.assertFalse(switchStatement.isFallthroughSwitch()); + assertFalse(switchStatement.isExhaustiveEnumSwitch()); + assertTrue(switchStatement.iterator().hasNext()); + assertTrue(switchStatement.hasDefaultCase()); + assertFalse(switchStatement.isFallthroughSwitch()); } @Test - public void emptySwitch() { + void emptySwitch() { ASTSwitchStatement switchStatement = java.parse("class Foo { void bar(int x) {switch (x) { } } }") .descendants(ASTSwitchStatement.class).firstOrThrow(); - Assert.assertFalse(switchStatement.isExhaustiveEnumSwitch()); - Assert.assertFalse(switchStatement.iterator().hasNext()); - Assert.assertFalse(switchStatement.hasDefaultCase()); - Assert.assertFalse(switchStatement.isFallthroughSwitch()); + assertFalse(switchStatement.isExhaustiveEnumSwitch()); + assertFalse(switchStatement.iterator().hasNext()); + assertFalse(switchStatement.hasDefaultCase()); + assertFalse(switchStatement.isFallthroughSwitch()); } @Test - public void defaultCaseWithArrowExprs() { + void defaultCaseWithArrowExprs() { ASTSwitchStatement switchStatement = java.parse( "import net.sourceforge.pmd.lang.java.rule.bestpractices.switchstmtsshouldhavedefault.SimpleEnum;\n" @@ -60,9 +62,9 @@ public class ASTSwitchStatementTest extends BaseParserTest { + " }\n" + " }") .descendants(ASTSwitchStatement.class).firstOrThrow(); - Assert.assertFalse(switchStatement.isExhaustiveEnumSwitch()); - Assert.assertTrue(switchStatement.iterator().hasNext()); - Assert.assertFalse(switchStatement.isFallthroughSwitch()); - Assert.assertTrue(switchStatement.hasDefaultCase()); + assertFalse(switchStatement.isExhaustiveEnumSwitch()); + assertTrue(switchStatement.iterator().hasNext()); + assertFalse(switchStatement.isFallthroughSwitch()); + assertTrue(switchStatement.hasDefaultCase()); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java index 2fe8636e5b..a6f5fbc617 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorIdTest.java @@ -4,27 +4,27 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.internal.PrettyPrintingUtil; -public class ASTVariableDeclaratorIdTest extends BaseParserTest { +class ASTVariableDeclaratorIdTest extends BaseParserTest { @Test - public void testIsExceptionBlockParameter() { + void testIsExceptionBlockParameter() { ASTCompilationUnit acu = java.parse(EXCEPTION_PARAMETER); ASTVariableDeclaratorId id = acu.getFirstDescendantOfType(ASTVariableDeclaratorId.class); assertTrue(id.isExceptionBlockParameter()); } @Test - public void testTypeNameNode() { + void testTypeNameNode() { ASTCompilationUnit acu = java.parse(TYPE_NAME_NODE); ASTVariableDeclaratorId id = acu.findDescendantsOfType(ASTVariableDeclaratorId.class).get(0); @@ -33,7 +33,7 @@ public class ASTVariableDeclaratorIdTest extends BaseParserTest { } @Test - public void testAnnotations() { + void testAnnotations() { ASTCompilationUnit acu = java.parse(TEST_ANNOTATIONS); ASTVariableDeclaratorId id = acu.findDescendantsOfType(ASTVariableDeclaratorId.class).get(0); @@ -42,7 +42,7 @@ public class ASTVariableDeclaratorIdTest extends BaseParserTest { } @Test - public void testLambdaWithType() throws Exception { + void testLambdaWithType() throws Exception { ASTCompilationUnit acu = java8.parse(TEST_LAMBDA_WITH_TYPE); ASTLambdaExpression lambda = acu.getFirstDescendantOfType(ASTLambdaExpression.class); ASTVariableDeclaratorId f = lambda.getFirstDescendantOfType(ASTVariableDeclaratorId.class); @@ -50,7 +50,7 @@ public class ASTVariableDeclaratorIdTest extends BaseParserTest { } @Test - public void testLambdaWithoutType() throws Exception { + void testLambdaWithoutType() throws Exception { ASTCompilationUnit acu = java8.parse(TEST_LAMBDA_WITHOUT_TYPE); ASTLambdaExpression lambda = acu.getFirstDescendantOfType(ASTLambdaExpression.class); ASTVariableDeclaratorId f = lambda.getFirstDescendantOfType(ASTVariableDeclaratorId.class); @@ -65,7 +65,4 @@ public class ASTVariableDeclaratorIdTest extends BaseParserTest { private static final String TEST_LAMBDA_WITHOUT_TYPE = "public class Foo {\n public void bar() {\n FileFilter java2 = f -> f.getName().endsWith(\".java\");\n }\n}\n"; - public static junit.framework.Test suite() { - return new junit.framework.JUnit4TestAdapter(ASTVariableDeclaratorIdTest.class); - } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AllJavaAstTreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AllJavaAstTreeDumpTest.java index 4a59c845de..4ca47f20d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AllJavaAstTreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/AllJavaAstTreeDumpTest.java @@ -4,12 +4,11 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; -@RunWith(Suite.class) -@SuiteClasses({ +@Suite +@SelectClasses({ ParserCornersTest.class, Java14TreeDumpTest.class, Java15TreeDumpTest.class, @@ -18,6 +17,6 @@ import org.junit.runners.Suite.SuiteClasses; Java18PreviewTreeDumpTest.class, Java19PreviewTreeDumpTest.class }) -public class AllJavaAstTreeDumpTest { +class AllJavaAstTreeDumpTest { } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentAssignmentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentAssignmentTest.java index 9f7c67fe04..488cd54e72 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentAssignmentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentAssignmentTest.java @@ -6,22 +6,23 @@ package net.sourceforge.pmd.lang.java.ast; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class CommentAssignmentTest extends BaseParserTest { +class CommentAssignmentTest extends BaseParserTest { /** * Blank lines in comments should not raise an exception. See bug #1048. */ @Test - public void testFilteredCommentIn() { + void testFilteredCommentIn() { ASTCompilationUnit node = java.parse("public class Foo {\n" + " /* multi line comment with blank lines\n\n\n */\n" + " /** a formal comment with blank lines\n\n\n */" @@ -39,7 +40,7 @@ public class CommentAssignmentTest extends BaseParserTest { @Test - public void testCommentAssignments() { + void testCommentAssignments() { ASTCompilationUnit node = java.parse("public class Foo {\n" + " /** Comment 1 */\n" @@ -56,7 +57,7 @@ public class CommentAssignmentTest extends BaseParserTest { } @Test - public void testCommentAssignmentsWithAnnotation() { + void testCommentAssignmentsWithAnnotation() { ASTCompilationUnit node = java.parse("public class Foo {\n" + " /** Comment 1 */\n" @@ -74,7 +75,7 @@ public class CommentAssignmentTest extends BaseParserTest { } @Test - public void testCommentAssignmentOnPackage() { + void testCommentAssignmentOnPackage() { ASTCompilationUnit node = java.parse("/** Comment 1 */\n" + "package bar;\n"); @@ -84,7 +85,7 @@ public class CommentAssignmentTest extends BaseParserTest { } @Test - public void testCommentAssignmentOnClass() { + void testCommentAssignmentOnClass() { ASTCompilationUnit node = java.parse("/** outer */\n" + "class Foo { " @@ -101,7 +102,7 @@ public class CommentAssignmentTest extends BaseParserTest { } @Test - public void testCommentAssignmentOnEnum() { + void testCommentAssignmentOnEnum() { ASTCompilationUnit node = java.parse("enum Foo { " + " /** A */ A," @@ -119,11 +120,11 @@ public class CommentAssignmentTest extends BaseParserTest { private void assertCommentEquals(JavadocCommentOwner pack, String expected) { - Assert.assertNotNull("null comment on " + pack, pack.getJavadocComment()); - Assert.assertEquals(expected, pack.getJavadocComment().getText().toString()); + assertNotNull(pack.getJavadocComment(), "null comment on " + pack); + assertEquals(expected, pack.getJavadocComment().getText().toString()); } private void assertHasNoComment(JavadocCommentOwner pack) { - Assert.assertNull("Expected null comment on " + pack, pack.getJavadocComment()); + assertNull(pack.getJavadocComment(), "Expected null comment on " + pack); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentTest.java index 9b603ee958..7247a3a3bb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/CommentTest.java @@ -4,88 +4,89 @@ package net.sourceforge.pmd.lang.java.ast; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class CommentTest extends BaseParserTest { +class CommentTest extends BaseParserTest { @Test - public void testMultiLinesInSingleLine() { + void testMultiLinesInSingleLine() { String comment = "/* single line. */"; String filtered = filter(comment); - Assert.assertEquals(1, lineCount(filtered)); - Assert.assertEquals("single line.", filtered); + assertEquals(1, lineCount(filtered)); + assertEquals("single line.", filtered); } @Test - public void testMultiLinesInSingleLineSimple() { + void testMultiLinesInSingleLineSimple() { String comment = "// single line."; String filtered = filter(comment); - Assert.assertEquals(1, lineCount(filtered)); - Assert.assertEquals("single line.", filtered); + assertEquals(1, lineCount(filtered)); + assertEquals("single line.", filtered); } @Test - public void testMultiLinesInSingleLineFormal() { + void testMultiLinesInSingleLineFormal() { String comment = "/** single line. */"; String filtered = filter(comment); - Assert.assertEquals(1, lineCount(filtered)); - Assert.assertEquals("single line.", filtered); + assertEquals(1, lineCount(filtered)); + assertEquals("single line.", filtered); } @Test - public void testMultiLinesInMultiLine() { + void testMultiLinesInMultiLine() { String comment = "/*\n" + " * line 1\n" + " * line 2\n" + " */\n"; String filtered = filter(comment); - Assert.assertEquals(2, lineCount(filtered)); - Assert.assertEquals("line 1" + PMD.EOL + "line 2", filtered); + assertEquals(2, lineCount(filtered)); + assertEquals("line 1" + PMD.EOL + "line 2", filtered); } @Test - public void testMultiLinesInMultiLineCrLf() { + void testMultiLinesInMultiLineCrLf() { String comment = "/*\r\n" + " * line 1\r\n" + " * line 2\r\n" + " */\r\n"; String filtered = filter(comment); - Assert.assertEquals(2, lineCount(filtered)); - Assert.assertEquals("line 1" + PMD.EOL + "line 2", filtered); + assertEquals(2, lineCount(filtered)); + assertEquals("line 1" + PMD.EOL + "line 2", filtered); } @Test - public void testMultiLinesInMultiLineFormal() { + void testMultiLinesInMultiLineFormal() { String comment = "/**\n" + " * line 1\n" + " * line 2\n" + " */\n"; String filtered = filter(comment); - Assert.assertEquals(2, lineCount(filtered)); - Assert.assertEquals("line 1" + PMD.EOL + "line 2", filtered); + assertEquals(2, lineCount(filtered)); + assertEquals("line 1" + PMD.EOL + "line 2", filtered); } @Test - public void testMultiLinesInMultiLineFormalCrLf() { + void testMultiLinesInMultiLineFormalCrLf() { String comment = "/**\r\n" + " * line 1\r\n" + " * line 2\r\n" + " */\r\n"; String filtered = filter(comment); - Assert.assertEquals(2, lineCount(filtered)); - Assert.assertEquals("line 1" + PMD.EOL + "line 2", filtered); + assertEquals(2, lineCount(filtered)); + assertEquals("line 1" + PMD.EOL + "line 2", filtered); } @Test - public void testMultiLinesInMultiLineNoAsteriskEmpty() { + void testMultiLinesInMultiLineNoAsteriskEmpty() { String comment = "/**\n" + " * line 1\n" @@ -93,8 +94,8 @@ public class CommentTest extends BaseParserTest { + "\n" + " */\n"; String filtered = filter(comment); - Assert.assertEquals(2, lineCount(filtered)); - Assert.assertEquals("line 1" + PMD.EOL + "line 2", filtered); + assertEquals(2, lineCount(filtered)); + assertEquals("line 1" + PMD.EOL + "line 2", filtered); } private String filter(String comment) { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ConstantExpressionsTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ConstantExpressionsTests.java index 2138855725..d734963668 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ConstantExpressionsTests.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ConstantExpressionsTests.java @@ -5,15 +5,15 @@ package net.sourceforge.pmd.lang.java.ast; +import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; -import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class ConstantExpressionsTests extends BaseParserTest { +class ConstantExpressionsTests extends BaseParserTest { private Executable isConst(String expr, Object value) { return () -> { @@ -29,8 +29,8 @@ public class ConstantExpressionsTests extends BaseParserTest { } @Test - public void testUnaries() { - Assertions.assertAll( + void testUnaries() { + assertAll( isConst("+1", 1), isConst("+1L", 1L), isConst("-1L", -1L), @@ -53,8 +53,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public void testCasts() { - Assertions.assertAll( + void testCasts() { + assertAll( isConst("+1", 1), isConst("(long) +1", 1L), isConst("(long) 'c'", (long) 'c'), @@ -76,8 +76,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public void testShortcutBoolean() { - Assertions.assertAll( + void testShortcutBoolean() { + assertAll( isConst("true && true", true), isConst("true && false", false), isConst("false && true", false), @@ -105,8 +105,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public strictfp void testBitwise() { - Assertions.assertAll( + strictfp void testBitwise() { + assertAll( isConst("~1 ^ ~8", ~1 ^ ~8), isConst("~1 ^ ~8L", ~1 ^ ~8L), @@ -144,8 +144,8 @@ public class ConstantExpressionsTests extends BaseParserTest { } @Test - public void testShifts() { - Assertions.assertAll( + void testShifts() { + assertAll( isConst("1 << 2", 1 << 2), isConst("1 << 2L", 1 << 2L), isConst("1L << 2L", 1L << 2L), @@ -174,8 +174,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public void testAdditives() { - Assertions.assertAll( + void testAdditives() { + assertAll( isConst("1 + 2", 3), isConst("1 + ~2", 1 + ~2), isConst("1 - 2", -1), @@ -204,8 +204,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public strictfp void testMult() { - Assertions.assertAll( + strictfp void testMult() { + assertAll( isConst("1 * 2.0", 1 * 2.0), isConst("1L * 2", 2L), isConst("1L * 2F", 1L * 2F), @@ -244,8 +244,8 @@ public class ConstantExpressionsTests extends BaseParserTest { } @Test - public strictfp void testRelationals() { - Assertions.assertAll( + strictfp void testRelationals() { + assertAll( isConst("1 <= 2L", true), isConst("2 <= 2d", true), isConst("'c' <= 6", false), @@ -284,8 +284,8 @@ public class ConstantExpressionsTests extends BaseParserTest { } @Test - public strictfp void testEquality() { - Assertions.assertAll( + strictfp void testEquality() { + assertAll( isConst("1 == 2", false), isConst("2 != 2d", false), isConst("'x' != (int) 'x'", false), @@ -299,8 +299,8 @@ public class ConstantExpressionsTests extends BaseParserTest { } @Test - public strictfp void testConditionals() { - Assertions.assertAll( + strictfp void testConditionals() { + assertAll( isConst("true ? 1 + 2 : 4", 3), isConst("false ? 1 + 2 : 4", 4), isConst("1 == 2 ? 1 + 2 : 4", 4), @@ -316,8 +316,8 @@ public class ConstantExpressionsTests extends BaseParserTest { @Test - public strictfp void testConstFields() { - Assertions.assertAll( + strictfp void testConstFields() { + assertAll( isConst("Math.PI", Math.PI), isConst("Math.PI > 3", true), diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java index a4b04a4c25..918ad50230 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/EncodingTest.java @@ -4,16 +4,16 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class EncodingTest extends BaseParserTest { +class EncodingTest extends BaseParserTest { @Test - public void testDecodingOfUTF8() { + void testDecodingOfUTF8() { ASTCompilationUnit acu = java.parse("class Foo { void é() {} }"); String methodName = acu.descendants(ASTMethodDeclaration.class).firstOrThrow().getName(); assertEquals("é", methodName); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FormalCommentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FormalCommentTest.java index 5218d77211..f4fa83f4c7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FormalCommentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/FormalCommentTest.java @@ -4,20 +4,19 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class FormalCommentTest extends BaseParserTest { +class FormalCommentTest extends BaseParserTest { @Test - public void testJavadocTagsAsChildren() { + void testJavadocTagsAsChildren() { ASTCompilationUnit acu = java.parse( "interface Metric {" + " /**\n" @@ -32,23 +31,23 @@ public class FormalCommentTest extends BaseParserTest { ASTType booleanT = acu.descendants(ASTType.class).firstOrThrow(); JavaccToken firstToken = booleanT.getFirstToken(); - assertEquals("Boolean", JavaTokenKinds.BOOLEAN, firstToken.kind); + assertEquals(JavaTokenKinds.BOOLEAN, firstToken.kind, "Boolean"); JavaccToken comment = firstToken.getPreviousComment(); - assertEquals("Implicit modifier list", JavaccToken.IMPLICIT_TOKEN, comment.kind); + assertEquals(JavaccToken.IMPLICIT_TOKEN, comment.kind, "Implicit modifier list"); comment = comment.getPreviousComment(); - assertEquals("Whitespace", JavaTokenKinds.WHITESPACE, comment.kind); + assertEquals(JavaTokenKinds.WHITESPACE, comment.kind, "Whitespace"); assertEquals("\n ", comment.getImage()); comment = comment.getPreviousComment(); - assertEquals("Formal comment", JavaTokenKinds.FORMAL_COMMENT, comment.kind); + assertEquals(JavaTokenKinds.FORMAL_COMMENT, comment.kind, "Formal comment"); List javadocs = new FormalComment(comment).getChildren(); - Assert.assertEquals(2, javadocs.size()); + assertEquals(2, javadocs.size()); JavadocElement paramTag = javadocs.get(0); - Assert.assertEquals("param", paramTag.tag().label); + assertEquals("param", paramTag.tag().label); JavadocElement returnTag = javadocs.get(1); - Assert.assertEquals("return", returnTag.tag().label); + assertEquals("return", returnTag.tag().label); } } 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 049b45c9e9..e72b6e9a76 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 @@ -4,22 +4,22 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class JDKVersionTest extends BaseJavaTreeDumpTest { +class JDKVersionTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java3 = JavaParsingHelper.DEFAULT .withDefaultVersion("1.3") @@ -32,89 +32,89 @@ public class JDKVersionTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java9 = java3.withDefaultVersion("9"); // enum keyword/identifier - @Test(expected = ParseException.class) + @Test public void testEnumAsKeywordShouldFailWith14() { - java5.parseResource("jdk14_enum.java"); + assertThrows(ParseException.class, () -> java5.parseResource("jdk14_enum.java")); } @Test - public void testEnumAsIdentifierShouldPassWith14() { + void testEnumAsIdentifierShouldPassWith14() { java4.parseResource("jdk14_enum.java"); } @Test - public void testEnumAsKeywordShouldPassWith15() { + void testEnumAsKeywordShouldPassWith15() { java5.parseResource("jdk15_enum.java"); } - @Test(expected = ParseException.class) - public void testEnumAsIdentifierShouldFailWith15() { - java5.parseResource("jdk14_enum.java"); + @Test + void testEnumAsIdentifierShouldFailWith15() { + assertThrows(ParseException.class, () -> java5.parseResource("jdk14_enum.java")); } // enum keyword/identifier // assert keyword/identifier @Test - public void testAssertAsKeywordVariantsSucceedWith14() { + void testAssertAsKeywordVariantsSucceedWith14() { java4.parseResource("assert_test1.java"); java4.parseResource("assert_test2.java"); java4.parseResource("assert_test3.java"); java4.parseResource("assert_test4.java"); } - @Test(expected = ParseException.class) - public void testAssertAsVariableDeclIdentifierFailsWith14() { - java4.parseResource("assert_test5.java"); - } - - @Test(expected = ParseException.class) - public void testAssertAsMethodNameIdentifierFailsWith14() { - java4.parseResource("assert_test7.java"); + @Test + void testAssertAsVariableDeclIdentifierFailsWith14() { + assertThrows(ParseException.class, () -> java4.parseResource("assert_test5.java")); } @Test - public void testAssertAsIdentifierSucceedsWith13() { + void testAssertAsMethodNameIdentifierFailsWith14() { + assertThrows(ParseException.class, () -> java4.parseResource("assert_test7.java")); + } + + @Test + void testAssertAsIdentifierSucceedsWith13() { java3.parseResource("assert_test5.java"); } - @Test(expected = ParseException.class) - public void testAssertAsKeywordFailsWith13() { - java3.parseResource("assert_test6.java"); + @Test + void testAssertAsKeywordFailsWith13() { + assertThrows(ParseException.class, () -> java3.parseResource("assert_test6.java")); } // assert keyword/identifier @Test - public void testVarargsShouldPassWith15() { + void testVarargsShouldPassWith15() { java5.parseResource("jdk15_varargs.java"); } - @Test(expected = ParseException.class) - public void testVarargsShouldFailWith14() { - java4.parseResource("jdk15_varargs.java"); + @Test + void testVarargsShouldFailWith14() { + assertThrows(ParseException.class, () -> java4.parseResource("jdk15_varargs.java")); } @Test - public void testJDK15ForLoopSyntaxShouldPassWith15() { + void testJDK15ForLoopSyntaxShouldPassWith15() { java5.parseResource("jdk15_forloop.java"); } @Test - public void testJDK15ForLoopSyntaxWithModifiers() { + void testJDK15ForLoopSyntaxWithModifiers() { java5.parseResource("jdk15_forloop_with_modifier.java"); } - @Test(expected = ParseException.class) - public void testJDK15ForLoopShouldFailWith14() { - java4.parseResource("jdk15_forloop.java"); + @Test + void testJDK15ForLoopShouldFailWith14() { + assertThrows(ParseException.class, () -> java4.parseResource("jdk15_forloop.java")); } @Test - public void testJDK15GenericsSyntaxShouldPassWith15() { + void testJDK15GenericsSyntaxShouldPassWith15() { java5.parseResource("jdk15_generics.java"); } @Test - public void testVariousParserBugs() { + void testVariousParserBugs() { java5.parseResource("fields_bug.java"); java5.parseResource("gt_bug.java"); java5.parseResource("annotations_bug.java"); @@ -123,28 +123,28 @@ public class JDKVersionTest extends BaseJavaTreeDumpTest { } @Test - public void testNestedClassInMethodBug() { + void testNestedClassInMethodBug() { java5.parseResource("inner_bug.java"); java5.parseResource("inner_bug2.java"); } @Test - public void testGenericsInMethodCall() { + void testGenericsInMethodCall() { java5.parseResource("generic_in_method_call.java"); } @Test - public void testGenericINAnnotation() { + void testGenericINAnnotation() { java5.parseResource("generic_in_annotation.java"); } @Test - public void testGenericReturnType() { + void testGenericReturnType() { java5.parseResource("generic_return_type.java"); } @Test - public void testMultipleGenerics() { + void testMultipleGenerics() { // See java/lang/concurrent/CopyOnWriteArraySet java5.parseResource("funky_generics.java"); // See java/lang/concurrent/ConcurrentHashMap @@ -152,132 +152,132 @@ public class JDKVersionTest extends BaseJavaTreeDumpTest { } @Test - public void testAnnotatedParams() { + void testAnnotatedParams() { java5.parseResource("annotated_params.java"); } @Test - public void testAnnotatedLocals() { + void testAnnotatedLocals() { java5.parseResource("annotated_locals.java"); } @Test - public void testAssertAsIdentifierSucceedsWith13Test2() { + void testAssertAsIdentifierSucceedsWith13Test2() { java3.parseResource("assert_test5_a.java"); } @Test - public final void testBinaryAndUnderscoresInNumericalLiterals() { + void testBinaryAndUnderscoresInNumericalLiterals() { java7.parseResource("jdk17_numerical_literals.java"); } @Test - public final void testStringInSwitch() { + void testStringInSwitch() { java7.parseResource("jdk17_string_in_switch.java"); } @Test - public final void testGenericDiamond() { + void testGenericDiamond() { java7.parseResource("jdk17_generic_diamond.java"); } @Test - public final void testTryWithResources() { + void testTryWithResources() { java7.parseResource("jdk17_try_with_resources.java"); } @Test - public final void testTryWithResourcesSemi() { + void testTryWithResourcesSemi() { java7.parseResource("jdk17_try_with_resources_semi.java"); } @Test - public final void testTryWithResourcesMulti() { + void testTryWithResourcesMulti() { java7.parseResource("jdk17_try_with_resources_multi.java"); } @Test - public final void testTryWithResourcesWithAnnotations() { + void testTryWithResourcesWithAnnotations() { java7.parseResource("jdk17_try_with_resources_with_annotations.java"); } @Test - public final void testMulticatch() { + void testMulticatch() { java7.parseResource("jdk17_multicatch.java"); } @Test - public final void testMulticatchWithAnnotations() { + void testMulticatchWithAnnotations() { java7.parseResource("jdk17_multicatch_with_annotations.java"); } - @Test(expected = ParseException.class) - public final void jdk9PrivateInterfaceMethodsInJava18() { - java8.parseResource("java9/jdk9_private_interface_methods.java"); + @Test + void jdk9PrivateInterfaceMethodsInJava18() { + assertThrows(ParseException.class, () -> java8.parseResource("java9/jdk9_private_interface_methods.java")); } @Test - public final void testPrivateMethods() { + void testPrivateMethods() { java8.parse("public class Foo { private void bar() { } }"); } @Test - public final void testNestedPrivateMethods() { + void testNestedPrivateMethods() { java8.parse("public interface Baz { public static class Foo { private void bar() { } } }"); } @Test - public final void jdk9PrivateInterfaceMethods() { + void jdk9PrivateInterfaceMethods() { java9.parseResource("java9/jdk9_private_interface_methods.java"); } @Test - public final void jdk9InvalidIdentifierInJava18() { + void jdk9InvalidIdentifierInJava18() { java8.parseResource("java9/jdk9_invalid_identifier.java"); } - @Test(expected = ParseException.class) - public final void jdk9InvalidIdentifier() { - java9.parseResource("java9/jdk9_invalid_identifier.java"); - } - - @Test(expected = ParseException.class) - public final void jdk9AnonymousDiamondInJava8() { - java8.parseResource("java9/jdk9_anonymous_diamond.java"); + @Test + void jdk9InvalidIdentifier() { + assertThrows(ParseException.class, () -> java9.parseResource("java9/jdk9_invalid_identifier.java")); } @Test - public final void jdk9AnonymousDiamond() { + void jdk9AnonymousDiamondInJava8() { + assertThrows(ParseException.class, () -> java8.parseResource("java9/jdk9_anonymous_diamond.java")); + } + + @Test + void jdk9AnonymousDiamond() { java9.parseResource("java9/jdk9_anonymous_diamond.java"); } - @Test(expected = ParseException.class) - public final void jdk9ModuleInfoInJava8() { - java8.parseResource("java9/jdk9_module_info.java"); + @Test + void jdk9ModuleInfoInJava8() { + assertThrows(ParseException.class, () -> java8.parseResource("java9/jdk9_module_info.java")); } @Test - public final void jdk9ModuleInfo() { + void jdk9ModuleInfo() { java9.parseResource("java9/jdk9_module_info.java"); } @Test - public void testAnnotatedModule() { + void testAnnotatedModule() { java9.parseResource("java9/jdk9_module_info_with_annot.java"); } - @Test(expected = ParseException.class) - public final void jdk9TryWithResourcesInJava8() { - java8.parseResource("java9/jdk9_try_with_resources.java"); + @Test + void jdk9TryWithResourcesInJava8() { + assertThrows(ParseException.class, () -> java8.parseResource("java9/jdk9_try_with_resources.java")); } @Test - public final void jdk9TryWithResources() { + void jdk9TryWithResources() { java9.parseResource("java9/jdk9_try_with_resources.java"); } @Test - public final void jdk7PrivateMethodInnerClassInterface1() { + void jdk7PrivateMethodInnerClassInterface1() { ASTCompilationUnit acu = java7.parseResource("private_method_in_inner_class_interface1.java"); List methods = acu.findDescendantsOfType(ASTMethodDeclaration.class, true); assertEquals(3, methods.size()); @@ -287,13 +287,9 @@ public class JDKVersionTest extends BaseJavaTreeDumpTest { } @Test - public final void jdk7PrivateMethodInnerClassInterface2() { - try { - java7.parseResource("private_method_in_inner_class_interface2.java"); - fail("Expected exception"); - } catch (ParseException e) { - assertTrue(e.getMessage().contains("line 19")); - } + void jdk7PrivateMethodInnerClassInterface2() { + ParseException thrown = assertThrows(ParseException.class, () -> java7.parseResource("private_method_in_inner_class_interface2.java")); + assertTrue(thrown.getMessage().contains("line 19")); } @Override diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java index ec7780e573..8fc01f0633 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java10Test.java @@ -5,10 +5,10 @@ package net.sourceforge.pmd.lang.java.ast; import static net.sourceforge.pmd.util.CollectionUtil.listOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.FileInputStream; import java.util.ArrayList; @@ -16,14 +16,14 @@ import java.util.List; import java.util.stream.Stream; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.types.JClassType; import net.sourceforge.pmd.lang.java.types.TypeSystem; import net.sourceforge.pmd.lang.java.types.TypeTestUtil; -public class Java10Test { +class Java10Test { private final JavaParsingHelper java10 = JavaParsingHelper.DEFAULT.withDefaultVersion("10") @@ -32,7 +32,7 @@ public class Java10Test { private final JavaParsingHelper java9 = java10.withDefaultVersion("9"); @Test - public void testLocalVarInferenceBeforeJava10() { + void testLocalVarInferenceBeforeJava10() { // note, it can be parsed, but we'll have a ReferenceType of "var" List localVars = java9.parseResource("LocalVariableTypeInference.java") @@ -48,11 +48,11 @@ public class Java10Test { // check the type of the variable initializer's expression ASTExpression initExpression = varId.getInitializer(); - assertTrue("type should be ArrayList", TypeTestUtil.isA(ArrayList.class, initExpression)); + assertTrue(TypeTestUtil.isA(ArrayList.class, initExpression), "type should be ArrayList"); } @Test - public void testLocalVarInferenceCanBeParsedJava10() { + void testLocalVarInferenceCanBeParsedJava10() { ASTCompilationUnit compilationUnit = java10.parseResource("LocalVariableTypeInference.java"); List localVars = compilationUnit.findDescendantsOfType(ASTLocalVariableDeclaration.class); assertEquals(3, localVars.size()); @@ -63,71 +63,71 @@ public class Java10Test { // first: var list = new ArrayList(); assertNull(localVars.get(0).getTypeNode()); ASTVariableDeclaratorId varDecl = localVars.get(0).getVarIds().firstOrThrow(); - assertEquals("type should be ArrayList", ts.parameterise(ts.getClassSymbol(ArrayList.class), listOf(stringT)), varDecl.getTypeMirror()); + assertEquals(ts.parameterise(ts.getClassSymbol(ArrayList.class), listOf(stringT)), varDecl.getTypeMirror(), "type should be ArrayList"); // second: var stream = list.stream(); assertNull(localVars.get(1).getTypeNode()); ASTVariableDeclaratorId varDecl2 = localVars.get(1).getVarIds().firstOrThrow(); - assertEquals("type should be Stream", - ts.parameterise(ts.getClassSymbol(Stream.class), listOf(stringT)), - varDecl2.getTypeMirror()); + assertEquals(ts.parameterise(ts.getClassSymbol(Stream.class), listOf(stringT)), + varDecl2.getTypeMirror(), + "type should be Stream"); // third: var s = "Java 10"; assertNull(localVars.get(2).getTypeNode()); ASTVariableDeclaratorId varDecl3 = localVars.get(2).getVarIds().firstOrThrow(); - assertEquals("type should be String", stringT, varDecl3.getTypeMirror()); + assertEquals(stringT, varDecl3.getTypeMirror(), "type should be String"); } @Test - public void testForLoopWithVar() { + void testForLoopWithVar() { List localVars = java10.parseResource("LocalVariableTypeInferenceForLoop.java") .findDescendantsOfType(ASTLocalVariableDeclaration.class); assertEquals(1, localVars.size()); assertNull(localVars.get(0).getTypeNode()); ASTVariableDeclaratorId varDecl = localVars.get(0).getVarIds().firstOrThrow(); - assertSame("type should be int", varDecl.getTypeSystem().INT, varDecl.getTypeMirror()); + assertSame(varDecl.getTypeSystem().INT, varDecl.getTypeMirror(), "type should be int"); } @Test - public void testForLoopEnhancedWithVar() { + void testForLoopEnhancedWithVar() { List localVars = java10.parseResource("LocalVariableTypeInferenceForLoopEnhanced.java") .findDescendantsOfType(ASTLocalVariableDeclaration.class); assertEquals(1, localVars.size()); assertNull(localVars.get(0).getTypeNode()); ASTVariableDeclaratorId varDecl = localVars.get(0).getVarIds().firstOrThrow(); - assertTrue("type should be String", TypeTestUtil.isA(String.class, varDecl)); + assertTrue(TypeTestUtil.isA(String.class, varDecl), "type should be String"); } @Test - public void testForLoopEnhancedWithVar2() { + void testForLoopEnhancedWithVar2() { List localVars = java10.parseResource("LocalVariableTypeInferenceForLoopEnhanced2.java") .findDescendantsOfType(ASTLocalVariableDeclaration.class); assertEquals(4, localVars.size()); assertNull(localVars.get(1).getTypeNode()); @NonNull ASTVariableDeclaratorId varDecl2 = localVars.get(1).getVarIds().firstOrThrow(); - assertTrue("type should be String", TypeTestUtil.isA(String.class, varDecl2)); + assertTrue(TypeTestUtil.isA(String.class, varDecl2), "type should be String"); assertNull(localVars.get(3).getTypeNode()); ASTVariableDeclaratorId varDecl4 = localVars.get(3).getVarIds().firstOrThrow(); - assertSame("type should be int", varDecl2.getTypeSystem().INT, varDecl4.getTypeMirror()); + assertSame(varDecl2.getTypeSystem().INT, varDecl4.getTypeMirror(), "type should be int"); } @Test - public void testTryWithResourcesWithVar() { + void testTryWithResourcesWithVar() { List resources = java10.parseResource("LocalVariableTypeInferenceTryWithResources.java") .findDescendantsOfType(ASTResource.class); assertEquals(1, resources.size()); assertNull(resources.get(0).asLocalVariableDeclaration().getTypeNode()); ASTVariableDeclaratorId varId = resources.get(0).asLocalVariableDeclaration().getVarIds().firstOrThrow(); - assertTrue("type should be FileInputStream", TypeTestUtil.isA(FileInputStream.class, varId)); + assertTrue(TypeTestUtil.isA(FileInputStream.class, varId), "type should be FileInputStream"); } @Test - public void testTypeResNullPointer() { + void testTypeResNullPointer() { java10.parseResource("LocalVariableTypeInference_typeres.java"); } 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 8f7fa253d8..5100aaba9f 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 @@ -8,7 +8,7 @@ package net.sourceforge.pmd.lang.java.ast; import static org.junit.jupiter.api.Assertions.assertThrows; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; @@ -18,7 +18,7 @@ import net.sourceforge.pmd.lang.java.JavaParsingHelper; /** * Tests new java14 standard features. */ -public class Java14TreeDumpTest extends BaseJavaTreeDumpTest { +class Java14TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java14 = JavaParsingHelper.DEFAULT.withDefaultVersion("14") @@ -35,7 +35,7 @@ public class Java14TreeDumpTest extends BaseJavaTreeDumpTest { * Tests switch expressions with yield. */ @Test - public void switchExpressions() { + void switchExpressions() { doTest("SwitchExpressions"); } @@ -43,27 +43,27 @@ public class Java14TreeDumpTest extends BaseJavaTreeDumpTest { * In java13, switch expressions are only available with preview. */ @Test - public void switchExpressions13ShouldFail() { + void switchExpressions13ShouldFail() { assertThrows(ParseException.class, () -> java13.parseResource("SwitchExpressions.java")); } @Test - public void checkYieldConditionalBehaviour() { + void checkYieldConditionalBehaviour() { doTest("YieldStatements"); } @Test - public void multipleCaseLabels() { + void multipleCaseLabels() { doTest("MultipleCaseLabels"); } @Test - public void switchRules() { + void switchRules() { doTest("SwitchRules"); } @Test - public void simpleSwitchExpressions() { + void simpleSwitchExpressions() { doTest("SimpleSwitchExpressions"); } 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 20df93fd03..9b65df591e 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 @@ -4,14 +4,16 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.Test; +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.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java15TreeDumpTest extends BaseJavaTreeDumpTest { +class Java15TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java15 = JavaParsingHelper.DEFAULT.withDefaultVersion("15") .withResourceContext(Java15TreeDumpTest.class, "jdkversiontests/java15/"); @@ -23,22 +25,22 @@ public class Java15TreeDumpTest extends BaseJavaTreeDumpTest { } @Test - public void textBlocks() { + void textBlocks() { doTest("TextBlocks"); } - @Test(expected = net.sourceforge.pmd.lang.ast.ParseException.class) - public void textBlocksBeforeJava15ShouldFail() { - java14.parseResource("TextBlocks.java"); - } - - @Test(expected = ParseException.class) - public void stringEscapeSequenceShouldFail() { - java14.parse("class Foo { String s =\"a\\sb\"; }"); + @Test + void textBlocksBeforeJava15ShouldFail() { + assertThrows(ParseException.class, () -> java14.parseResource("TextBlocks.java")); } @Test - public void sealedAndNonSealedIdentifiers() { + void stringEscapeSequenceShouldFail() { + assertThrows(ParseException.class, () -> java14.parse("class Foo { String s =\"a\\sb\"; }")); + } + + @Test + void sealedAndNonSealedIdentifiers() { doTest("NonSealedIdentifier"); } } 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 ad06a798ed..e8222485df 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 @@ -8,11 +8,13 @@ import static net.sourceforge.pmd.lang.java.types.TestUtilitiesForTypesKt.hasTyp import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.NodeStream; import net.sourceforge.pmd.lang.ast.ParseException; @@ -22,7 +24,7 @@ import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.symbols.JElementSymbol; import net.sourceforge.pmd.lang.java.types.JPrimitiveType; -public class Java16TreeDumpTest extends BaseJavaTreeDumpTest { +class Java16TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java16 = JavaParsingHelper.DEFAULT.withDefaultVersion("16") .withResourceContext(Java16TreeDumpTest.class, "jdkversiontests/java16/"); @@ -35,7 +37,7 @@ public class Java16TreeDumpTest extends BaseJavaTreeDumpTest { } @Test - public void patternMatchingInstanceof() { + void patternMatchingInstanceof() { doTest("PatternMatchingInstanceof"); // extended tests for type resolution etc. @@ -49,33 +51,33 @@ public class Java16TreeDumpTest extends BaseJavaTreeDumpTest { } } - @Test(expected = ParseException.class) - public void patternMatchingInstanceofBeforeJava16ShouldFail() { - java15.parseResource("PatternMatchingInstanceof.java"); + @Test + void patternMatchingInstanceofBeforeJava16ShouldFail() { + assertThrows(ParseException.class, () -> java15.parseResource("PatternMatchingInstanceof.java")); } @Test - public void localClassAndInterfaceDeclarations() { + void localClassAndInterfaceDeclarations() { doTest("LocalClassAndInterfaceDeclarations"); } - @Test(expected = ParseException.class) - public void localClassAndInterfaceDeclarationsBeforeJava16ShouldFail() { - java15.parseResource("LocalClassAndInterfaceDeclarations.java"); - } - - @Test(expected = ParseException.class) - public void localAnnotationsAreNotAllowed() { - java16.parse("public class Foo { { @interface MyLocalAnnotation {} } }"); + @Test + void localClassAndInterfaceDeclarationsBeforeJava16ShouldFail() { + assertThrows(ParseException.class, () -> java15.parseResource("LocalClassAndInterfaceDeclarations.java")); } @Test - public void localRecords() { + void localAnnotationsAreNotAllowed() { + assertThrows(ParseException.class, () -> java16.parse("public class Foo { { @interface MyLocalAnnotation {} } }")); + } + + @Test + void localRecords() { doTest("LocalRecords"); } @Test - public void recordPoint() { + void recordPoint() { doTest("Point"); // extended tests for type resolution etc. @@ -86,39 +88,39 @@ public class Java16TreeDumpTest extends BaseJavaTreeDumpTest { ASTVariableDeclaratorId varId = components.get(0).getVarId(); JElementSymbol symbol = varId.getSymbol(); - Assert.assertEquals("x", symbol.getSimpleName()); - Assert.assertTrue(varId.getTypeMirror().isPrimitive(JPrimitiveType.PrimitiveTypeKind.INT)); - } - - @Test(expected = ParseException.class) - public void recordPointBeforeJava16ShouldFail() { - java15.parseResource("Point.java"); - } - - @Test(expected = ParseException.class) - public void recordCtorWithThrowsShouldFail() { - java16.parse(" record R {" - + " R throws IOException {}" - + " }"); - } - - @Test(expected = ParseException.class) - public void recordMustNotExtend() { - java16.parse("record RecordEx(int x) extends Number { }"); + assertEquals("x", symbol.getSimpleName()); + assertTrue(varId.getTypeMirror().isPrimitive(JPrimitiveType.PrimitiveTypeKind.INT)); } @Test - public void innerRecords() { + void recordPointBeforeJava16ShouldFail() { + assertThrows(ParseException.class, () -> java15.parseResource("Point.java")); + } + + @Test + void recordCtorWithThrowsShouldFail() { + assertThrows(ParseException.class, () -> java16.parse(" record R {" + + " R throws IOException {}" + + " }")); + } + + @Test + void recordMustNotExtend() { + assertThrows(ParseException.class, () -> java16.parse("record RecordEx(int x) extends Number { }")); + } + + @Test + void innerRecords() { doTest("Records"); } - @Test(expected = ParseException.class) - public void recordIsARestrictedIdentifier() { - java16.parse("public class record {}"); + @Test + void recordIsARestrictedIdentifier() { + assertThrows(ParseException.class, () -> java16.parse("public class record {}")); } @Test - public void sealedAndNonSealedIdentifiers() { + void sealedAndNonSealedIdentifiers() { doTest("NonSealedIdentifier"); } } 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 c0bcb4b057..2a2921e307 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 @@ -4,9 +4,10 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.Assert; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import static org.junit.jupiter.api.Assertions.assertThrows; +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.ast.test.BaseParsingHelper; @@ -14,13 +15,13 @@ import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java17TreeDumpTest extends BaseTreeDumpTest { +class Java17TreeDumpTest extends BaseTreeDumpTest { private final JavaParsingHelper java17 = JavaParsingHelper.DEFAULT.withDefaultVersion("17") .withResourceContext(Java17TreeDumpTest.class, "jdkversiontests/java17/"); private final JavaParsingHelper java16 = java17.withDefaultVersion("16"); - public Java17TreeDumpTest() { + Java17TreeDumpTest() { super(new RelevantAttributePrinter(), ".java"); } @@ -30,51 +31,41 @@ public class Java17TreeDumpTest extends BaseTreeDumpTest { } @Test - public void sealedClassBeforeJava17() { - ParseException thrown = Assert.assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java16.parseResource("geometry/Shape.java"); - } - }); - Assert.assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Sealed classes are a feature of Java 17, you should select your language version accordingly")); + void sealedClassBeforeJava17() { + ParseException thrown = assertThrows(ParseException.class, () -> java16.parseResource("geometry/Shape.java")); + assertTrue(thrown.getMessage().contains("Sealed classes are a feature of Java 17, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void sealedClass() { + void sealedClass() { doTest("geometry/Shape"); } @Test - public void nonSealedClass() { + void nonSealedClass() { doTest("geometry/Square"); } @Test - public void sealedQualifiedPermitClass() { + void sealedQualifiedPermitClass() { doTest("SealedInnerClasses"); } @Test - public void sealedInterfaceBeforeJava17() { - ParseException thrown = Assert.assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java16.parseResource("expression/Expr.java"); - } - }); - Assert.assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Sealed classes are a feature of Java 17, you should select your language version accordingly")); + void sealedInterfaceBeforeJava17() { + ParseException thrown = assertThrows(ParseException.class, () -> java16.parseResource("expression/Expr.java")); + assertTrue(thrown.getMessage().contains("Sealed classes are a feature of Java 17, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void sealedInterface() { + void sealedInterface() { doTest("expression/Expr"); } @Test - public void localVars() { + void localVars() { doTest("LocalVars"); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java18PreviewTreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java18PreviewTreeDumpTest.java index 66449c6159..714209d39c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java18PreviewTreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java18PreviewTreeDumpTest.java @@ -6,10 +6,10 @@ package net.sourceforge.pmd.lang.java.ast; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Assert; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; @@ -17,13 +17,13 @@ import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java18PreviewTreeDumpTest extends BaseTreeDumpTest { +class Java18PreviewTreeDumpTest extends BaseTreeDumpTest { private final JavaParsingHelper java18p = JavaParsingHelper.DEFAULT.withDefaultVersion("18-preview") .withResourceContext(Java18PreviewTreeDumpTest.class, "jdkversiontests/java18p/"); private final JavaParsingHelper java18 = java18p.withDefaultVersion("18"); - public Java18PreviewTreeDumpTest() { + Java18PreviewTreeDumpTest() { super(new RelevantAttributePrinter(), ".java"); } @@ -33,72 +33,57 @@ public class Java18PreviewTreeDumpTest extends BaseTreeDumpTest { } @Test - public void dealingWithNullBeforeJava18Preview() { - ParseException thrown = Assert.assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java18.parseResource("DealingWithNull.java"); - } - }); - Assert.assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Null case labels is a preview feature of JDK 18, you should select your language version accordingly")); + void dealingWithNullBeforeJava18Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java18.parseResource("DealingWithNull.java")); + assertTrue(thrown.getMessage().contains("Null case labels is a preview feature of JDK 18, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void dealingWithNull() { + void dealingWithNull() { doTest("DealingWithNull"); } @Test - public void enhancedTypeCheckingSwitch() { + void enhancedTypeCheckingSwitch() { doTest("EnhancedTypeCheckingSwitch"); } @Test - public void exhaustiveSwitch() { + void exhaustiveSwitch() { doTest("ExhaustiveSwitch"); } @Test - public void guardedAndParenthesizedPatternsBeforeJava18Preview() { - ParseException thrown = Assert.assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java18.parseResource("GuardedAndParenthesizedPatterns.java"); - } - }); + void guardedAndParenthesizedPatternsBeforeJava18Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java18.parseResource("GuardedAndParenthesizedPatterns.java")); assertThat(thrown.getMessage(), containsString("Pattern matching for switch is a preview feature of JDK 18, you should select your language version accordingly")); } @Test - public void guardedAndParenthesizedPatterns() { + void guardedAndParenthesizedPatterns() { doTest("GuardedAndParenthesizedPatterns"); } @Test - public void patternsInSwitchLabelsBeforeJava18Preview() { - ParseException thrown = Assert.assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java18.parseResource("PatternsInSwitchLabels.java"); - } - }); - Assert.assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 18, you should select your language version accordingly")); + void patternsInSwitchLabelsBeforeJava18Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java18.parseResource("PatternsInSwitchLabels.java")); + assertTrue(thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 18, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void patternsInSwitchLabels() { + void patternsInSwitchLabels() { doTest("PatternsInSwitchLabels"); } @Test - public void refiningPatternsInSwitch() { + void refiningPatternsInSwitch() { doTest("RefiningPatternsInSwitch"); } @Test - public void scopeOfPatternVariableDeclarations() { + void scopeOfPatternVariableDeclarations() { doTest("ScopeOfPatternVariableDeclarations"); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java19PreviewTreeDumpTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java19PreviewTreeDumpTest.java index 2cf0b12b6f..1f602359ec 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java19PreviewTreeDumpTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java19PreviewTreeDumpTest.java @@ -4,11 +4,10 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; @@ -16,13 +15,13 @@ import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest; import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java19PreviewTreeDumpTest extends BaseTreeDumpTest { +class Java19PreviewTreeDumpTest extends BaseTreeDumpTest { private final JavaParsingHelper java19p = JavaParsingHelper.DEFAULT.withDefaultVersion("19-preview") .withResourceContext(Java19PreviewTreeDumpTest.class, "jdkversiontests/java19p/"); private final JavaParsingHelper java19 = java19p.withDefaultVersion("19"); - public Java19PreviewTreeDumpTest() { + Java19PreviewTreeDumpTest() { super(new RelevantAttributePrinter(), ".java"); } @@ -32,90 +31,70 @@ public class Java19PreviewTreeDumpTest extends BaseTreeDumpTest { } @Test - public void dealingWithNullBeforeJava19Preview() { - ParseException thrown = assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java19.parseResource("DealingWithNull.java"); - } - }); - assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Null case labels is a preview feature of JDK 19, you should select your language version accordingly")); + void dealingWithNullBeforeJava19Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java19.parseResource("DealingWithNull.java")); + assertTrue(thrown.getMessage().contains("Null case labels is a preview feature of JDK 19, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void dealingWithNull() { + void dealingWithNull() { doTest("DealingWithNull"); } @Test - public void enhancedTypeCheckingSwitch() { + void enhancedTypeCheckingSwitch() { doTest("EnhancedTypeCheckingSwitch"); } @Test - public void exhaustiveSwitch() { + void exhaustiveSwitch() { doTest("ExhaustiveSwitch"); } @Test - public void guardedAndParenthesizedPatternsBeforeJava19Preview() { - ParseException thrown = assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java19.parseResource("GuardedAndParenthesizedPatterns.java"); - } - }); - assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 19, you should select your language version accordingly")); + void guardedAndParenthesizedPatternsBeforeJava19Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java19.parseResource("GuardedAndParenthesizedPatterns.java")); + assertTrue(thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 19, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void guardedAndParenthesizedPatterns() { + void guardedAndParenthesizedPatterns() { doTest("GuardedAndParenthesizedPatterns"); } @Test - public void patternsInSwitchLabelsBeforeJava19Preview() { - ParseException thrown = assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java19.parseResource("PatternsInSwitchLabels.java"); - } - }); - assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 19, you should select your language version accordingly")); + void patternsInSwitchLabelsBeforeJava19Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java19.parseResource("PatternsInSwitchLabels.java")); + assertTrue(thrown.getMessage().contains("Pattern matching for switch is a preview feature of JDK 19, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } @Test - public void patternsInSwitchLabels() { + void patternsInSwitchLabels() { doTest("PatternsInSwitchLabels"); } @Test - public void refiningPatternsInSwitch() { + void refiningPatternsInSwitch() { doTest("RefiningPatternsInSwitch"); } @Test - public void scopeOfPatternVariableDeclarations() { + void scopeOfPatternVariableDeclarations() { doTest("ScopeOfPatternVariableDeclarations"); } @Test - public void recordPatterns() { + void recordPatterns() { doTest("RecordPatterns"); } @Test - public void recordPatternsBeforeJava19Preview() { - ParseException thrown = assertThrows(ParseException.class, new ThrowingRunnable() { - @Override - public void run() throws Throwable { - java19.parseResource("RecordPatterns.java"); - } - }); - assertTrue("Unexpected message: " + thrown.getMessage(), - thrown.getMessage().contains("Record patterns is a preview feature of JDK 19, you should select your language version accordingly")); + void recordPatternsBeforeJava19Preview() { + ParseException thrown = assertThrows(ParseException.class, () -> java19.parseResource("RecordPatterns.java")); + assertTrue(thrown.getMessage().contains("Record patterns is a preview feature of JDK 19, you should select your language version accordingly"), + "Unexpected message: " + thrown.getMessage()); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java8Test.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java8Test.java index c86f124f8f..73ba715483 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java8Test.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java8Test.java @@ -4,17 +4,17 @@ package net.sourceforge.pmd.lang.java.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java8Test { +class Java8Test { private final JavaParsingHelper java8 = JavaParsingHelper.DEFAULT.withDefaultVersion("8") .withResourceContext(Java8Test.class); @Test - public void interfaceMethodShouldBeParseable() { + void interfaceMethodShouldBeParseable() { java8.parse("interface WithStaticAndDefaultMethod {\n" + " static void performOn() {\n" + " }\n" @@ -25,7 +25,7 @@ public class Java8Test { } @Test - public void repeatableAnnotationsMethodShouldBeParseable() { + void repeatableAnnotationsMethodShouldBeParseable() { java8.parse("@Multitude(\"1\")\n" + "@Multitude(\"2\")\n" + "@Multitude(\"3\")\n" 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 26f6eeee4e..b8c8522d76 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 @@ -5,25 +5,25 @@ package net.sourceforge.pmd.lang.java.ast; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; import net.sourceforge.pmd.lang.java.BaseJavaTreeDumpTest; import net.sourceforge.pmd.lang.java.JavaParsingHelper; -public class Java9TreeDumpTest extends BaseJavaTreeDumpTest { +class Java9TreeDumpTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java9 = JavaParsingHelper.DEFAULT .withDefaultVersion("9") .withResourceContext(Java9TreeDumpTest.class, "jdkversiontests/java9"); @Test - public void testModule() { + void testModule() { doTest("jdk9_module_info"); } @Test - public void testAnnotatedModule() { + void testAnnotatedModule() { doTest("jdk9_module_info_with_annot"); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiedNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiedNameTest.java index 3494b6eb00..fd0249a9ca 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiedNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/JavaQualifiedNameTest.java @@ -4,23 +4,22 @@ package net.sourceforge.pmd.lang.java.ast; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.java.JavaParsingHelper; - /** * @author Clément Fournier */ -public class JavaQualifiedNameTest { +class JavaQualifiedNameTest { private List getNodes(Class target, String code) { @@ -28,7 +27,7 @@ public class JavaQualifiedNameTest { } @Test - public void testEmptyPackage() { + void testEmptyPackage() { final String TEST = "class Foo {}"; List nodes = getNodes(ASTClassOrInterfaceDeclaration.class, TEST); for (ASTClassOrInterfaceDeclaration coid : nodes) { @@ -39,7 +38,7 @@ public class JavaQualifiedNameTest { @Test - public void testPackage() { + void testPackage() { final String TEST = "package foo.bar; class Bzaz{}"; List nodes = getNodes(ASTClassOrInterfaceDeclaration.class, TEST); @@ -50,7 +49,7 @@ public class JavaQualifiedNameTest { @Test - public void testNestedClass() { + void testNestedClass() { final String TEST = "package foo.bar; class Bzaz{ class Bor{ class Foo{}}}"; List nodes = getNodes(ASTClassOrInterfaceDeclaration.class, TEST); @@ -64,7 +63,7 @@ public class JavaQualifiedNameTest { @Test - public void testNestedEnum() { + void testNestedEnum() { final String TEST = "package foo.bar; class Foo { enum Bzaz{HOO;}}"; List nodes = getNodes(ASTEnumDeclaration.class, TEST); @@ -78,7 +77,7 @@ public class JavaQualifiedNameTest { @Test - public void testEnum() { + void testEnum() { final String TEST = "package foo.bar; enum Bzaz{HOO;}"; List nodes = getNodes(ASTEnumDeclaration.class, TEST); @@ -92,7 +91,7 @@ public class JavaQualifiedNameTest { @Test - public void testNestedEmptyPackage() { + void testNestedEmptyPackage() { final String TEST = "class Bzaz{ class Bor{ class Foo{}}}"; List nodes = getNodes(ASTClassOrInterfaceDeclaration.class, TEST); @@ -106,7 +105,7 @@ public class JavaQualifiedNameTest { } @Test - public void testSimpleLocalClass() { + void testSimpleLocalClass() { final String TEST = "package bar; class Boron { public void foo(String j) { class Local {} } }"; List classes = getNodes(ASTClassOrInterfaceDeclaration.class, TEST); @@ -116,7 +115,7 @@ public class JavaQualifiedNameTest { @Test - public void testLocalClassNameClash() { + void testLocalClassNameClash() { final String TEST = "package bar; class Bzaz{ void foo() { class Local {} } {// initializer\n class Local {}}}"; List classes @@ -128,7 +127,7 @@ public class JavaQualifiedNameTest { @Test - public void testLocalClassDeepNesting() { + void testLocalClassDeepNesting() { final String TEST = "class Bzaz{ void foo() { " + " class Local { " @@ -159,7 +158,7 @@ public class JavaQualifiedNameTest { @Test - public void testAnonymousClass() { + void testAnonymousClass() { final String TEST = "class Bzaz{ void foo() { " + " new Runnable() {" @@ -177,7 +176,7 @@ public class JavaQualifiedNameTest { @Test - public void testMultipleAnonymousClasses() { + void testMultipleAnonymousClasses() { final String TEST = "class Bzaz{ void foo() { " + " new Runnable() {" @@ -197,7 +196,7 @@ public class JavaQualifiedNameTest { @Test - public void testNestedAnonymousClass() { + void testNestedAnonymousClass() { final String TEST = "class Bzaz{ void foo() {" + " new Runnable() {" @@ -218,7 +217,7 @@ public class JavaQualifiedNameTest { @Test - public void testLocalInAnonymousClass() { + void testLocalInAnonymousClass() { final String TEST = "class Bzaz{ void foo() {" + " new Runnable() {" 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 c073a66b47..b01e2a2e6b 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 @@ -7,13 +7,16 @@ package net.sourceforge.pmd.lang.java.ast; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.collection.IsEmptyCollection.empty; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.concurrent.TimeUnit; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Timeout; import net.sourceforge.pmd.lang.ast.ParseException; import net.sourceforge.pmd.lang.ast.impl.javacc.MalformedSourceException; @@ -23,7 +26,7 @@ import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr; import net.sourceforge.pmd.lang.java.types.AstTestUtil; -public class ParserCornersTest extends BaseJavaTreeDumpTest { +class ParserCornersTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java = JavaParsingHelper.DEFAULT.withResourceContext(getClass()); private final JavaParsingHelper java4 = java.withDefaultVersion("1.4"); @@ -32,20 +35,16 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { private final JavaParsingHelper java8 = java.withDefaultVersion("1.8"); private final JavaParsingHelper java9 = java.withDefaultVersion("9"); - @Rule - public ExpectedException expect = ExpectedException.none(); - - @Override public @NonNull BaseParsingHelper getParser() { return java4; } @Test - public void testInvalidUnicodeEscape() { - expect.expect(MalformedSourceException.class); // previously Error - expect.expectMessage("Source format error in file 'x/filename.java' at line 1, column 1: Invalid unicode escape"); - java.parse("\\u00k0", null, "x/filename.java"); + void testInvalidUnicodeEscape() { + MalformedSourceException thrown = assertThrows(MalformedSourceException.class, // previously Error + () -> java.parse("\\u00k0", null, "x/filename.java")); + assertThat(thrown.getMessage(), startsWith("Source format error in file 'x/filename.java' at line 1, column 1: Invalid unicode escape")); } /** @@ -53,7 +52,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * from inner class. */ @Test - public void testInnerOuterClass() { + void testInnerOuterClass() { java7.parse("/**\n" + " * @author azagorulko\n" + " *\n" + " */\n" + "public class TestInnerClassCallsOuterParent {\n" + "\n" + " public void test() {\n" + " new Runnable() {\n" + " @Override\n" + " public void run() {\n" @@ -65,7 +64,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * #888 PMD 6.0.0 can't parse valid <> under 1.8. */ @Test - public void testDiamondUsageJava8() { + void testDiamondUsageJava8() { java8.parse("public class PMDExceptionTest {\n" + " private Component makeUI() {\n" + " String[] model = {\"123456\", \"7890\"};\n" @@ -89,13 +88,13 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public void testUnicodeEscapes() { + void testUnicodeEscapes() { // todo i'd like to test the coordinates of the literals, but this has to wait for java-grammar to be merged java8.parse("public class Foo { String[] s = { \"Ven\\u00E4j\\u00E4\" }; }"); } @Test - public void testUnicodeEscapes2() { + void testUnicodeEscapes2() { java.parse("\n" + "public final class TimeZoneNames_zh_TW extends TimeZoneNamesBundle {\n" + "\n" @@ -106,7 +105,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public void testUnicodeEscapesInComment() { + void testUnicodeEscapesInComment() { java.parse("class Foo {" + "\n" + " /**\n" @@ -128,7 +127,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public final void testGetFirstASTNameImageNull() { + final void testGetFirstASTNameImageNull() { java4.parse("public class Test {\n" + " void bar() {\n" + " abstract class X { public abstract void f(); }\n" @@ -138,12 +137,12 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public final void testCastLookaheadProblem() { + void testCastLookaheadProblem() { java4.parse("public class BadClass {\n public Class foo() {\n return (byte[].class);\n }\n}"); } @Test - public final void testTryWithResourcesConcise() { + void testTryWithResourcesConcise() { // https://github.com/pmd/pmd/issues/3697 java9.parse("import java.io.InputStream;\n" + "public class Foo {\n" @@ -157,7 +156,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public final void testTryWithResourcesThis() { + void testTryWithResourcesThis() { // https://github.com/pmd/pmd/issues/3697 java9.parse("import java.io.InputStream;\n" + "public class Foo {\n" @@ -174,7 +173,7 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * https://jira.codehaus.org/browse/MPMD-139 */ @Test - public void testGenericsProblem() { + void testGenericsProblem() { String code = "public class Test {\n" + " public void test() {\n" + " String o = super. doStuff(\"\");\n" @@ -185,23 +184,23 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public void testUnicodeIndent() { + void testUnicodeIndent() { // https://github.com/pmd/pmd/issues/3423 java7.parseResource("UnicodeIdentifier.java"); } @Test - public void testParsersCases15() { + void testParsersCases15() { doTest("ParserCornerCases", java5); } @Test - public void testParsersCases17() { + void testParsersCases17() { doTest("ParserCornerCases17", java7); } @Test - public void testParsersCases18() { + void testParsersCases18() { doTest("ParserCornerCases18", java8); } @@ -209,12 +208,12 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * Test for https://sourceforge.net/p/pmd/bugs/1333/ */ @Test - public void testLambdaBug1333() { + void testLambdaBug1333() { doTest("LambdaBug1333", java8); } @Test - public void testLambdaBug1470() { + void testLambdaBug1470() { doTest("LambdaBug1470", java8); } @@ -222,33 +221,33 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * Test for https://sourceforge.net/p/pmd/bugs/1355/ */ @Test - public void emptyFileJustComment() { + void emptyFileJustComment() { getParser().parse("// just a comment"); } @Test - public void testBug1429ParseError() { + void testBug1429ParseError() { doTest("Bug1429", java8); } @Test - public void testBug1530ParseError() { + void testBug1530ParseError() { doTest("Bug1530", java8); } @Test - public void testGitHubBug207() { + void testGitHubBug207() { doTest("GitHubBug207", java8); } @Test - public void testLambda2783() { + void testLambda2783() { java8.parseResource("LambdaBug2783.java"); } @Test - public void testGitHubBug2767() { + void testGitHubBug2767() { // PMD fails to parse an initializer block. // PMD 6.26.0 parses this code just fine. java.withDefaultVersion("16") @@ -258,33 +257,34 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public void testBug206() { + void testBug206() { doTest("LambdaBug206", java8); } @Test - public void testGitHubBug208ParseError() { + void testGitHubBug208ParseError() { doTest("GitHubBug208", java5); } @Test - public void testGitHubBug309() { + void testGitHubBug309() { doTest("GitHubBug309", java8); } - @Test(timeout = 30000) - public void testInfiniteLoopInLookahead() { - expect.expect(ParseException.class); - // https://github.com/pmd/pmd/issues/3117 - java8.parseResource("InfiniteLoopInLookahead.java"); + @Test + @Timeout(value = 30, unit = TimeUnit.SECONDS) + void testInfiniteLoopInLookahead() { + assertThrows(ParseException.class, () -> + // https://github.com/pmd/pmd/issues/3117 + java8.parseResource("InfiniteLoopInLookahead.java")); } @Test - public void stringConcatentationShouldNotBeCast() { + void stringConcatentationShouldNotBeCast() { // https://github.com/pmd/pmd/issues/1484 String code = "public class Test {\n" + " public static void main(String[] args) {\n" + " System.out.println(\"X\" + (args) + \"Y\");\n" + " }\n" + "}"; - Assert.assertEquals(0, java8.parse(code).descendants(ASTCastExpression.class).count()); + assertEquals(0, java8.parse(code).descendants(ASTCastExpression.class).count()); } @@ -294,22 +294,22 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { * @see github issue 378 */ @Test - public void testEmptyStatements1() { + void testEmptyStatements1() { doTest("EmptyStmts1"); } @Test - public void testEmptyStatements2() { + void testEmptyStatements2() { doTest("EmptyStmts2"); } @Test - public void testEmptyStatements3() { + void testEmptyStatements3() { doTest("EmptyStmts3"); } @Test - public void testMethodReferenceConfused() { + void testMethodReferenceConfused() { ASTCompilationUnit ast = java.parseResource("MethodReferenceConfused.java", "10"); ASTVariableDeclaratorId varWithMethodName = AstTestUtil.varId(ast, "method"); ASTVariableDeclaratorId someObject = AstTestUtil.varId(ast, "someObject"); @@ -321,23 +321,23 @@ public class ParserCornersTest extends BaseJavaTreeDumpTest { } @Test - public void testSwitchWithFallthrough() { + void testSwitchWithFallthrough() { doTest("SwitchWithFallthrough"); } @Test - public void testSwitchStatements() { + void testSwitchStatements() { doTest("SwitchStatements"); } @Test - public void testSynchronizedStatements() { + void testSynchronizedStatements() { doTest("SynchronizedStmts"); } @Test - public void testGithubBug3101UnresolvedTypeParams() { + void testGithubBug3101UnresolvedTypeParams() { java.parseResource("GitHubBug3101.java"); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java index 1a40b50605..9068386b7f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/TextBlockEscapeTest.java @@ -5,18 +5,18 @@ package net.sourceforge.pmd.lang.java.ast; import static net.sourceforge.pmd.lang.java.ast.ASTStringLiteral.determineTextBlockContent; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.document.Chars; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.util.StringUtil; -public class TextBlockEscapeTest extends BaseParserTest { +class TextBlockEscapeTest extends BaseParserTest { @Test - public void testStringEscapes() { + void testStringEscapes() { testStringEscape("abcd", "abcd"); testStringEscape("abcd\\f", "abcd\f"); testStringEscape("abcd\\n", "abcd\n"); @@ -29,14 +29,14 @@ public class TextBlockEscapeTest extends BaseParserTest { } @Test - public void testStringOctalEscapes() { + void testStringOctalEscapes() { testStringEscape("\\0123", "\0123"); testStringEscape("\\01ab", "\01ab"); testStringEscape("\\0", "\0"); } @Test - public void testStringUnknownEscape() { + void testStringUnknownEscape() { testStringEscape("\\x", "\\x"); } @@ -48,42 +48,42 @@ public class TextBlockEscapeTest extends BaseParserTest { } @Test - public void testTextBlockContent() { - assertEquals("single line text block", "winter", - determineTextBlockContent("\"\"\"\n winter\"\"\"")); - assertEquals("single line text block with LF", "winter\n", - determineTextBlockContent("\"\"\"\n" + void testTextBlockContent() { + assertEquals("winter", determineTextBlockContent("\"\"\"\n winter\"\"\""), + "single line text block"); + assertEquals("winter\n", determineTextBlockContent("\"\"\"\n" + " winter\n" - + " \"\"\"")); - assertEquals("single line text block with LF, some indent preserved", " winter\n", - determineTextBlockContent("\"\"\"\n" + + " \"\"\""), + "single line text block with LF"); + assertEquals(" winter\n", determineTextBlockContent("\"\"\"\n" + " winter\n" - + " \"\"\"")); + + " \"\"\""), + "single line text block with LF, some indent preserved"); } @Test - public void emptyTextBlock() { - assertEquals("empty text block", "", - determineTextBlockContent("\"\"\"\n \"\"\"")); + void emptyTextBlock() { + assertEquals("", + determineTextBlockContent("\"\"\"\n \"\"\""), + "empty text block"); } @Test - public void testEscapeBlockDelimiter() { - assertEquals("escaped text block in inside text block", - "String text = \"\"\"\n" + void testEscapeBlockDelimiter() { + assertEquals("String text = \"\"\"\n" + " A text block inside a text block\n" + "\"\"\";\n", determineTextBlockContent("\"\"\"\n" + " String text = \\\"\"\"\n" + " A text block inside a text block\n" + " \\\"\"\";\n" - + " \"\"\"")); + + " \"\"\""), + "escaped text block in inside text block"); } @Test - public void testCrEscape() { - assertEquals("text block with escapes", - "\r\n" + void testCrEscape() { + assertEquals("\r\n" + " \r\n" + "

Hello, world

\r\n" + " \r\n" @@ -94,13 +94,13 @@ public class TextBlockEscapeTest extends BaseParserTest { + "

Hello, world

\\r\n" + " \\r\n" + " \\r\n" - + " \"\"\"")); + + " \"\"\""), + "text block with escapes"); } @Test - public void testBasicHtmlBlock() { - assertEquals("basic text block example with html", - "\n" + void testBasicHtmlBlock() { + assertEquals("\n" + " \n" + "

Hello, world

\n" + " \n" @@ -111,41 +111,39 @@ public class TextBlockEscapeTest extends BaseParserTest { + "

Hello, world

\n" + " \n" + " \n" - + " \"\"\"")); + + " \"\"\""), + "basic text block example with html"); } @Test - public void testLineContinuation() { - assertEquals("new escape: line continuation", - "Lorem ipsum dolor sit amet, consectetur adipiscing " + void testLineContinuation() { + assertEquals("Lorem ipsum dolor sit amet, consectetur adipiscing " + "elit, sed do eiusmod tempor incididunt ut labore " + "et dolore magna aliqua.", determineTextBlockContent("\"\"\"\n" + " Lorem ipsum dolor sit amet, consectetur adipiscing \\\n" + " elit, sed do eiusmod tempor incididunt ut labore \\\n" + " et dolore magna aliqua.\\\n" - + " \"\"\"")); + + " \"\"\""), + "new escape: line continuation"); } @Test - public void testEscapeSpace() { - - assertEquals("new escape: space escape", - "red \n" + void testEscapeSpace() { + assertEquals("red \n" + "green \n" + "blue \n", determineTextBlockContent("\"\"\"\n" + " red \\s\n" + " green\\s\n" + " blue \\s\n" - + " \"\"\"")); - + + " \"\"\""), + "new escape: space escape"); } @Test - public void testLineEndingNormalization() { - assertEquals("with crlf line endings", - "\n" + void testLineEndingNormalization() { + assertEquals("\n" + " \n" + "

Hello, world

\n" + " \n" @@ -156,9 +154,9 @@ public class TextBlockEscapeTest extends BaseParserTest { + "

Hello, world

\r\n" + " \r\n" + " \r\n" - + " \"\"\"")); - assertEquals("with cr line endings", - "\n" + + " \"\"\""), + "with crlf line endings"); + assertEquals("\n" + " \n" + "

Hello, world

\n" + " \n" @@ -169,40 +167,41 @@ public class TextBlockEscapeTest extends BaseParserTest { + "

Hello, world

\r" + " \r" + " \r" - + " \"\"\"")); - + + " \"\"\""), + "with cr line endings"); } @Test - public void testEmptyLines() { + void testEmptyLines() { - assertEquals("empty line directly after opening", - "\ntest\n", determineTextBlockContent("\"\"\"\n" + assertEquals("\ntest\n", determineTextBlockContent("\"\"\"\n" + " \n" + " test\n" - + " \"\"\"")); - assertEquals("empty crlf line directly after opening", - "\ntest\n", determineTextBlockContent("\"\"\"\r\n" + + " \"\"\""), + "empty line directly after opening"); + assertEquals("\ntest\n", determineTextBlockContent("\"\"\"\r\n" + " \r\n" + " test\r\n" - + " \"\"\"")); - assertEquals("empty line directly after opening without indentation", - "\ntest\n", determineTextBlockContent("\"\"\"\n" + + " \"\"\""), + "empty crlf line directly after opening"); + assertEquals("\ntest\n", determineTextBlockContent("\"\"\"\n" + "\n" + "test\n" - + "\"\"\"")); - assertEquals("empty crlf line directly after opening without indentation", - "\ntest\n", determineTextBlockContent("\"\"\"\r\n" + + "\"\"\""), + "empty line directly after opening without indentation"); + assertEquals("\ntest\n", determineTextBlockContent("\"\"\"\r\n" + "\r\n" + "test\r\n" - + "\"\"\"")); + + "\"\"\""), + "empty crlf line directly after opening without indentation"); } @Test - public void testTextBlockWithBackslashEscape() { - assertEquals("text block with backslash escape", "\\test\n", - determineTextBlockContent("\"\"\"\n \\\\test\n \"\"\"")); + void testTextBlockWithBackslashEscape() { + assertEquals("\\test\n", + determineTextBlockContent("\"\"\"\n \\\\test\n \"\"\""), + "text block with backslash escape"); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtilTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtilTest.java index ee1cbc5913..5bee56625d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtilTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/JavaAstUtilTest.java @@ -10,17 +10,17 @@ import static net.sourceforge.pmd.util.CollectionUtil.listOf; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.ASTExpression; import net.sourceforge.pmd.lang.java.ast.ASTInfixExpression; import net.sourceforge.pmd.lang.java.ast.ASTVariableAccess; -public class JavaAstUtilTest extends BaseParserTest { +class JavaAstUtilTest extends BaseParserTest { @Test - public void testFlattenConcatOperands() { + void testFlattenConcatOperands() { ASTExpression e = parseExpr("s1+s2+s3"); assertTrue(isStringConcatExpr(e)); @@ -29,7 +29,7 @@ public class JavaAstUtilTest extends BaseParserTest { } @Test - public void testFlattenConcatOperandsRespectsTyping() { + void testFlattenConcatOperandsRespectsTyping() { ASTInfixExpression e = (ASTInfixExpression) parseExpr("i+j+s2+s3"); assertTrue(isStringConcatExpr(e)); ASTInfixExpression left = (ASTInfixExpression) e.getLeftOperand(); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtilTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtilTest.java index aaa272bf1c..115c9cbfc7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtilTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/internal/PrettyPrintingUtilTest.java @@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.java.ast.internal; import static net.sourceforge.pmd.lang.java.ast.internal.PrettyPrintingUtil.displaySignature; import static net.sourceforge.pmd.lang.java.ast.internal.PrettyPrintingUtil.prettyPrint; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; @@ -14,8 +15,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import org.hamcrest.MatcherAssert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; @@ -23,10 +23,10 @@ import net.sourceforge.pmd.lang.java.ast.ASTMethodCall; import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration; import net.sourceforge.pmd.util.StringUtil; -public class PrettyPrintingUtilTest extends BaseParserTest { +class PrettyPrintingUtilTest extends BaseParserTest { @Test - public void displaySignatureTestWithExtraDimensions() { + void displaySignatureTestWithExtraDimensions() { ASTCompilationUnit root = java.parse("class A { public void foo(String[] a[]) {} }"); ASTMethodDeclaration m = root.descendants(ASTMethodDeclaration.class).firstOrThrow(); @@ -34,29 +34,29 @@ public class PrettyPrintingUtilTest extends BaseParserTest { } @Test - public void ppMethodCall() { + void ppMethodCall() { ASTCompilationUnit root = java.parse("class A { { foo(1); this.foo(1); A.this.foo(); } }"); List m = root.descendants(ASTMethodCall.class).toList(); - MatcherAssert.assertThat(prettyPrint(m.get(0)), contentEquals("foo(1)")); - MatcherAssert.assertThat(prettyPrint(m.get(1)), contentEquals("this.foo(1)")); - MatcherAssert.assertThat(prettyPrint(m.get(2)), contentEquals("A.this.foo()")); + assertThat(prettyPrint(m.get(0)), contentEquals("foo(1)")); + assertThat(prettyPrint(m.get(1)), contentEquals("this.foo(1)")); + assertThat(prettyPrint(m.get(2)), contentEquals("A.this.foo()")); } @Test - public void ppMethodCallArgsTooBig() { + void ppMethodCallArgsTooBig() { ASTCompilationUnit root = java.parse("class A { { this.foo(\"a long string\", 12, 12, 12, 12, 12); } }"); @NonNull ASTMethodCall m = root.descendants(ASTMethodCall.class).firstOrThrow(); - MatcherAssert.assertThat(prettyPrint(m), contentEquals("this.foo(\"a long string\", 12...)")); + assertThat(prettyPrint(m), contentEquals("this.foo(\"a long string\", 12...)")); } @Test - public void ppMethodCallOnCast() { + void ppMethodCallOnCast() { ASTCompilationUnit root = java.parse("class A { { ((Object) this).foo(12); } }"); @NonNull ASTMethodCall m = root.descendants(ASTMethodCall.class).firstOrThrow(); - MatcherAssert.assertThat(prettyPrint(m), contentEquals("((Object) this).foo(12)")); + assertThat(prettyPrint(m), contentEquals("((Object) this).foo(12)")); } private static Matcher contentEquals(String str) { From 9cbdd4b58869888b75906bb7599682c729230001 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 3 Oct 2022 15:20:57 +0200 Subject: [PATCH 29/31] [java] Migrate tests to JUnit5 --- .../pmd/lang/java/JavaLanguageModuleTest.java | 25 +-- .../pmd/lang/java/PMD5RulesetTest.java | 14 +- .../pmd/lang/java/QuickstartRulesetTest.java | 23 +-- .../pmd/lang/java/SuppressWarningsTest.java | 40 ++--- .../java/metrics/JavaMetricsProviderTest.java | 14 +- .../java/metrics/MetricsMemoizationTest.java | 13 +- .../java/metrics/impl/AllMetricsTest.java | 2 +- .../lang/java/rule/JavaRuleViolationTest.java | 28 ++-- .../pmd/lang/java/rule/XPathRuleTest.java | 26 ++-- ...bstractClassWithoutAbstractMethodTest.java | 2 +- .../AccessorClassGenerationTest.java | 2 +- .../AccessorMethodGenerationTest.java | 2 +- .../ArrayIsStoredDirectlyTest.java | 2 +- .../AvoidMessageDigestFieldTest.java | 2 +- .../AvoidPrintStackTraceTest.java | 2 +- .../AvoidReassigningCatchVariablesTest.java | 2 +- .../AvoidReassigningLoopVariablesTest.java | 2 +- .../AvoidReassigningParametersTest.java | 2 +- .../AvoidStringBufferFieldTest.java | 2 +- .../AvoidUsingHardCodedIPTest.java | 2 +- .../bestpractices/CheckResultSetTest.java | 2 +- .../ConstantsInInterfaceTest.java | 2 +- .../DefaultLabelNotLastInSwitchStmtTest.java | 2 +- .../DoubleBraceInitializationTest.java | 2 +- .../ForLoopCanBeForeachTest.java | 2 +- .../ForLoopVariableCountTest.java | 2 +- .../bestpractices/GuardLogStatementTest.java | 2 +- ...it4SuitesShouldUseSuiteAnnotationTest.java | 2 +- ...Unit4TestShouldUseAfterAnnotationTest.java | 2 +- ...nit4TestShouldUseBeforeAnnotationTest.java | 2 +- ...JUnit4TestShouldUseTestAnnotationTest.java | 2 +- .../JUnit5TestShouldBePackagePrivateTest.java | 2 +- ...nitAssertionsShouldIncludeMessageTest.java | 2 +- .../JUnitTestContainsTooManyAssertsTest.java | 2 +- .../JUnitTestsShouldIncludeAssertTest.java | 2 +- .../bestpractices/JUnitUseExpectedTest.java | 2 +- .../LiteralsFirstInComparisonsTest.java | 2 +- .../rule/bestpractices/LooseCouplingTest.java | 2 +- .../MethodReturnsInternalArrayTest.java | 2 +- .../bestpractices/MissingOverrideTest.java | 2 +- .../OneDeclarationPerLineTest.java | 2 +- .../bestpractices/PreserveStackTraceTest.java | 2 +- .../PrimitiveWrapperInstantiationTest.java | 2 +- .../ReplaceEnumerationWithIteratorTest.java | 2 +- .../ReplaceHashtableWithMapTest.java | 2 +- .../ReplaceVectorWithListTest.java | 2 +- .../SimplifiableTestAssertionTest.java | 2 +- .../SwitchStmtsShouldHaveDefaultTest.java | 2 +- .../rule/bestpractices/SystemPrintlnTest.java | 2 +- .../bestpractices/UnusedAssignmentTest.java | 2 +- .../UnusedFormalParameterTest.java | 2 +- .../UnusedLocalVariableTest.java | 2 +- .../bestpractices/UnusedPrivateFieldTest.java | 2 +- .../UnusedPrivateMethodTest.java | 2 +- .../UseCollectionIsEmptyTest.java | 2 +- .../UseStandardCharsetsTest.java | 2 +- .../UseTryWithResourcesTest.java | 2 +- .../rule/bestpractices/UseVarargsTest.java | 2 +- .../WhileLoopWithLiteralBooleanTest.java | 2 +- .../codestyle/AtLeastOneConstructorTest.java | 2 +- .../rule/codestyle/AvoidDollarSignsTest.java | 2 +- .../AvoidProtectedFieldInFinalClassTest.java | 2 +- ...tedMethodInFinalClassNotExtendingTest.java | 2 +- .../codestyle/AvoidUsingNativeCodeTest.java | 2 +- .../codestyle/BooleanGetMethodNameTest.java | 2 +- .../codestyle/CallSuperInConstructorTest.java | 2 +- .../codestyle/ClassNamingConventionsTest.java | 2 +- .../CommentDefaultAccessModifierTest.java | 2 +- .../rule/codestyle/ConfusingTernaryTest.java | 2 +- .../codestyle/ControlStatementBracesTest.java | 2 +- .../codestyle/EmptyControlStatementTest.java | 2 +- ...odInAbstractClassShouldBeAbstractTest.java | 2 +- .../rule/codestyle/ExtendsObjectTest.java | 2 +- ...eclarationsShouldBeAtStartOfClassTest.java | 2 +- .../codestyle/FieldNamingConventionsTest.java | 2 +- .../FinalParameterInAbstractMethodTest.java | 2 +- .../ForLoopShouldBeWhileLoopTest.java | 2 +- .../FormalParameterNamingConventionsTest.java | 2 +- .../rule/codestyle/GenericsNamingTest.java | 2 +- .../codestyle/IdenticalCatchBranchesTest.java | 2 +- .../rule/codestyle/LinguisticNamingTest.java | 2 +- .../LocalHomeNamingConventionTest.java | 2 +- ...lInterfaceSessionNamingConventionTest.java | 2 +- .../LocalVariableCouldBeFinalTest.java | 2 +- .../LocalVariableNamingConventionsTest.java | 2 +- .../java/rule/codestyle/LongVariableTest.java | 2 +- ...MDBAndSessionBeanNamingConventionTest.java | 2 +- .../MethodArgumentCouldBeFinalTest.java | 2 +- .../MethodNamingConventionsTest.java | 2 +- .../java/rule/codestyle/NoPackageTest.java | 2 +- .../rule/codestyle/OnlyOneReturnTest.java | 2 +- .../java/rule/codestyle/PackageCaseTest.java | 2 +- .../codestyle/PrematureDeclarationTest.java | 2 +- .../RemoteInterfaceNamingConventionTest.java | 2 +- ...eSessionInterfaceNamingConventionTest.java | 2 +- .../rule/codestyle/ShortClassNameTest.java | 2 +- .../rule/codestyle/ShortMethodNameTest.java | 2 +- .../rule/codestyle/ShortVariableTest.java | 2 +- .../codestyle/TooManyStaticImportsTest.java | 2 +- ...UnnecessaryAnnotationValueElementTest.java | 2 +- .../rule/codestyle/UnnecessaryBoxingTest.java | 2 +- .../rule/codestyle/UnnecessaryCastTest.java | 2 +- .../codestyle/UnnecessaryConstructorTest.java | 2 +- .../UnnecessaryFullyQualifiedNameTest.java | 2 +- .../rule/codestyle/UnnecessaryImportTest.java | 2 +- .../UnnecessaryLocalBeforeReturnTest.java | 2 +- .../codestyle/UnnecessaryModifierTest.java | 2 +- .../rule/codestyle/UnnecessaryReturnTest.java | 2 +- .../codestyle/UnnecessarySemicolonTest.java | 2 +- .../codestyle/UseDiamondOperatorTest.java | 2 +- .../UseShortArrayInitializerTest.java | 2 +- .../UseUnderscoresInNumericLiteralsTest.java | 2 +- .../codestyle/UselessParenthesesTest.java | 57 +++---- .../codestyle/UselessQualifiedThisTest.java | 2 +- .../AbstractClassWithoutAnyMethodTest.java | 2 +- .../AvoidCatchingGenericExceptionTest.java | 2 +- .../design/AvoidDeeplyNestedIfStmtsTest.java | 2 +- .../design/AvoidRethrowingExceptionTest.java | 2 +- ...hrowingNewInstanceOfSameExceptionTest.java | 2 +- ...AvoidThrowingNullPointerExceptionTest.java | 2 +- .../AvoidThrowingRawExceptionTypesTest.java | 2 +- ...idUncheckedExceptionsInSignaturesTest.java | 2 +- ...yPrivateConstructorsShouldBeFinalTest.java | 2 +- .../rule/design/CognitiveComplexityTest.java | 3 +- .../design/CollapsibleIfStatementsTest.java | 2 +- .../design/CouplingBetweenObjectsTest.java | 2 +- .../rule/design/CyclomaticComplexityTest.java | 3 +- .../lang/java/rule/design/DataClassTest.java | 2 +- .../design/DoNotExtendJavaLangErrorTest.java | 2 +- .../design/ExceptionAsFlowControlTest.java | 2 +- .../rule/design/ExcessiveClassLengthTest.java | 2 +- .../rule/design/ExcessiveImportsTest.java | 2 +- .../design/ExcessiveMethodLengthTest.java | 2 +- .../design/ExcessiveParameterListTest.java | 2 +- .../rule/design/ExcessivePublicCountTest.java | 2 +- .../design/FinalFieldCouldBeStaticTest.java | 2 +- .../lang/java/rule/design/GodClassTest.java | 2 +- .../java/rule/design/ImmutableFieldTest.java | 2 +- .../java/rule/design/LawOfDemeterTest.java | 2 +- .../java/rule/design/LogicInversionTest.java | 2 +- .../rule/design/LoosePackageCouplingTest.java | 2 +- .../rule/design/MutableStaticStateTest.java | 2 +- .../java/rule/design/NPathComplexityTest.java | 3 +- .../lang/java/rule/design/NcssCountTest.java | 3 +- .../SignatureDeclareThrowsExceptionTest.java | 2 +- .../rule/design/SimplifiedTernaryTest.java | 2 +- .../SimplifyBooleanExpressionsTest.java | 2 +- .../design/SimplifyBooleanReturnsTest.java | 2 +- .../rule/design/SimplifyConditionalTest.java | 2 +- .../java/rule/design/SingularFieldTest.java | 2 +- .../java/rule/design/SwitchDensityTest.java | 2 +- .../java/rule/design/TooManyFieldsTest.java | 2 +- .../java/rule/design/TooManyMethodsTest.java | 2 +- .../design/UseObjectForClearerAPITest.java | 2 +- .../java/rule/design/UseUtilityClassTest.java | 2 +- .../design/UselessOverridingMethodTest.java | 2 +- .../documentation/CommentContentTest.java | 2 +- .../documentation/CommentRequiredTest.java | 18 +-- .../rule/documentation/CommentSizeTest.java | 2 +- .../UncommentedEmptyConstructorTest.java | 2 +- .../UncommentedEmptyMethodBodyTest.java | 2 +- .../errorprone/AssignmentInOperandTest.java | 2 +- .../AssignmentToNonFinalStaticTest.java | 2 +- .../AvoidAccessibilityAlterationTest.java | 2 +- .../AvoidAssertAsIdentifierTest.java | 2 +- ...oidBranchingStatementAsLastInLoopTest.java | 2 +- .../errorprone/AvoidCallingFinalizeTest.java | 2 +- .../rule/errorprone/AvoidCatchingNPETest.java | 2 +- .../AvoidCatchingThrowableTest.java | 2 +- ...alLiteralsInBigDecimalConstructorTest.java | 2 +- .../AvoidDuplicateLiteralsTest.java | 2 +- .../errorprone/AvoidEnumAsIdentifierTest.java | 2 +- .../AvoidFieldNameMatchingMethodNameTest.java | 2 +- .../AvoidFieldNameMatchingTypeNameTest.java | 2 +- ...voidInstanceofChecksInCatchClauseTest.java | 2 +- .../AvoidLiteralsInIfConditionTest.java | 2 +- .../AvoidLosingExceptionInformationTest.java | 2 +- .../AvoidMultipleUnaryOperatorsTest.java | 2 +- .../errorprone/AvoidUsingOctalValuesTest.java | 2 +- .../BeanMembersShouldSerializeTest.java | 2 +- .../rule/errorprone/BrokenNullCheckTest.java | 2 +- .../rule/errorprone/CallSuperFirstTest.java | 2 +- .../rule/errorprone/CallSuperLastTest.java | 2 +- .../rule/errorprone/CheckSkipResultTest.java | 2 +- .../ClassCastExceptionWithToArrayTest.java | 2 +- .../CloneMethodMustBePublicTest.java | 2 +- ...CloneMethodMustImplementCloneableTest.java | 2 +- ...ethodReturnTypeMustMatchClassNameTest.java | 2 +- .../rule/errorprone/CloseResourceTest.java | 2 +- .../CompareObjectsWithEqualsTest.java | 2 +- .../errorprone/ComparisonWithNaNTest.java | 2 +- ...ConstructorCallsOverridableMethodTest.java | 2 +- .../rule/errorprone/DetachedTestCaseTest.java | 2 +- ...otCallGarbageCollectionExplicitlyTest.java | 2 +- .../DoNotExtendJavaLangThrowableTest.java | 2 +- .../errorprone/DoNotHardCodeSDCardTest.java | 2 +- .../rule/errorprone/DoNotTerminateVMTest.java | 2 +- .../DoNotThrowExceptionInFinallyTest.java | 2 +- .../rule/errorprone/DontImportSunTest.java | 2 +- .../DontUseFloatTypeForLoopIndicesTest.java | 2 +- .../rule/errorprone/EmptyCatchBlockTest.java | 2 +- .../rule/errorprone/EmptyFinalizerTest.java | 2 +- .../errorprone/EmptyFinallyBlockTest.java | 2 +- .../java/rule/errorprone/EmptyIfStmtTest.java | 2 +- .../rule/errorprone/EmptyInitializerTest.java | 2 +- .../errorprone/EmptyStatementBlockTest.java | 2 +- .../EmptyStatementNotInLoopTest.java | 2 +- .../errorprone/EmptySwitchStatementsTest.java | 2 +- .../EmptySynchronizedBlockTest.java | 2 +- .../rule/errorprone/EmptyTryBlockTest.java | 2 +- .../rule/errorprone/EmptyWhileStmtTest.java | 2 +- .../java/rule/errorprone/EqualsNullTest.java | 2 +- .../FinalizeDoesNotCallSuperFinalizeTest.java | 2 +- .../FinalizeOnlyCallsSuperFinalizeTest.java | 2 +- .../errorprone/FinalizeOverloadedTest.java | 2 +- .../FinalizeShouldBeProtectedTest.java | 2 +- .../errorprone/IdempotentOperationsTest.java | 2 +- .../ImplicitSwitchFallThroughTest.java | 2 +- .../InstantiationToGetClassTest.java | 2 +- .../InvalidLogMessageFormatTest.java | 2 +- .../rule/errorprone/JUnitSpellingTest.java | 2 +- .../rule/errorprone/JUnitStaticSuiteTest.java | 2 +- .../errorprone/JumbledIncrementerTest.java | 2 +- ...ethodWithSameNameAsEnclosingClassTest.java | 2 +- .../errorprone/MisplacedNullCheckTest.java | 2 +- .../MissingSerialVersionUIDTest.java | 2 +- ...ticMethodInNonInstantiatableClassTest.java | 2 +- .../errorprone/MoreThanOneLoggerTest.java | 2 +- .../NonCaseLabelInSwitchStatementTest.java | 2 +- .../errorprone/NonStaticInitializerTest.java | 2 +- .../rule/errorprone/NullAssignmentTest.java | 2 +- .../OverrideBothEqualsAndHashcodeTest.java | 2 +- .../ProperCloneImplementationTest.java | 2 +- .../rule/errorprone/ProperLoggerTest.java | 2 +- ...turnEmptyCollectionRatherThanNullTest.java | 2 +- .../ReturnFromFinallyBlockTest.java | 2 +- .../SimpleDateFormatNeedsLocaleTest.java | 2 +- .../errorprone/SingleMethodSingletonTest.java | 2 +- ...ingletonClassReturningNewInstanceTest.java | 2 +- .../StaticEJBFieldShouldBeFinalTest.java | 2 +- ...StringBufferInstantiationWithCharTest.java | 2 +- .../SuspiciousEqualsMethodNameTest.java | 2 +- .../SuspiciousHashcodeMethodNameTest.java | 2 +- .../errorprone/SuspiciousOctalEscapeTest.java | 2 +- .../TestClassWithoutTestCasesTest.java | 2 +- .../UnconditionalIfStatementTest.java | 2 +- .../UnnecessaryBooleanAssertionTest.java | 2 +- .../errorprone/UnnecessaryCaseChangeTest.java | 2 +- .../UnnecessaryConversionTemporaryTest.java | 2 +- .../UnusedNullCheckInEqualsTest.java | 2 +- .../UseCorrectExceptionLoggingTest.java | 2 +- .../UseEqualsToCompareStringsTest.java | 2 +- .../UseLocaleWithCaseConversionsTest.java | 2 +- .../errorprone/UseProperClassLoaderTest.java | 2 +- .../UselessOperationOnImmutableTest.java | 2 +- .../java/rule/internal/JavaRuleUtilTest.java | 8 +- .../AvoidSynchronizedAtMethodLevelTest.java | 2 +- .../multithreading/AvoidThreadGroupTest.java | 2 +- .../AvoidUsingVolatileTest.java | 2 +- .../multithreading/DoNotUseThreadsTest.java | 2 +- .../multithreading/DontCallThreadRunTest.java | 2 +- .../DoubleCheckedLockingTest.java | 2 +- .../NonThreadSafeSingletonTest.java | 2 +- .../UnsynchronizedStaticFormatterTest.java | 2 +- .../UseConcurrentHashMapTest.java | 2 +- .../UseNotifyAllInsteadOfNotifyTest.java | 2 +- .../rule/performance/AddEmptyStringTest.java | 2 +- .../AppendCharacterWithCharTest.java | 2 +- .../rule/performance/AvoidArrayLoopsTest.java | 2 +- .../AvoidCalendarDateCreationTest.java | 2 +- .../rule/performance/AvoidFileStreamTest.java | 2 +- .../AvoidInstantiatingObjectsInLoopsTest.java | 2 +- .../BigIntegerInstantiationTest.java | 2 +- .../ConsecutiveAppendsShouldReuseTest.java | 2 +- .../ConsecutiveLiteralAppendsTest.java | 2 +- .../InefficientEmptyStringCheckTest.java | 2 +- .../InefficientStringBufferingTest.java | 2 +- ...sufficientStringBufferDeclarationTest.java | 2 +- .../OptimizableToArrayCallTest.java | 2 +- .../RedundantFieldInitializerTest.java | 2 +- .../performance/StringInstantiationTest.java | 2 +- .../rule/performance/StringToStringTest.java | 2 +- ...TooFewBranchesForASwitchStatementTest.java | 2 +- .../UseArrayListInsteadOfVectorTest.java | 2 +- .../rule/performance/UseArraysAsListTest.java | 2 +- ...OStreamsWithApacheCommonsFileItemTest.java | 3 +- .../rule/performance/UseIndexOfCharTest.java | 2 +- .../UseStringBufferForStringAppendsTest.java | 2 +- .../UseStringBufferLengthTest.java | 2 +- .../performance/UselessStringValueOfTest.java | 2 +- .../rule/security/HardCodedCryptoKeyTest.java | 2 +- .../rule/security/InsecureCryptoIvTest.java | 2 +- .../xpath/internal/BaseXPathFunctionTest.java | 6 +- .../internal/GetModifiersFunctionsTest.java | 12 +- .../internal/HasAnnotationXPathTest.java | 10 +- .../internal/MatchesSignatureXPathTest.java | 22 +-- .../xpath/internal/NodeIsFunctionTest.java | 14 +- .../xpath/internal/TypeIsFunctionTest.java | 12 +- .../internal/XPathMetricFunctionTest.java | 16 +- .../table/internal/AbruptCompletionTests.java | 68 ++++---- .../table/internal/PatternBindingsTests.java | 18 +-- .../types/GenericMethodReferenceTest.java | 14 +- .../java/types/InvocationMatcherTest.java | 24 +-- .../pmd/lang/java/types/TypeTestUtilTest.java | 145 +++++++++--------- .../lang/java/types/TypesTreeDumpTest.java | 8 +- .../infer/BaseTypeInferenceUnitTest.java | 25 ++- .../internal/infer/InferenceCtxUnitTests.java | 36 ++--- 307 files changed, 637 insertions(+), 626 deletions(-) diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaLanguageModuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaLanguageModuleTest.java index f9a4f675e7..17a9b16fa1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaLanguageModuleTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaLanguageModuleTest.java @@ -4,45 +4,46 @@ package net.sourceforge.pmd.lang.java; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.LanguageVersion; -public class JavaLanguageModuleTest { +class JavaLanguageModuleTest { @Test - public void java9IsSmallerThanJava10() { + void java9IsSmallerThanJava10() { LanguageVersion java9 = JavaLanguageModule.getInstance().getVersion("9"); LanguageVersion java10 = JavaLanguageModule.getInstance().getVersion("10"); - Assert.assertTrue("java9 should be smaller than java10", java9.compareTo(java10) < 0); + assertTrue(java9.compareTo(java10) < 0, "java9 should be smaller than java10"); } @Test - public void previewVersionShouldBeGreaterThanNonPreview() { + void previewVersionShouldBeGreaterThanNonPreview() { LanguageVersion java18 = JavaLanguageModule.getInstance().getVersion("18"); LanguageVersion java18p = JavaLanguageModule.getInstance().getVersion("18-preview"); - Assert.assertTrue("java18-preview should be greater than java18", java18p.compareTo(java18) > 0); + assertTrue(java18p.compareTo(java18) > 0, "java18-preview should be greater than java18"); } @Test - public void testCompareToVersion() { + void testCompareToVersion() { LanguageVersion java9 = JavaLanguageModule.getInstance().getVersion("9"); - Assert.assertTrue("java9 should be smaller than java10", java9.compareToVersion("10") < 0); + assertTrue(java9.compareToVersion("10") < 0, "java9 should be smaller than java10"); } @Test - public void allVersions() { + void allVersions() { List versions = JavaLanguageModule.getInstance().getVersions(); for (int i = 1; i < versions.size(); i++) { LanguageVersion previous = versions.get(i - 1); LanguageVersion current = versions.get(i); - Assert.assertTrue("Version " + previous + " should be smaller than " + current, - previous.compareTo(current) < 0); + assertTrue(previous.compareTo(current) < 0, + "Version " + previous + " should be smaller than " + current); } } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMD5RulesetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMD5RulesetTest.java index 9712174595..653090e171 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMD5RulesetTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMD5RulesetTest.java @@ -4,19 +4,21 @@ package net.sourceforge.pmd.lang.java; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.RuleSet; import net.sourceforge.pmd.RuleSetLoader; -public class PMD5RulesetTest { +class PMD5RulesetTest { @Test public void loadRuleset() { RuleSet ruleset = new RuleSetLoader().loadFromResource("net/sourceforge/pmd/lang/java/pmd5ruleset.xml"); - Assert.assertNotNull(ruleset); - Assert.assertNull(ruleset.getRuleByName("GuardLogStatementJavaUtil")); - Assert.assertNull(ruleset.getRuleByName("GuardLogStatement")); + assertNotNull(ruleset); + assertNull(ruleset.getRuleByName("GuardLogStatementJavaUtil")); + assertNull(ruleset.getRuleByName("GuardLogStatement")); } } 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 2d0cd9d22c..e7182c7382 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 @@ -4,24 +4,25 @@ package net.sourceforge.pmd.lang.java; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.SystemErrRule; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.RuleSet; import net.sourceforge.pmd.RuleSetLoader; -public class QuickstartRulesetTest { +import com.github.stefanbirkner.systemlambda.SystemLambda; - @Rule - public final SystemErrRule systemErrRule = new SystemErrRule().enableLog().muteForSuccessfulTests(); +class QuickstartRulesetTest { @Test - public void noDeprecations() { + void noDeprecations() throws Exception { RuleSetLoader ruleSetLoader = new RuleSetLoader().enableCompatibility(false); - RuleSet quickstart = ruleSetLoader.loadFromResource("rulesets/java/quickstart.xml"); - Assert.assertFalse(quickstart.getRules().isEmpty()); - Assert.assertTrue(systemErrRule.getLog().isEmpty()); + String errorOutput = SystemLambda.tapSystemErr(() -> { + RuleSet quickstart = ruleSetLoader.loadFromResource("rulesets/java/quickstart.xml"); + assertFalse(quickstart.getRules().isEmpty()); + }); + assertTrue(errorOutput.isEmpty()); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java index 5ad741fded..032072537f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.java; import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.FooRule; import net.sourceforge.pmd.Report; @@ -15,7 +15,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule; -public class SuppressWarningsTest { +class SuppressWarningsTest { private final JavaParsingHelper java = JavaParsingHelper.DEFAULT; @@ -45,7 +45,7 @@ public class SuppressWarningsTest { } @Test - public void testClassLevelSuppression() { + void testClassLevelSuppression() { Report rpt = java.executeRule(new FooRule(), TEST1); assertSize(rpt, 0); rpt = java.executeRule(new FooRule(), TEST2); @@ -53,104 +53,104 @@ public class SuppressWarningsTest { } @Test - public void testInheritedSuppression() { + void testInheritedSuppression() { Report rpt = java.executeRule(new FooRule(), TEST3); assertSize(rpt, 0); } @Test - public void testMethodLevelSuppression() { + void testMethodLevelSuppression() { Report rpt; rpt = java.executeRule(new FooRule(), TEST4); assertSize(rpt, 1); } @Test - public void testConstructorLevelSuppression() { + void testConstructorLevelSuppression() { Report rpt = java.executeRule(new FooRule(), TEST5); assertSize(rpt, 0); } @Test - public void testFieldLevelSuppression() { + void testFieldLevelSuppression() { Report rpt = java.executeRule(new FooRule(), TEST6); assertSize(rpt, 1); } @Test - public void testParameterLevelSuppression() { + void testParameterLevelSuppression() { Report rpt = java.executeRule(new FooRule(), TEST7); assertSize(rpt, 1); } @Test - public void testLocalVariableLevelSuppression() { + void testLocalVariableLevelSuppression() { Report rpt = java.executeRule(new FooRule(), TEST8); assertSize(rpt, 1); } @Test - public void testSpecificSuppression() { + void testSpecificSuppression() { Report rpt = java.executeRule(new FooRule(), TEST9); assertSize(rpt, 1); } @Test - public void testSpecificSuppressionValue1() { + void testSpecificSuppressionValue1() { Report rpt = java.executeRule(new FooRule(), TEST9_VALUE1); assertSize(rpt, 1); } @Test - public void testSpecificSuppressionValue2() { + void testSpecificSuppressionValue2() { Report rpt = java.executeRule(new FooRule(), TEST9_VALUE2); assertSize(rpt, 1); } @Test - public void testSpecificSuppressionValue3() { + void testSpecificSuppressionValue3() { Report rpt = java.executeRule(new FooRule(), TEST9_VALUE3); assertSize(rpt, 1); } @Test - public void testSpecificSuppressionMulitpleValues1() { + void testSpecificSuppressionMulitpleValues1() { Report rpt = java.executeRule(new FooRule(), TEST9_MULTIPLE_VALUES_1); assertSize(rpt, 0); } @Test - public void testSpecificSuppressionMulitpleValues2() { + void testSpecificSuppressionMulitpleValues2() { Report rpt = java.executeRule(new FooRule(), TEST9_MULTIPLE_VALUES_2); assertSize(rpt, 0); } @Test - public void testNoSuppressionBlank() { + void testNoSuppressionBlank() { Report rpt = java.executeRule(new FooRule(), TEST10); assertSize(rpt, 2); } @Test - public void testNoSuppressionSomethingElseS() { + void testNoSuppressionSomethingElseS() { Report rpt = java.executeRule(new FooRule(), TEST11); assertSize(rpt, 2); } @Test - public void testSuppressAll() { + void testSuppressAll() { Report rpt = java.executeRule(new FooRule(), TEST12); assertSize(rpt, 0); } @Test - public void testSpecificSuppressionAtTopLevel() { + void testSpecificSuppressionAtTopLevel() { Report rpt = java.executeRule(new BarRule(), TEST13); assertSize(rpt, 0); } @Test - public void testConstExpr() { + void testConstExpr() { testAboutConstExpr(true, 0); // with the annotation, we should get no violation testAboutConstExpr(false, 1); // without the annotation, we should get a violation } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/JavaMetricsProviderTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/JavaMetricsProviderTest.java index 74f6f024e9..c2b012bc2a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/JavaMetricsProviderTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/JavaMetricsProviderTest.java @@ -4,13 +4,12 @@ package net.sourceforge.pmd.lang.java.metrics; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration; @@ -18,16 +17,15 @@ import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.metrics.LanguageMetricsProvider; import net.sourceforge.pmd.lang.metrics.Metric; - /** * @author Clément Fournier */ -public class JavaMetricsProviderTest { +class JavaMetricsProviderTest { private final JavaParsingHelper java8 = JavaParsingHelper.DEFAULT.withDefaultVersion("1.8"); @Test - public void testComputeAllMetrics() { + void testComputeAllMetrics() { LanguageMetricsProvider provider = java8.getHandler("1.8").getLanguageMetricsProvider(); @@ -42,7 +40,7 @@ public class JavaMetricsProviderTest { @Test - public void testThereIsNoMemoisation() { + void testThereIsNoMemoisation() { LanguageMetricsProvider provider = java8.getHandler("1.8").getLanguageMetricsProvider(); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/MetricsMemoizationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/MetricsMemoizationTest.java index 667cbf673f..edd812222e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/MetricsMemoizationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/MetricsMemoizationTest.java @@ -4,15 +4,14 @@ package net.sourceforge.pmd.lang.java.metrics; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.java.BaseParserTest; @@ -28,7 +27,7 @@ import net.sourceforge.pmd.lang.metrics.MetricsUtil; /** * @author Clément Fournier */ -public class MetricsMemoizationTest extends BaseParserTest { +class MetricsMemoizationTest extends BaseParserTest { private final Metric randomMetric = randomMetric(); @@ -38,7 +37,7 @@ public class MetricsMemoizationTest extends BaseParserTest { } @Test - public void memoizationTest() { + void memoizationTest() { ASTCompilationUnit acu = java.parseClass(MetricsVisitorTestData.class); List expected = visitWith(acu, true); @@ -49,7 +48,7 @@ public class MetricsMemoizationTest extends BaseParserTest { @Test - public void forceMemoizationTest() { + void forceMemoizationTest() { ASTCompilationUnit acu = java.parseClass(MetricsVisitorTestData.class); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/AllMetricsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/AllMetricsTest.java index ae88364ad5..a2e279a4f7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/AllMetricsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/AllMetricsTest.java @@ -15,7 +15,7 @@ import net.sourceforge.pmd.testframework.SimpleAggregatorTst; * * @author Clément Fournier */ -public class AllMetricsTest extends SimpleAggregatorTst { +class AllMetricsTest extends SimpleAggregatorTst { private static final String RULESET = "rulesets/java/metrics_test.xml"; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java index 94e9de4084..f62c9133e6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/JavaRuleViolationTest.java @@ -4,12 +4,12 @@ package net.sourceforge.pmd.lang.java.rule; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.FooRule; import net.sourceforge.pmd.RuleViolation; @@ -25,7 +25,7 @@ import net.sourceforge.pmd.lang.java.ast.JavaNode; /** * @author Philip Graf */ -public class JavaRuleViolationTest { +class JavaRuleViolationTest { // TODO there are no tests for anon or local classes @@ -34,7 +34,7 @@ public class JavaRuleViolationTest { * {@link ASTFormalParameter} node. */ @Test - public void testASTFormalParameterVariableName() { + void testASTFormalParameterVariableName() { ASTCompilationUnit ast = parse("class Foo { void bar(int x) {} }"); final ASTFormalParameter node = ast.getFirstDescendantOfType(ASTFormalParameter.class); final RuleViolation violation = violationAt(node); @@ -51,14 +51,14 @@ public class JavaRuleViolationTest { * @see #1250 */ @Test - public void testMethodName() { + void testMethodName() { ASTCompilationUnit ast = parse("class Foo { void bar(int x) {} }"); ASTMethodDeclaration md = ast.getFirstDescendantOfType(ASTMethodDeclaration.class); assertEquals("bar", violationAt(md).getMethodName()); } @NonNull - public RuleViolation violationAt(JavaNode md) { + RuleViolation violationAt(JavaNode md) { return new JavaRuleViolation(new FooRule(), md, md.getReportLocation(), ""); } @@ -66,7 +66,7 @@ public class JavaRuleViolationTest { * Tests that the enum name is taken correctly from the given node. */ @Test - public void testEnumName() { + void testEnumName() { ASTCompilationUnit ast = parse("enum Foo {FOO; void bar(int x) {} }"); ASTMethodDeclaration md = ast.getFirstDescendantOfType(ASTMethodDeclaration.class); assertEquals("Foo", violationAt(md).getClassName()); @@ -79,7 +79,7 @@ public class JavaRuleViolationTest { * @see #1529 */ @Test - public void testPackageAndClassNameForImport() { + void testPackageAndClassNameForImport() { ASTCompilationUnit ast = parse("package pkg; import java.util.List; public class Foo { }"); ASTImportDeclaration importNode = ast.getFirstDescendantOfType(ASTImportDeclaration.class); @@ -89,7 +89,7 @@ public class JavaRuleViolationTest { } @Test - public void testPackageAndClassNameForField() { + void testPackageAndClassNameForField() { ASTCompilationUnit ast = parse("package pkg; public class Foo { int a; }"); ASTClassOrInterfaceDeclaration classDeclaration = ast.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class); ASTFieldDeclaration field = ast.getFirstDescendantOfType(ASTFieldDeclaration.class); @@ -104,7 +104,7 @@ public class JavaRuleViolationTest { } @Test - public void testPackageAndEnumName() { + void testPackageAndEnumName() { ASTCompilationUnit ast = parse("package pkg; import java.util.List; public enum FooE { }"); ASTImportDeclaration importNode = ast.getFirstDescendantOfType(ASTImportDeclaration.class); @@ -114,7 +114,7 @@ public class JavaRuleViolationTest { } @Test - public void testDefaultPackageAndClassName() { + void testDefaultPackageAndClassName() { ASTCompilationUnit ast = parse("import java.util.List; public class Foo { }"); ASTImportDeclaration importNode = ast.getFirstDescendantOfType(ASTImportDeclaration.class); @@ -124,7 +124,7 @@ public class JavaRuleViolationTest { } @Test - public void testPackageAndMultipleClassesName() { + void testPackageAndMultipleClassesName() { ASTCompilationUnit ast = parse("package pkg; import java.util.List; class Foo { } public class Bar { }"); ASTImportDeclaration importNode = ast.getFirstDescendantOfType(ASTImportDeclaration.class); @@ -134,7 +134,7 @@ public class JavaRuleViolationTest { } @Test - public void testPackageAndPackagePrivateClassesName() { + void testPackageAndPackagePrivateClassesName() { ASTCompilationUnit ast = parse("package pkg; import java.util.List; class Foo { }"); ASTImportDeclaration importNode = ast.getFirstDescendantOfType(ASTImportDeclaration.class); @@ -148,7 +148,7 @@ public class JavaRuleViolationTest { * Also check fields. */ @Test - public void testInnerClass() { + void testInnerClass() { ASTCompilationUnit ast = parse("class Foo { int a; class Bar { int a; } }"); List classes = ast.findDescendantsOfType(ASTClassOrInterfaceDeclaration.class); assertEquals(2, classes.size()); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java index 26d645eb60..21bf91d7a6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/XPathRuleTest.java @@ -4,13 +4,13 @@ package net.sourceforge.pmd.lang.java.rule; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.HashMap; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.PMD; import net.sourceforge.pmd.Report; @@ -31,14 +31,14 @@ import net.sourceforge.pmd.properties.PropertyFactory; /** * @author daniels */ -public class XPathRuleTest { +class XPathRuleTest { private XPathRule makeXPath(String expression) { return JavaParsingHelper.DEFAULT.newXpathRule(expression); } @Test - public void testPluginname() { + void testPluginname() { XPathRule rule = makeXPath("//VariableDeclaratorId[string-length(@Name) < 3]"); rule.setMessage("{0}"); Report report = getReportForTestString(rule, TEST1); @@ -48,7 +48,7 @@ public class XPathRuleTest { @Test - public void testXPathMultiProperty() throws Exception { + void testXPathMultiProperty() throws Exception { XPathRule rule = makeXPath("//VariableDeclaratorId[@Name=$forbiddenNames]"); rule.setMessage("Avoid vars"); PropertyDescriptor> varDescriptor @@ -66,7 +66,7 @@ public class XPathRuleTest { @Test - public void testVariables() throws Exception { + void testVariables() throws Exception { XPathRule rule = makeXPath("//VariableDeclaratorId[@Name=$var]"); rule.setMessage("Avoid vars"); PropertyDescriptor varDescriptor = @@ -79,7 +79,7 @@ public class XPathRuleTest { } @Test - public void testFnPrefixOnSaxon() throws Exception { + void testFnPrefixOnSaxon() throws Exception { XPathRule rule = makeXPath("//VariableDeclaratorId[fn:matches(@Name, 'fiddle')]"); Report report = getReportForTestString(rule, TEST2); RuleViolation rv = report.getViolations().get(0); @@ -87,7 +87,7 @@ public class XPathRuleTest { } @Test - public void testNoFnPrefixOnSaxon() { + void testNoFnPrefixOnSaxon() { XPathRule rule = makeXPath("//VariableDeclaratorId[matches(@Name, 'fiddle')]"); Report report = getReportForTestString(rule, TEST2); RuleViolation rv = report.getViolations().get(0); @@ -95,20 +95,20 @@ public class XPathRuleTest { } @Test - public void testSimpleQueryIsRuleChain() { + void testSimpleQueryIsRuleChain() { // ((/)/descendant::element(Q{}VariableDeclaratorId))[matches(convertUntyped(data(@Name)), "fiddle", "")] assertIsRuleChain("//VariableDeclaratorId[matches(@Name, 'fiddle')]"); } @Test - public void testSimpleQueryIsRuleChain2() { + void testSimpleQueryIsRuleChain2() { // docOrder(((/)/descendant-or-self::node())/(child::element(ClassOrInterfaceType)[typeIs("java.util.Vector")])) assertIsRuleChain("//ClassOrInterfaceType[pmd-java:typeIs('java.util.Vector')]"); } private void assertIsRuleChain(String xpath) { XPathRule rule = makeXPath(xpath); - assertTrue("Not recognized as a rulechain query: " + xpath, rule.getTargetSelector().isRuleChain()); + assertTrue(rule.getTargetSelector().isRuleChain(), "Not recognized as a rulechain query: " + xpath); } @@ -118,7 +118,7 @@ public class XPathRuleTest { * @throws Exception any error */ @Test - public void testFollowingSibling() throws Exception { + void testFollowingSibling() throws Exception { final String source = "public interface dummy extends Foo, Bar, Baz {}"; ASTCompilationUnit cu = JavaParsingHelper.DEFAULT.parse(source); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java index a7ff179f29..b319c5e9f1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AbstractClassWithoutAbstractMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AbstractClassWithoutAbstractMethodTest extends PmdRuleTst { +class AbstractClassWithoutAbstractMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorClassGenerationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorClassGenerationTest.java index 73faf421b8..1c922fd22e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorClassGenerationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorClassGenerationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AccessorClassGenerationTest extends PmdRuleTst { +class AccessorClassGenerationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationTest.java index 678eac6042..7ef92f4c8e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AccessorMethodGenerationTest extends PmdRuleTst { +class AccessorMethodGenerationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyTest.java index 1df344be6e..0fba328ac6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ArrayIsStoredDirectlyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ArrayIsStoredDirectlyTest extends PmdRuleTst { +class ArrayIsStoredDirectlyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java index 37d37625e7..df4543674d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidMessageDigestFieldTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidMessageDigestFieldTest extends PmdRuleTst { +class AvoidMessageDigestFieldTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidPrintStackTraceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidPrintStackTraceTest.java index 0a52f862d1..436d56f150 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidPrintStackTraceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidPrintStackTraceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidPrintStackTraceTest extends PmdRuleTst { +class AvoidPrintStackTraceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningCatchVariablesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningCatchVariablesTest.java index 5afdbca56b..25ab862bfe 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningCatchVariablesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningCatchVariablesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidReassigningCatchVariablesTest extends PmdRuleTst { +class AvoidReassigningCatchVariablesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningLoopVariablesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningLoopVariablesTest.java index 3157601173..a15f9742fb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningLoopVariablesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningLoopVariablesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidReassigningLoopVariablesTest extends PmdRuleTst { +class AvoidReassigningLoopVariablesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningParametersTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningParametersTest.java index 906b82d966..68ab080b7d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningParametersTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidReassigningParametersTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidReassigningParametersTest extends PmdRuleTst { +class AvoidReassigningParametersTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidStringBufferFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidStringBufferFieldTest.java index 88219b9257..1b1e7898cf 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidStringBufferFieldTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidStringBufferFieldTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidStringBufferFieldTest extends PmdRuleTst { +class AvoidStringBufferFieldTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidUsingHardCodedIPTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidUsingHardCodedIPTest.java index 63e4523ca2..82d84a3c05 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidUsingHardCodedIPTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AvoidUsingHardCodedIPTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidUsingHardCodedIPTest extends PmdRuleTst { +class AvoidUsingHardCodedIPTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/CheckResultSetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/CheckResultSetTest.java index effe3630b2..cba377fd59 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/CheckResultSetTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/CheckResultSetTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CheckResultSetTest extends PmdRuleTst { +class CheckResultSetTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ConstantsInInterfaceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ConstantsInInterfaceTest.java index e72544c3fd..bf685f3ad7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ConstantsInInterfaceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ConstantsInInterfaceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConstantsInInterfaceTest extends PmdRuleTst { +class ConstantsInInterfaceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DefaultLabelNotLastInSwitchStmtTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DefaultLabelNotLastInSwitchStmtTest.java index 7c8d1c663a..1a407779e8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DefaultLabelNotLastInSwitchStmtTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DefaultLabelNotLastInSwitchStmtTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DefaultLabelNotLastInSwitchStmtTest extends PmdRuleTst { +class DefaultLabelNotLastInSwitchStmtTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DoubleBraceInitializationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DoubleBraceInitializationTest.java index 2e7b29a342..26eee695b6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DoubleBraceInitializationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/DoubleBraceInitializationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoubleBraceInitializationTest extends PmdRuleTst { +class DoubleBraceInitializationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopCanBeForeachTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopCanBeForeachTest.java index 74d7399cc5..e0b774b80d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopCanBeForeachTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopCanBeForeachTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ForLoopCanBeForeachTest extends PmdRuleTst { +class ForLoopCanBeForeachTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopVariableCountTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopVariableCountTest.java index 1bd0203640..5843550a3a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopVariableCountTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ForLoopVariableCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ForLoopVariableCountTest extends PmdRuleTst { +class ForLoopVariableCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/GuardLogStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/GuardLogStatementTest.java index 02f1628b38..84dce65d9c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/GuardLogStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/GuardLogStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class GuardLogStatementTest extends PmdRuleTst { +class GuardLogStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4SuitesShouldUseSuiteAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4SuitesShouldUseSuiteAnnotationTest.java index 7c48d95ab2..dc2c92f4ae 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4SuitesShouldUseSuiteAnnotationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4SuitesShouldUseSuiteAnnotationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnit4SuitesShouldUseSuiteAnnotationTest extends PmdRuleTst { +class JUnit4SuitesShouldUseSuiteAnnotationTest extends PmdRuleTst { // no additional unit tests } 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 f29e876d5f..341829e928 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 @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnit4TestShouldUseAfterAnnotationTest extends PmdRuleTst { +class JUnit4TestShouldUseAfterAnnotationTest extends PmdRuleTst { // no additional unit tests } 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 cd3772d669..b92ab68100 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 @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnit4TestShouldUseBeforeAnnotationTest extends PmdRuleTst { +class JUnit4TestShouldUseBeforeAnnotationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseTestAnnotationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseTestAnnotationTest.java index f348ab0b04..6710c145be 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseTestAnnotationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit4TestShouldUseTestAnnotationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnit4TestShouldUseTestAnnotationTest extends PmdRuleTst { +class JUnit4TestShouldUseTestAnnotationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit5TestShouldBePackagePrivateTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit5TestShouldBePackagePrivateTest.java index 5d56479c58..bf8190b559 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit5TestShouldBePackagePrivateTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnit5TestShouldBePackagePrivateTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnit5TestShouldBePackagePrivateTest extends PmdRuleTst { +class JUnit5TestShouldBePackagePrivateTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageTest.java index ab7c80a5be..239cce7659 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitAssertionsShouldIncludeMessageTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitAssertionsShouldIncludeMessageTest extends PmdRuleTst { +class JUnitAssertionsShouldIncludeMessageTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsTest.java index 76656a65d0..c91e0ec567 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestContainsTooManyAssertsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitTestContainsTooManyAssertsTest extends PmdRuleTst { +class JUnitTestContainsTooManyAssertsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertTest.java index 373e30c109..b638b6931a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitTestsShouldIncludeAssertTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitTestsShouldIncludeAssertTest extends PmdRuleTst { +class JUnitTestsShouldIncludeAssertTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitUseExpectedTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitUseExpectedTest.java index 6cef9b5e22..fccdcb4321 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitUseExpectedTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/JUnitUseExpectedTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitUseExpectedTest extends PmdRuleTst { +class JUnitUseExpectedTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LiteralsFirstInComparisonsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LiteralsFirstInComparisonsTest.java index afec19e09a..ad573713aa 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LiteralsFirstInComparisonsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LiteralsFirstInComparisonsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LiteralsFirstInComparisonsTest extends PmdRuleTst { +class LiteralsFirstInComparisonsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingTest.java index 25382d7ae0..2d702101d4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/LooseCouplingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LooseCouplingTest extends PmdRuleTst { +class LooseCouplingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MethodReturnsInternalArrayTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MethodReturnsInternalArrayTest.java index 0bf67ba0a8..4ac38bd990 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MethodReturnsInternalArrayTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MethodReturnsInternalArrayTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodReturnsInternalArrayTest extends PmdRuleTst { +class MethodReturnsInternalArrayTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MissingOverrideTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MissingOverrideTest.java index edd71d4de3..0d374f3810 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MissingOverrideTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/MissingOverrideTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MissingOverrideTest extends PmdRuleTst { +class MissingOverrideTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/OneDeclarationPerLineTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/OneDeclarationPerLineTest.java index 822381222e..84c2a6d5b5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/OneDeclarationPerLineTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/OneDeclarationPerLineTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OneDeclarationPerLineTest extends PmdRuleTst { +class OneDeclarationPerLineTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PreserveStackTraceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PreserveStackTraceTest.java index f23c1636c2..3ee1e1f9ec 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PreserveStackTraceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PreserveStackTraceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class PreserveStackTraceTest extends PmdRuleTst { +class PreserveStackTraceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationTest.java index a298bef836..c4c4242233 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/PrimitiveWrapperInstantiationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class PrimitiveWrapperInstantiationTest extends PmdRuleTst { +class PrimitiveWrapperInstantiationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceEnumerationWithIteratorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceEnumerationWithIteratorTest.java index fea13ff280..ae43342146 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceEnumerationWithIteratorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceEnumerationWithIteratorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ReplaceEnumerationWithIteratorTest extends PmdRuleTst { +class ReplaceEnumerationWithIteratorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceHashtableWithMapTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceHashtableWithMapTest.java index d1a6337efa..96c695b7d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceHashtableWithMapTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceHashtableWithMapTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ReplaceHashtableWithMapTest extends PmdRuleTst { +class ReplaceHashtableWithMapTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceVectorWithListTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceVectorWithListTest.java index d6f5b31eb4..6e6c42ebfa 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceVectorWithListTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/ReplaceVectorWithListTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ReplaceVectorWithListTest extends PmdRuleTst { +class ReplaceVectorWithListTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SimplifiableTestAssertionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SimplifiableTestAssertionTest.java index cea609a1ff..4e8f183411 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SimplifiableTestAssertionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SimplifiableTestAssertionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimplifiableTestAssertionTest extends PmdRuleTst { +class SimplifiableTestAssertionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SwitchStmtsShouldHaveDefaultTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SwitchStmtsShouldHaveDefaultTest.java index bbec6a1612..c1e3024e73 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SwitchStmtsShouldHaveDefaultTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SwitchStmtsShouldHaveDefaultTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SwitchStmtsShouldHaveDefaultTest extends PmdRuleTst { +class SwitchStmtsShouldHaveDefaultTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SystemPrintlnTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SystemPrintlnTest.java index e17f5ee7be..f56c1d553a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SystemPrintlnTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/SystemPrintlnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SystemPrintlnTest extends PmdRuleTst { +class SystemPrintlnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedAssignmentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedAssignmentTest.java index 7d363ef084..e0268e6b19 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedAssignmentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedAssignmentTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedAssignmentTest extends PmdRuleTst { +class UnusedAssignmentTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterTest.java index 154952c1f5..1498848b13 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedFormalParameterTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedFormalParameterTest extends PmdRuleTst { +class UnusedFormalParameterTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableTest.java index aad6d106c4..cef06f1d28 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedLocalVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedLocalVariableTest extends PmdRuleTst { +class UnusedLocalVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldTest.java index 09e8be52e3..2dbebb0d75 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateFieldTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedPrivateFieldTest extends PmdRuleTst { +class UnusedPrivateFieldTest extends PmdRuleTst { } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodTest.java index 5cc101a04f..95c69992cb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnusedPrivateMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedPrivateMethodTest extends PmdRuleTst { +class UnusedPrivateMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyTest.java index f941133e82..c5ff68ec34 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseCollectionIsEmptyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseCollectionIsEmptyTest extends PmdRuleTst { +class UseCollectionIsEmptyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseStandardCharsetsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseStandardCharsetsTest.java index f2124ec38e..9ca82a74bf 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseStandardCharsetsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseStandardCharsetsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseStandardCharsetsTest extends PmdRuleTst { +class UseStandardCharsetsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseTryWithResourcesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseTryWithResourcesTest.java index 158123c3ac..6ae963e5b7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseTryWithResourcesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseTryWithResourcesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseTryWithResourcesTest extends PmdRuleTst { +class UseTryWithResourcesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseVarargsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseVarargsTest.java index a40a5617d9..d427a9b63a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseVarargsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UseVarargsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseVarargsTest extends PmdRuleTst { +class UseVarargsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/WhileLoopWithLiteralBooleanTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/WhileLoopWithLiteralBooleanTest.java index 31fcad9210..c123e41fb9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/WhileLoopWithLiteralBooleanTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/WhileLoopWithLiteralBooleanTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class WhileLoopWithLiteralBooleanTest extends PmdRuleTst { +class WhileLoopWithLiteralBooleanTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AtLeastOneConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AtLeastOneConstructorTest.java index 129fe92fa9..a01faa8ee8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AtLeastOneConstructorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AtLeastOneConstructorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AtLeastOneConstructorTest extends PmdRuleTst { +class AtLeastOneConstructorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsTest.java index 1d8e87383c..3912331a26 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidDollarSignsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDollarSignsTest extends PmdRuleTst { +class AvoidDollarSignsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedFieldInFinalClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedFieldInFinalClassTest.java index 1f22c1d607..6f12fef002 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedFieldInFinalClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedFieldInFinalClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidProtectedFieldInFinalClassTest extends PmdRuleTst { +class AvoidProtectedFieldInFinalClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedMethodInFinalClassNotExtendingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedMethodInFinalClassNotExtendingTest.java index 61bb110a08..26f19cbefb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedMethodInFinalClassNotExtendingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidProtectedMethodInFinalClassNotExtendingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidProtectedMethodInFinalClassNotExtendingTest extends PmdRuleTst { +class AvoidProtectedMethodInFinalClassNotExtendingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidUsingNativeCodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidUsingNativeCodeTest.java index 8886751443..d6be3157ba 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidUsingNativeCodeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/AvoidUsingNativeCodeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidUsingNativeCodeTest extends PmdRuleTst { +class AvoidUsingNativeCodeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/BooleanGetMethodNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/BooleanGetMethodNameTest.java index c6c6734dc8..4ecd11cdae 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/BooleanGetMethodNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/BooleanGetMethodNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class BooleanGetMethodNameTest extends PmdRuleTst { +class BooleanGetMethodNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CallSuperInConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CallSuperInConstructorTest.java index 05b5cf0c8c..c1df93ea1c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CallSuperInConstructorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CallSuperInConstructorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CallSuperInConstructorTest extends PmdRuleTst { +class CallSuperInConstructorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsTest.java index 81605d543f..32796e3fd4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ClassNamingConventionsTest extends PmdRuleTst { +class ClassNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierTest.java index d0ad862dad..57e297e29a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CommentDefaultAccessModifierTest extends PmdRuleTst { +class CommentDefaultAccessModifierTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryTest.java index a023f70921..383ded2194 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ConfusingTernaryTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConfusingTernaryTest extends PmdRuleTst { +class ConfusingTernaryTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ControlStatementBracesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ControlStatementBracesTest.java index c7ff86946e..02ba0a4103 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ControlStatementBracesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ControlStatementBracesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ControlStatementBracesTest extends PmdRuleTst { +class ControlStatementBracesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyControlStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyControlStatementTest.java index ce38ef8144..70bbcd8897 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyControlStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyControlStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyControlStatementTest extends PmdRuleTst { +class EmptyControlStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyMethodInAbstractClassShouldBeAbstractTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyMethodInAbstractClassShouldBeAbstractTest.java index 8d2ca65fdc..44de194856 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyMethodInAbstractClassShouldBeAbstractTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyMethodInAbstractClassShouldBeAbstractTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyMethodInAbstractClassShouldBeAbstractTest extends PmdRuleTst { +class EmptyMethodInAbstractClassShouldBeAbstractTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ExtendsObjectTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ExtendsObjectTest.java index d961107c92..a5b01cc926 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ExtendsObjectTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ExtendsObjectTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExtendsObjectTest extends PmdRuleTst { +class ExtendsObjectTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldDeclarationsShouldBeAtStartOfClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldDeclarationsShouldBeAtStartOfClassTest.java index c9010b20a0..2a46f0ccc8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldDeclarationsShouldBeAtStartOfClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldDeclarationsShouldBeAtStartOfClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FieldDeclarationsShouldBeAtStartOfClassTest extends PmdRuleTst { +class FieldDeclarationsShouldBeAtStartOfClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldNamingConventionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldNamingConventionsTest.java index c2ab5652a2..ad43201f57 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldNamingConventionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FieldNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FieldNamingConventionsTest extends PmdRuleTst { +class FieldNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FinalParameterInAbstractMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FinalParameterInAbstractMethodTest.java index 1402092c39..68a325445b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FinalParameterInAbstractMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FinalParameterInAbstractMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalParameterInAbstractMethodTest extends PmdRuleTst { +class FinalParameterInAbstractMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ForLoopShouldBeWhileLoopTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ForLoopShouldBeWhileLoopTest.java index 646e03a853..0e77ed8483 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ForLoopShouldBeWhileLoopTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ForLoopShouldBeWhileLoopTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ForLoopShouldBeWhileLoopTest extends PmdRuleTst { +class ForLoopShouldBeWhileLoopTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FormalParameterNamingConventionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FormalParameterNamingConventionsTest.java index 11ecb73e9a..16f76366c5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FormalParameterNamingConventionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/FormalParameterNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FormalParameterNamingConventionsTest extends PmdRuleTst { +class FormalParameterNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/GenericsNamingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/GenericsNamingTest.java index f7357c2542..1408b7f3f2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/GenericsNamingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/GenericsNamingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class GenericsNamingTest extends PmdRuleTst { +class GenericsNamingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesTest.java index da7244d121..9b306eb379 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IdenticalCatchBranchesTest extends PmdRuleTst { +class IdenticalCatchBranchesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LinguisticNamingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LinguisticNamingTest.java index 7858ef662a..2535e6a9a0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LinguisticNamingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LinguisticNamingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LinguisticNamingTest extends PmdRuleTst { +class LinguisticNamingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalHomeNamingConventionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalHomeNamingConventionTest.java index 11d40a1788..8f9adcc264 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalHomeNamingConventionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalHomeNamingConventionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LocalHomeNamingConventionTest extends PmdRuleTst { +class LocalHomeNamingConventionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalInterfaceSessionNamingConventionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalInterfaceSessionNamingConventionTest.java index be1832f299..ff39a550b0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalInterfaceSessionNamingConventionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalInterfaceSessionNamingConventionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LocalInterfaceSessionNamingConventionTest extends PmdRuleTst { +class LocalInterfaceSessionNamingConventionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalTest.java index d342b03ba9..610f44eecd 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableCouldBeFinalTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LocalVariableCouldBeFinalTest extends PmdRuleTst { +class LocalVariableCouldBeFinalTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableNamingConventionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableNamingConventionsTest.java index bee83930e8..103742c709 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableNamingConventionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LocalVariableNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LocalVariableNamingConventionsTest extends PmdRuleTst { +class LocalVariableNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LongVariableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LongVariableTest.java index 793af6fa63..f93806cc6a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LongVariableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/LongVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LongVariableTest extends PmdRuleTst { +class LongVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MDBAndSessionBeanNamingConventionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MDBAndSessionBeanNamingConventionTest.java index e12899a61d..5a9477e98e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MDBAndSessionBeanNamingConventionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MDBAndSessionBeanNamingConventionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MDBAndSessionBeanNamingConventionTest extends PmdRuleTst { +class MDBAndSessionBeanNamingConventionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodArgumentCouldBeFinalTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodArgumentCouldBeFinalTest.java index 66b362def9..589830413c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodArgumentCouldBeFinalTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodArgumentCouldBeFinalTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodArgumentCouldBeFinalTest extends PmdRuleTst { +class MethodArgumentCouldBeFinalTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsTest.java index c9f328d06f..eaa4fde1e9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/MethodNamingConventionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodNamingConventionsTest extends PmdRuleTst { +class MethodNamingConventionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/NoPackageTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/NoPackageTest.java index 54b1246e32..df3821dc03 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/NoPackageTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/NoPackageTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NoPackageTest extends PmdRuleTst { +class NoPackageTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/OnlyOneReturnTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/OnlyOneReturnTest.java index d656015f72..9cd086b1e5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/OnlyOneReturnTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/OnlyOneReturnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OnlyOneReturnTest extends PmdRuleTst { +class OnlyOneReturnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PackageCaseTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PackageCaseTest.java index 0b59065adb..cdd036a17d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PackageCaseTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PackageCaseTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class PackageCaseTest extends PmdRuleTst { +class PackageCaseTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PrematureDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PrematureDeclarationTest.java index c73a9f9781..16f56fc61a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PrematureDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/PrematureDeclarationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class PrematureDeclarationTest extends PmdRuleTst { +class PrematureDeclarationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteInterfaceNamingConventionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteInterfaceNamingConventionTest.java index 1d0c445aea..6985386725 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteInterfaceNamingConventionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteInterfaceNamingConventionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class RemoteInterfaceNamingConventionTest extends PmdRuleTst { +class RemoteInterfaceNamingConventionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteSessionInterfaceNamingConventionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteSessionInterfaceNamingConventionTest.java index 7e95cb5d1a..5e95b5525f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteSessionInterfaceNamingConventionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/RemoteSessionInterfaceNamingConventionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class RemoteSessionInterfaceNamingConventionTest extends PmdRuleTst { +class RemoteSessionInterfaceNamingConventionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortClassNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortClassNameTest.java index 1c4bdc49c6..c4ae1aff0d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortClassNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortClassNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ShortClassNameTest extends PmdRuleTst { +class ShortClassNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortMethodNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortMethodNameTest.java index 7133947372..9fab5587dc 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortMethodNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortMethodNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ShortMethodNameTest extends PmdRuleTst { +class ShortMethodNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortVariableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortVariableTest.java index 2d29ac3442..b178ba1bf7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortVariableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/ShortVariableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ShortVariableTest extends PmdRuleTst { +class ShortVariableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/TooManyStaticImportsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/TooManyStaticImportsTest.java index 43af1eac98..ae659dcfdc 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/TooManyStaticImportsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/TooManyStaticImportsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TooManyStaticImportsTest extends PmdRuleTst { +class TooManyStaticImportsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryAnnotationValueElementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryAnnotationValueElementTest.java index 1e41e5769d..75d06a7980 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryAnnotationValueElementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryAnnotationValueElementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryAnnotationValueElementTest extends PmdRuleTst { +class UnnecessaryAnnotationValueElementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryBoxingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryBoxingTest.java index 140e985a35..09e83074a5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryBoxingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryBoxingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryBoxingTest extends PmdRuleTst { +class UnnecessaryBoxingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryCastTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryCastTest.java index 992a7e91ac..b479fdfa98 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryCastTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryCastTest.java @@ -7,6 +7,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryCastTest extends PmdRuleTst { +class UnnecessaryCastTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConstructorTest.java index b2cf45becf..4e0c2bf4b7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConstructorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConstructorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryConstructorTest extends PmdRuleTst { +class UnnecessaryConstructorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameTest.java index c4670b7a95..b8edf924a3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryFullyQualifiedNameTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryFullyQualifiedNameTest extends PmdRuleTst { +class UnnecessaryFullyQualifiedNameTest extends PmdRuleTst { // Do not delete these two enums - it is needed for a test case // see: // /pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryFullyQualifiedName.xml diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportTest.java index 56472eb888..4cdbf50000 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryImportTest extends PmdRuleTst { +class UnnecessaryImportTest extends PmdRuleTst { // these 2 methods are used for a test case, do not delete public static void assertTrue(String message, boolean condition) { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryLocalBeforeReturnTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryLocalBeforeReturnTest.java index 73dc6cdac3..d6fe2b3a65 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryLocalBeforeReturnTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryLocalBeforeReturnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryLocalBeforeReturnTest extends PmdRuleTst { +class UnnecessaryLocalBeforeReturnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierTest.java index 09774b6a33..442d89734b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryModifierTest extends PmdRuleTst { +class UnnecessaryModifierTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnTest.java index 0a8d3c6bd6..de89b09b55 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryReturnTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryReturnTest extends PmdRuleTst { +class UnnecessaryReturnTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessarySemicolonTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessarySemicolonTest.java index ee7ece3fbd..6258d531d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessarySemicolonTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessarySemicolonTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessarySemicolonTest extends PmdRuleTst { +class UnnecessarySemicolonTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorTest.java index b502195246..fe6f6c19b4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseDiamondOperatorTest extends PmdRuleTst { +class UseDiamondOperatorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseShortArrayInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseShortArrayInitializerTest.java index be1a80e550..28959ae4c0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseShortArrayInitializerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseShortArrayInitializerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseShortArrayInitializerTest extends PmdRuleTst { +class UseShortArrayInitializerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseUnderscoresInNumericLiteralsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseUnderscoresInNumericLiteralsTest.java index ecaaba4bf3..df002dba91 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseUnderscoresInNumericLiteralsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseUnderscoresInNumericLiteralsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseUnderscoresInNumericLiteralsTest extends PmdRuleTst { +class UseUnderscoresInNumericLiteralsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessParenthesesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessParenthesesTest.java index 3e1bf44e0d..2ff2cb875e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessParenthesesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessParenthesesTest.java @@ -4,8 +4,11 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import org.junit.Test; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; import net.sourceforge.pmd.lang.java.JavaParsingHelper; @@ -14,7 +17,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTExpression; import net.sourceforge.pmd.lang.java.rule.codestyle.UselessParenthesesRule.Necessity; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UselessParenthesesTest extends PmdRuleTst { +class UselessParenthesesTest extends PmdRuleTst { Executable testImpl(String expression, Necessity necessity) { return () -> { @@ -23,11 +26,11 @@ public class UselessParenthesesTest extends PmdRuleTst { ASTExpression paren = acu.descendants(ASTExpression.class).crossFindBoundaries().first(ASTExpression::isParenthesized); - Assertions.assertNotNull(paren, "No parenthesized expression in " + expression); + assertNotNull(paren, "No parenthesized expression in " + expression); UselessParenthesesRule.Necessity result = UselessParenthesesRule.needsParentheses(paren, paren.getParent()); - Assertions.assertEquals(necessity, result, "In " + expression); + assertEquals(necessity, result, "In " + expression); }; } @@ -48,8 +51,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testOuterLambdas() { - Assertions.assertAll( + void testOuterLambdas() { + assertAll( unnecessary("() -> (a + b)"), unnecessary("() -> (() -> b)"), unnecessary("() -> (a ? b : c)"), // clarifying? @@ -58,8 +61,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testInnerLambda() { - Assertions.assertAll( + void testInnerLambda() { + assertAll( necessary("(() -> 1) + 2"), unnecessary("((() -> 1)) + 2"), necessary("(() -> 1) * 2"), @@ -69,10 +72,10 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testAssignments() { + void testAssignments() { // (a = b) = c (impossible) - Assertions.assertAll( + assertAll( necessary("a * (b = c)"), unnecessary("a * ((b = c))"), necessary("a ? (b = c) : d"), @@ -81,8 +84,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testConditionals() { - Assertions.assertAll( + void testConditionals() { + assertAll( unnecessary("a ? b : (c ? d : e)"), necessary("a ? (b ? c : d) : e"), @@ -95,10 +98,10 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testAdditiveMul() { + void testAdditiveMul() { // remember, a,b,c,d are ints // fp1,2,3 are floats - Assertions.assertAll( + assertAll( unnecessary("a + (b + c)"), unnecessary("a + (b - c)"), clarifying("a + (b * c)"), @@ -128,8 +131,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testMultiplicative() { - Assertions.assertAll( + void testMultiplicative() { + assertAll( unnecessary("(a * b) * c"), unnecessary("a * (b * c)"), @@ -146,8 +149,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testConcatenation() { - Assertions.assertAll( + void testConcatenation() { + assertAll( necessary("\"\" + (1 + 4)"), unnecessary("\"\" + (\"\" + 4)"), unnecessary("\"\" + (4 + \"\")"), @@ -156,8 +159,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testEquality() { - Assertions.assertAll( + void testEquality() { + assertAll( necessary("a == null == (b == null)"), unnecessary("a == null == ((b == null))"), balancing("(a == null) == (b == null)"), @@ -171,8 +174,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testRelational() { - Assertions.assertAll( + void testRelational() { + assertAll( clarifying("a <= b == (b <= c)"), clarifying("(a <= b) == (b <= c)"), necessary("(a == b) >= 0"), @@ -181,8 +184,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testUnaries() { - Assertions.assertAll( + void testUnaries() { + assertAll( unnecessary("(String) ((String) c)"), unnecessary("(String) (+1)"), unnecessary("a + +((char) 1)"), @@ -198,8 +201,8 @@ public class UselessParenthesesTest extends PmdRuleTst { } @Test - public void testSwitches() { - Assertions.assertAll( + void testSwitches() { + assertAll( unnecessary(" a + (switch (1) { })"), unnecessary("(switch (1) { }) + 1") ); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessQualifiedThisTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessQualifiedThisTest.java index 19f7b4bf6e..d4c28d5193 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessQualifiedThisTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UselessQualifiedThisTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UselessQualifiedThisTest extends PmdRuleTst { +class UselessQualifiedThisTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AbstractClassWithoutAnyMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AbstractClassWithoutAnyMethodTest.java index a75049eb19..2707edc916 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AbstractClassWithoutAnyMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AbstractClassWithoutAnyMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AbstractClassWithoutAnyMethodTest extends PmdRuleTst { +class AbstractClassWithoutAnyMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java index f299c962c9..9014238a7b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidCatchingGenericExceptionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidCatchingGenericExceptionTest extends PmdRuleTst { +class AvoidCatchingGenericExceptionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsTest.java index cb42425327..ffeb2eff0b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDeeplyNestedIfStmtsTest extends PmdRuleTst { +class AvoidDeeplyNestedIfStmtsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidRethrowingExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidRethrowingExceptionTest.java index b5b96015f7..8b4946aba8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidRethrowingExceptionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidRethrowingExceptionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidRethrowingExceptionTest extends PmdRuleTst { +class AvoidRethrowingExceptionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNewInstanceOfSameExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNewInstanceOfSameExceptionTest.java index 042bcfdbf6..80992fa8b8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNewInstanceOfSameExceptionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNewInstanceOfSameExceptionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidThrowingNewInstanceOfSameExceptionTest extends PmdRuleTst { +class AvoidThrowingNewInstanceOfSameExceptionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNullPointerExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNullPointerExceptionTest.java index 399add80fe..47eace4526 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNullPointerExceptionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingNullPointerExceptionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidThrowingNullPointerExceptionTest extends PmdRuleTst { +class AvoidThrowingNullPointerExceptionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java index e9370037f6..be27cc8e00 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidThrowingRawExceptionTypesTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidThrowingRawExceptionTypesTest extends PmdRuleTst { +class AvoidThrowingRawExceptionTypesTest extends PmdRuleTst { public static class Throwable extends java.lang.Throwable { private static final long serialVersionUID = 1798165250043760600L; } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidUncheckedExceptionsInSignaturesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidUncheckedExceptionsInSignaturesTest.java index 62c9c4e7e8..0a18773aa2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidUncheckedExceptionsInSignaturesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/AvoidUncheckedExceptionsInSignaturesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidUncheckedExceptionsInSignaturesTest extends PmdRuleTst { +class AvoidUncheckedExceptionsInSignaturesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ClassWithOnlyPrivateConstructorsShouldBeFinalTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ClassWithOnlyPrivateConstructorsShouldBeFinalTest.java index 1687261131..5310503f78 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ClassWithOnlyPrivateConstructorsShouldBeFinalTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ClassWithOnlyPrivateConstructorsShouldBeFinalTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ClassWithOnlyPrivateConstructorsShouldBeFinalTest extends PmdRuleTst { +class ClassWithOnlyPrivateConstructorsShouldBeFinalTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityTest.java index eec415b485..c6c2edcebc 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CognitiveComplexityTest extends PmdRuleTst { +class CognitiveComplexityTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CollapsibleIfStatementsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CollapsibleIfStatementsTest.java index f348216869..3f13ce5287 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CollapsibleIfStatementsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CollapsibleIfStatementsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CollapsibleIfStatementsTest extends PmdRuleTst { +class CollapsibleIfStatementsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CouplingBetweenObjectsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CouplingBetweenObjectsTest.java index bb0fc00c9e..7c2948ec32 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CouplingBetweenObjectsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CouplingBetweenObjectsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CouplingBetweenObjectsTest extends PmdRuleTst { +class CouplingBetweenObjectsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityTest.java index 0555622065..df859e7e08 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CyclomaticComplexityTest extends PmdRuleTst { +class CyclomaticComplexityTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DataClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DataClassTest.java index 044eb74458..af2152f439 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DataClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DataClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DataClassTest extends PmdRuleTst { +class DataClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DoNotExtendJavaLangErrorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DoNotExtendJavaLangErrorTest.java index 3d2ba33f80..e5d9b7b301 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DoNotExtendJavaLangErrorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/DoNotExtendJavaLangErrorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotExtendJavaLangErrorTest extends PmdRuleTst { +class DoNotExtendJavaLangErrorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExceptionAsFlowControlTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExceptionAsFlowControlTest.java index c99bb7fca3..292fde945d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExceptionAsFlowControlTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExceptionAsFlowControlTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExceptionAsFlowControlTest extends PmdRuleTst { +class ExceptionAsFlowControlTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveClassLengthTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveClassLengthTest.java index d2a63dea3b..b79296d47e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveClassLengthTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveClassLengthTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveClassLengthTest extends PmdRuleTst { +class ExcessiveClassLengthTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsTest.java index 437c46ab38..74fd72a16c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveImportsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveImportsTest extends PmdRuleTst { +class ExcessiveImportsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveMethodLengthTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveMethodLengthTest.java index 75dc63b795..bdfac0685d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveMethodLengthTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveMethodLengthTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveMethodLengthTest extends PmdRuleTst { +class ExcessiveMethodLengthTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListTest.java index 4903e4d782..6308b1fe4f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessiveParameterListTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessiveParameterListTest extends PmdRuleTst { +class ExcessiveParameterListTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountTest.java index 9477056414..760e4807fe 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ExcessivePublicCountTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ExcessivePublicCountTest extends PmdRuleTst { +class ExcessivePublicCountTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/FinalFieldCouldBeStaticTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/FinalFieldCouldBeStaticTest.java index 1b2bf96d7c..cf9d950639 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/FinalFieldCouldBeStaticTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/FinalFieldCouldBeStaticTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalFieldCouldBeStaticTest extends PmdRuleTst { +class FinalFieldCouldBeStaticTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/GodClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/GodClassTest.java index 6dbff09d61..dd69734923 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/GodClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/GodClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class GodClassTest extends PmdRuleTst { +class GodClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldTest.java index fddff3df9c..b974fad282 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/ImmutableFieldTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ImmutableFieldTest extends PmdRuleTst { +class ImmutableFieldTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterTest.java index bd57f84d34..99e77ad459 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LawOfDemeterTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LawOfDemeterTest extends PmdRuleTst { +class LawOfDemeterTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LogicInversionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LogicInversionTest.java index 38959833e5..3a4cb92739 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LogicInversionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LogicInversionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LogicInversionTest extends PmdRuleTst { +class LogicInversionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LoosePackageCouplingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LoosePackageCouplingTest.java index e587f4ba1c..00e0b010c9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LoosePackageCouplingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/LoosePackageCouplingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class LoosePackageCouplingTest extends PmdRuleTst { +class LoosePackageCouplingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticStateTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticStateTest.java index 27ba41ea2f..cb5e29d512 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticStateTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/MutableStaticStateTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MutableStaticStateTest extends PmdRuleTst { +class MutableStaticStateTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityTest.java index 085c1be123..98ddc7cae6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NPathComplexityTest extends PmdRuleTst { +class NPathComplexityTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountTest.java index a9d4359f97..48e984d9ad 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NcssCountTest extends PmdRuleTst { +class NcssCountTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SignatureDeclareThrowsExceptionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SignatureDeclareThrowsExceptionTest.java index f76054932a..d44e58ec86 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SignatureDeclareThrowsExceptionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SignatureDeclareThrowsExceptionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SignatureDeclareThrowsExceptionTest extends PmdRuleTst { +class SignatureDeclareThrowsExceptionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifiedTernaryTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifiedTernaryTest.java index c381684027..3f2a8a5daf 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifiedTernaryTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifiedTernaryTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimplifiedTernaryTest extends PmdRuleTst { +class SimplifiedTernaryTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanExpressionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanExpressionsTest.java index ef90b6a888..0b1a4bc204 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanExpressionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanExpressionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimplifyBooleanExpressionsTest extends PmdRuleTst { +class SimplifyBooleanExpressionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsTest.java index 487cc554e4..ab631f2194 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyBooleanReturnsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimplifyBooleanReturnsTest extends PmdRuleTst { +class SimplifyBooleanReturnsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyConditionalTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyConditionalTest.java index 927ae8d8f8..47400d35cf 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyConditionalTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SimplifyConditionalTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimplifyConditionalTest extends PmdRuleTst { +class SimplifyConditionalTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldTest.java index 98d36df544..95fd5ff04c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SingularFieldTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SingularFieldTest extends PmdRuleTst { +class SingularFieldTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityTest.java index 0da92cecac..588ab69e8d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/SwitchDensityTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SwitchDensityTest extends PmdRuleTst { +class SwitchDensityTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyFieldsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyFieldsTest.java index 12cad4bac7..05933e2507 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyFieldsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyFieldsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TooManyFieldsTest extends PmdRuleTst { +class TooManyFieldsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyMethodsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyMethodsTest.java index c81262b265..122519449a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyMethodsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/TooManyMethodsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TooManyMethodsTest extends PmdRuleTst { +class TooManyMethodsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseObjectForClearerAPITest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseObjectForClearerAPITest.java index 1cabaee839..9a397a435a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseObjectForClearerAPITest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseObjectForClearerAPITest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseObjectForClearerAPITest extends PmdRuleTst { +class UseObjectForClearerAPITest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassTest.java index 36e7942a09..41ff6bd799 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UseUtilityClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseUtilityClassTest extends PmdRuleTst { +class UseUtilityClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodTest.java index 47bc719839..85ff3df3d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/UselessOverridingMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.design; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UselessOverridingMethodTest extends PmdRuleTst { +class UselessOverridingMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java index 958a205874..322a64200a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentContentTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.documentation; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CommentContentTest extends PmdRuleTst { +class CommentContentTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java index 6db9cae9b1..9a4286f897 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentRequiredTest.java @@ -4,23 +4,23 @@ package net.sourceforge.pmd.lang.java.rule.documentation; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CommentRequiredTest extends PmdRuleTst { +class CommentRequiredTest extends PmdRuleTst { @Test - public void allCommentTypesIgnored() { + void allCommentTypesIgnored() { CommentRequiredRule rule = new CommentRequiredRule(); - assertNull("By default, the rule should be functional", rule.dysfunctionReason()); + assertNull(rule.dysfunctionReason(), "By default, the rule should be functional"); List> propertyDescriptors = getProperties(rule); // remove deprecated properties @@ -30,13 +30,13 @@ public class CommentRequiredTest extends PmdRuleTst { setPropertyValue(rule, property, "Ignored"); } - assertNotNull("All properties are ignored, rule should be dysfunctional", rule.dysfunctionReason()); + assertNotNull(rule.dysfunctionReason(), "All properties are ignored, rule should be dysfunctional"); // now, try out combinations: only one of the properties is required. for (PropertyDescriptor property : propertyDescriptors) { setPropertyValue(rule, property, "Required"); - assertNull("The property " + property.name() + " is set to required, the rule should be functional.", - rule.dysfunctionReason()); + assertNull(rule.dysfunctionReason(), + "The property " + property.name() + " is set to required, the rule should be functional."); setPropertyValue(rule, property, "Ignored"); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java index 51a404bcda..5d4e204836 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/CommentSizeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.documentation; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CommentSizeTest extends PmdRuleTst { +class CommentSizeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java index c8753d83bd..0bb603709c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyConstructorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.documentation; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UncommentedEmptyConstructorTest extends PmdRuleTst { +class UncommentedEmptyConstructorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java index f0d9ae47db..8c2095d737 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/documentation/UncommentedEmptyMethodBodyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.documentation; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UncommentedEmptyMethodBodyTest extends PmdRuleTst { +class UncommentedEmptyMethodBodyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentInOperandTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentInOperandTest.java index 3432ef4411..4edf718a2d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentInOperandTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentInOperandTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AssignmentInOperandTest extends PmdRuleTst { +class AssignmentInOperandTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticTest.java index 3c1ee83e89..4813dfffbc 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AssignmentToNonFinalStaticTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AssignmentToNonFinalStaticTest extends PmdRuleTst { +class AssignmentToNonFinalStaticTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAccessibilityAlterationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAccessibilityAlterationTest.java index cd5c41a995..03bde11b12 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAccessibilityAlterationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAccessibilityAlterationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidAccessibilityAlterationTest extends PmdRuleTst { +class AvoidAccessibilityAlterationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAssertAsIdentifierTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAssertAsIdentifierTest.java index 8f1d8d151d..886c08b67d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAssertAsIdentifierTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidAssertAsIdentifierTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidAssertAsIdentifierTest extends PmdRuleTst { +class AvoidAssertAsIdentifierTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidBranchingStatementAsLastInLoopTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidBranchingStatementAsLastInLoopTest.java index 3628a5de05..191b68987d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidBranchingStatementAsLastInLoopTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidBranchingStatementAsLastInLoopTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidBranchingStatementAsLastInLoopTest extends PmdRuleTst { +class AvoidBranchingStatementAsLastInLoopTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeTest.java index a7e3a8e9e7..246bce0db7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCallingFinalizeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidCallingFinalizeTest extends PmdRuleTst { +class AvoidCallingFinalizeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingNPETest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingNPETest.java index 18892011f0..006cc3d84e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingNPETest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingNPETest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidCatchingNPETest extends PmdRuleTst { +class AvoidCatchingNPETest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingThrowableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingThrowableTest.java index f05ef97555..c11ea40e2a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingThrowableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidCatchingThrowableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidCatchingThrowableTest extends PmdRuleTst { +class AvoidCatchingThrowableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDecimalLiteralsInBigDecimalConstructorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDecimalLiteralsInBigDecimalConstructorTest.java index 81d14c3042..267bb84ab9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDecimalLiteralsInBigDecimalConstructorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDecimalLiteralsInBigDecimalConstructorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDecimalLiteralsInBigDecimalConstructorTest extends PmdRuleTst { +class AvoidDecimalLiteralsInBigDecimalConstructorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsTest.java index 3b760e474c..d2f660a2e9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidDuplicateLiteralsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidDuplicateLiteralsTest extends PmdRuleTst { +class AvoidDuplicateLiteralsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidEnumAsIdentifierTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidEnumAsIdentifierTest.java index 0c936de878..be57423730 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidEnumAsIdentifierTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidEnumAsIdentifierTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidEnumAsIdentifierTest extends PmdRuleTst { +class AvoidEnumAsIdentifierTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingMethodNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingMethodNameTest.java index e6d75f353b..f8486d435e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingMethodNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingMethodNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidFieldNameMatchingMethodNameTest extends PmdRuleTst { +class AvoidFieldNameMatchingMethodNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameTest.java index a76a447653..3edcfcf304 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingTypeNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidFieldNameMatchingTypeNameTest extends PmdRuleTst { +class AvoidFieldNameMatchingTypeNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidInstanceofChecksInCatchClauseTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidInstanceofChecksInCatchClauseTest.java index 6742ca059f..68b781f08a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidInstanceofChecksInCatchClauseTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidInstanceofChecksInCatchClauseTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidInstanceofChecksInCatchClauseTest extends PmdRuleTst { +class AvoidInstanceofChecksInCatchClauseTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLiteralsInIfConditionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLiteralsInIfConditionTest.java index 7621018942..802b8dca59 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLiteralsInIfConditionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLiteralsInIfConditionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidLiteralsInIfConditionTest extends PmdRuleTst { +class AvoidLiteralsInIfConditionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLosingExceptionInformationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLosingExceptionInformationTest.java index 33f4635cd1..d31247dec4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLosingExceptionInformationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidLosingExceptionInformationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidLosingExceptionInformationTest extends PmdRuleTst { +class AvoidLosingExceptionInformationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidMultipleUnaryOperatorsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidMultipleUnaryOperatorsTest.java index 5ac541e089..68121b5dc5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidMultipleUnaryOperatorsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidMultipleUnaryOperatorsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidMultipleUnaryOperatorsTest extends PmdRuleTst { +class AvoidMultipleUnaryOperatorsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesTest.java index cf4f8736bd..968d7ca76b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidUsingOctalValuesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidUsingOctalValuesTest extends PmdRuleTst { +class AvoidUsingOctalValuesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BeanMembersShouldSerializeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BeanMembersShouldSerializeTest.java index 4d20fca51f..3fa7eadc92 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BeanMembersShouldSerializeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BeanMembersShouldSerializeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class BeanMembersShouldSerializeTest extends PmdRuleTst { +class BeanMembersShouldSerializeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BrokenNullCheckTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BrokenNullCheckTest.java index e4bc49884c..2b1ba4ff7e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BrokenNullCheckTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/BrokenNullCheckTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class BrokenNullCheckTest extends PmdRuleTst { +class BrokenNullCheckTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperFirstTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperFirstTest.java index 058ba5c874..311a13ff74 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperFirstTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperFirstTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CallSuperFirstTest extends PmdRuleTst { +class CallSuperFirstTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperLastTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperLastTest.java index fce7b26219..a368b2bc75 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperLastTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CallSuperLastTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CallSuperLastTest extends PmdRuleTst { +class CallSuperLastTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CheckSkipResultTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CheckSkipResultTest.java index 03ff885411..55bb58982b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CheckSkipResultTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CheckSkipResultTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CheckSkipResultTest extends PmdRuleTst { +class CheckSkipResultTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ClassCastExceptionWithToArrayTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ClassCastExceptionWithToArrayTest.java index cbc7d41463..dfd5d2066f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ClassCastExceptionWithToArrayTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ClassCastExceptionWithToArrayTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ClassCastExceptionWithToArrayTest extends PmdRuleTst { +class ClassCastExceptionWithToArrayTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustBePublicTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustBePublicTest.java index 3a929d920e..2a96cb6855 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustBePublicTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustBePublicTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CloneMethodMustBePublicTest extends PmdRuleTst { +class CloneMethodMustBePublicTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustImplementCloneableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustImplementCloneableTest.java index f1f5744870..9aef788c64 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustImplementCloneableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodMustImplementCloneableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CloneMethodMustImplementCloneableTest extends PmdRuleTst { +class CloneMethodMustImplementCloneableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodReturnTypeMustMatchClassNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodReturnTypeMustMatchClassNameTest.java index 3ce9336297..717ac81df4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodReturnTypeMustMatchClassNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloneMethodReturnTypeMustMatchClassNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CloneMethodReturnTypeMustMatchClassNameTest extends PmdRuleTst { +class CloneMethodReturnTypeMustMatchClassNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceTest.java index a20781ae9c..bdbf15e7c2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CloseResourceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CloseResourceTest extends PmdRuleTst { +class CloseResourceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsTest.java index 46b5b9b837..05acb24255 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/CompareObjectsWithEqualsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class CompareObjectsWithEqualsTest extends PmdRuleTst { +class CompareObjectsWithEqualsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ComparisonWithNaNTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ComparisonWithNaNTest.java index bb84ab84e1..723d440e4c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ComparisonWithNaNTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ComparisonWithNaNTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ComparisonWithNaNTest extends PmdRuleTst { +class ComparisonWithNaNTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodTest.java index d42e18a2d5..2440994922 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ConstructorCallsOverridableMethodTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConstructorCallsOverridableMethodTest extends PmdRuleTst { +class ConstructorCallsOverridableMethodTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DetachedTestCaseTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DetachedTestCaseTest.java index 78991bfcb0..74a15e36ae 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DetachedTestCaseTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DetachedTestCaseTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DetachedTestCaseTest extends PmdRuleTst { +class DetachedTestCaseTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotCallGarbageCollectionExplicitlyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotCallGarbageCollectionExplicitlyTest.java index 3d3b63a54a..4796425f69 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotCallGarbageCollectionExplicitlyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotCallGarbageCollectionExplicitlyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotCallGarbageCollectionExplicitlyTest extends PmdRuleTst { +class DoNotCallGarbageCollectionExplicitlyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotExtendJavaLangThrowableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotExtendJavaLangThrowableTest.java index 23762dabfb..7e5494958d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotExtendJavaLangThrowableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotExtendJavaLangThrowableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotExtendJavaLangThrowableTest extends PmdRuleTst { +class DoNotExtendJavaLangThrowableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotHardCodeSDCardTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotHardCodeSDCardTest.java index e312edcf43..dd4a99f308 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotHardCodeSDCardTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotHardCodeSDCardTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotHardCodeSDCardTest extends PmdRuleTst { +class DoNotHardCodeSDCardTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotTerminateVMTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotTerminateVMTest.java index 2c6aa0f631..f6cc3a8bb1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotTerminateVMTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotTerminateVMTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotTerminateVMTest extends PmdRuleTst { +class DoNotTerminateVMTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java index 1fdda55c42..aed669dc83 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DoNotThrowExceptionInFinallyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotThrowExceptionInFinallyTest extends PmdRuleTst { +class DoNotThrowExceptionInFinallyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunTest.java index b0951490c6..1498a6db2a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontImportSunTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DontImportSunTest extends PmdRuleTst { +class DontImportSunTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontUseFloatTypeForLoopIndicesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontUseFloatTypeForLoopIndicesTest.java index bff2a2c3f3..eedf01e2d5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontUseFloatTypeForLoopIndicesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/DontUseFloatTypeForLoopIndicesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DontUseFloatTypeForLoopIndicesTest extends PmdRuleTst { +class DontUseFloatTypeForLoopIndicesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyCatchBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyCatchBlockTest.java index 53e61e8226..a953c3e013 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyCatchBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyCatchBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyCatchBlockTest extends PmdRuleTst { +class EmptyCatchBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinalizerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinalizerTest.java index bb81c264a3..6f7cd4674f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinalizerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinalizerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyFinalizerTest extends PmdRuleTst { +class EmptyFinalizerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinallyBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinallyBlockTest.java index f076b33017..6cfca7ffa6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinallyBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyFinallyBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyFinallyBlockTest extends PmdRuleTst { +class EmptyFinallyBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyIfStmtTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyIfStmtTest.java index bf2bff63cf..d5fbea4315 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyIfStmtTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyIfStmtTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyIfStmtTest extends PmdRuleTst { +class EmptyIfStmtTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyInitializerTest.java index 32d1abfab9..a1e650db8b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyInitializerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyInitializerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyInitializerTest extends PmdRuleTst { +class EmptyInitializerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementBlockTest.java index 2d49e087d9..76393a54b3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyStatementBlockTest extends PmdRuleTst { +class EmptyStatementBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementNotInLoopTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementNotInLoopTest.java index fe4d05a8e8..395a1b3706 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementNotInLoopTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyStatementNotInLoopTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyStatementNotInLoopTest extends PmdRuleTst { +class EmptyStatementNotInLoopTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySwitchStatementsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySwitchStatementsTest.java index edf5cd3362..7dbb9192ab 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySwitchStatementsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySwitchStatementsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptySwitchStatementsTest extends PmdRuleTst { +class EmptySwitchStatementsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySynchronizedBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySynchronizedBlockTest.java index a66b28d808..76d8adb6a8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySynchronizedBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptySynchronizedBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptySynchronizedBlockTest extends PmdRuleTst { +class EmptySynchronizedBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyTryBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyTryBlockTest.java index 3c6e1330b6..84069fc658 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyTryBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyTryBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyTryBlockTest extends PmdRuleTst { +class EmptyTryBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyWhileStmtTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyWhileStmtTest.java index d370081916..d8a9692b1b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyWhileStmtTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EmptyWhileStmtTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EmptyWhileStmtTest extends PmdRuleTst { +class EmptyWhileStmtTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EqualsNullTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EqualsNullTest.java index e869a5d609..fc903ce4bb 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EqualsNullTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/EqualsNullTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class EqualsNullTest extends PmdRuleTst { +class EqualsNullTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeDoesNotCallSuperFinalizeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeDoesNotCallSuperFinalizeTest.java index 97017d2b87..a8de36f386 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeDoesNotCallSuperFinalizeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeDoesNotCallSuperFinalizeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalizeDoesNotCallSuperFinalizeTest extends PmdRuleTst { +class FinalizeDoesNotCallSuperFinalizeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOnlyCallsSuperFinalizeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOnlyCallsSuperFinalizeTest.java index af0ab11739..f94cb50b83 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOnlyCallsSuperFinalizeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOnlyCallsSuperFinalizeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalizeOnlyCallsSuperFinalizeTest extends PmdRuleTst { +class FinalizeOnlyCallsSuperFinalizeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOverloadedTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOverloadedTest.java index e123e98a1c..9df63b451b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOverloadedTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeOverloadedTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalizeOverloadedTest extends PmdRuleTst { +class FinalizeOverloadedTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeShouldBeProtectedTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeShouldBeProtectedTest.java index 73b0ee58fc..ddc8e610b3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeShouldBeProtectedTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/FinalizeShouldBeProtectedTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class FinalizeShouldBeProtectedTest extends PmdRuleTst { +class FinalizeShouldBeProtectedTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/IdempotentOperationsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/IdempotentOperationsTest.java index 6b29749f2f..b636426e8d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/IdempotentOperationsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/IdempotentOperationsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class IdempotentOperationsTest extends PmdRuleTst { +class IdempotentOperationsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImplicitSwitchFallThroughTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImplicitSwitchFallThroughTest.java index f7bf9c8ab3..99ad4868f7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImplicitSwitchFallThroughTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ImplicitSwitchFallThroughTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ImplicitSwitchFallThroughTest extends PmdRuleTst { +class ImplicitSwitchFallThroughTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InstantiationToGetClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InstantiationToGetClassTest.java index f27f820f6f..c85239d5ea 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InstantiationToGetClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InstantiationToGetClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InstantiationToGetClassTest extends PmdRuleTst { +class InstantiationToGetClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InvalidLogMessageFormatTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InvalidLogMessageFormatTest.java index d0fed80464..7e9abea98c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InvalidLogMessageFormatTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/InvalidLogMessageFormatTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InvalidLogMessageFormatTest extends PmdRuleTst { +class InvalidLogMessageFormatTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitSpellingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitSpellingTest.java index 209d3bb488..047f7313e3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitSpellingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitSpellingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitSpellingTest extends PmdRuleTst { +class JUnitSpellingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitStaticSuiteTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitStaticSuiteTest.java index 67b9a62bb5..6d7a5b846d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitStaticSuiteTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JUnitStaticSuiteTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JUnitStaticSuiteTest extends PmdRuleTst { +class JUnitStaticSuiteTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JumbledIncrementerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JumbledIncrementerTest.java index 90f349f243..db5032bbfa 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JumbledIncrementerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/JumbledIncrementerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class JumbledIncrementerTest extends PmdRuleTst { +class JumbledIncrementerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java index c4060f965c..386383efd1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MethodWithSameNameAsEnclosingClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MethodWithSameNameAsEnclosingClassTest extends PmdRuleTst { +class MethodWithSameNameAsEnclosingClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MisplacedNullCheckTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MisplacedNullCheckTest.java index 371de4f655..ca68722bec 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MisplacedNullCheckTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MisplacedNullCheckTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MisplacedNullCheckTest extends PmdRuleTst { +class MisplacedNullCheckTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingSerialVersionUIDTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingSerialVersionUIDTest.java index b2437fbaf8..a7358da129 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingSerialVersionUIDTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingSerialVersionUIDTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MissingSerialVersionUIDTest extends PmdRuleTst { +class MissingSerialVersionUIDTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingStaticMethodInNonInstantiatableClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingStaticMethodInNonInstantiatableClassTest.java index f3978f3429..5cf642ed8e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingStaticMethodInNonInstantiatableClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MissingStaticMethodInNonInstantiatableClassTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MissingStaticMethodInNonInstantiatableClassTest extends PmdRuleTst { +class MissingStaticMethodInNonInstantiatableClassTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerTest.java index 2e970f3641..f1deb552a7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class MoreThanOneLoggerTest extends PmdRuleTst { +class MoreThanOneLoggerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonCaseLabelInSwitchStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonCaseLabelInSwitchStatementTest.java index ab4a88a5d8..d19b90912d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonCaseLabelInSwitchStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonCaseLabelInSwitchStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NonCaseLabelInSwitchStatementTest extends PmdRuleTst { +class NonCaseLabelInSwitchStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonStaticInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonStaticInitializerTest.java index f009ce5ab2..543bd5d56c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonStaticInitializerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonStaticInitializerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NonStaticInitializerTest extends PmdRuleTst { +class NonStaticInitializerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NullAssignmentTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NullAssignmentTest.java index 3a65b157f2..84845a7d57 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NullAssignmentTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NullAssignmentTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NullAssignmentTest extends PmdRuleTst { +class NullAssignmentTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java index 32d88b23b1..bed7dd18c3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst { +class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperCloneImplementationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperCloneImplementationTest.java index dc40b33138..caf7485fac 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperCloneImplementationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperCloneImplementationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ProperCloneImplementationTest extends PmdRuleTst { +class ProperCloneImplementationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperLoggerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperLoggerTest.java index 18f13af50b..e301881e75 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperLoggerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ProperLoggerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ProperLoggerTest extends PmdRuleTst { +class ProperLoggerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnEmptyCollectionRatherThanNullTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnEmptyCollectionRatherThanNullTest.java index 3dde294114..88dc7a7593 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnEmptyCollectionRatherThanNullTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnEmptyCollectionRatherThanNullTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ReturnEmptyCollectionRatherThanNullTest extends PmdRuleTst { +class ReturnEmptyCollectionRatherThanNullTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnFromFinallyBlockTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnFromFinallyBlockTest.java index 5945a9133f..3a53638de2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnFromFinallyBlockTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/ReturnFromFinallyBlockTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ReturnFromFinallyBlockTest extends PmdRuleTst { +class ReturnFromFinallyBlockTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SimpleDateFormatNeedsLocaleTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SimpleDateFormatNeedsLocaleTest.java index 6a8c7b0c7e..efe247e0c8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SimpleDateFormatNeedsLocaleTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SimpleDateFormatNeedsLocaleTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SimpleDateFormatNeedsLocaleTest extends PmdRuleTst { +class SimpleDateFormatNeedsLocaleTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonTest.java index 067a517f94..ff818721ae 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingleMethodSingletonTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SingleMethodSingletonTest extends PmdRuleTst { +class SingleMethodSingletonTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingletonClassReturningNewInstanceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingletonClassReturningNewInstanceTest.java index ca957ed18f..838a2b4cd6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingletonClassReturningNewInstanceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SingletonClassReturningNewInstanceTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SingletonClassReturningNewInstanceTest extends PmdRuleTst { +class SingletonClassReturningNewInstanceTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StaticEJBFieldShouldBeFinalTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StaticEJBFieldShouldBeFinalTest.java index af2f8fcdf2..cfabdd6c67 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StaticEJBFieldShouldBeFinalTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StaticEJBFieldShouldBeFinalTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class StaticEJBFieldShouldBeFinalTest extends PmdRuleTst { +class StaticEJBFieldShouldBeFinalTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StringBufferInstantiationWithCharTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StringBufferInstantiationWithCharTest.java index f4e819b328..60250e0167 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StringBufferInstantiationWithCharTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/StringBufferInstantiationWithCharTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class StringBufferInstantiationWithCharTest extends PmdRuleTst { +class StringBufferInstantiationWithCharTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousEqualsMethodNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousEqualsMethodNameTest.java index 7787ade01b..9536facef4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousEqualsMethodNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousEqualsMethodNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SuspiciousEqualsMethodNameTest extends PmdRuleTst { +class SuspiciousEqualsMethodNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameTest.java index 28d3edba4e..9d234b5800 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousHashcodeMethodNameTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SuspiciousHashcodeMethodNameTest extends PmdRuleTst { +class SuspiciousHashcodeMethodNameTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousOctalEscapeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousOctalEscapeTest.java index c5549023aa..36a97b83ba 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousOctalEscapeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/SuspiciousOctalEscapeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class SuspiciousOctalEscapeTest extends PmdRuleTst { +class SuspiciousOctalEscapeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/TestClassWithoutTestCasesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/TestClassWithoutTestCasesTest.java index c901a75521..39f0f4fc47 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/TestClassWithoutTestCasesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/TestClassWithoutTestCasesTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TestClassWithoutTestCasesTest extends PmdRuleTst { +class TestClassWithoutTestCasesTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnconditionalIfStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnconditionalIfStatementTest.java index 6af4a7f8e3..e9fb6da5a1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnconditionalIfStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnconditionalIfStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnconditionalIfStatementTest extends PmdRuleTst { +class UnconditionalIfStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryBooleanAssertionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryBooleanAssertionTest.java index 2b343d5134..e652838fc1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryBooleanAssertionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryBooleanAssertionTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryBooleanAssertionTest extends PmdRuleTst { +class UnnecessaryBooleanAssertionTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeTest.java index 4cbb6ea7e3..c2e0d37c4c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryCaseChangeTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryCaseChangeTest extends PmdRuleTst { +class UnnecessaryCaseChangeTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryTest.java index aa375ea104..4a08348e6b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnnecessaryConversionTemporaryTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnnecessaryConversionTemporaryTest extends PmdRuleTst { +class UnnecessaryConversionTemporaryTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnusedNullCheckInEqualsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnusedNullCheckInEqualsTest.java index 0d5020056d..eaea9ff7e5 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnusedNullCheckInEqualsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UnusedNullCheckInEqualsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnusedNullCheckInEqualsTest extends PmdRuleTst { +class UnusedNullCheckInEqualsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseCorrectExceptionLoggingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseCorrectExceptionLoggingTest.java index f6efc45715..8c735a1623 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseCorrectExceptionLoggingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseCorrectExceptionLoggingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseCorrectExceptionLoggingTest extends PmdRuleTst { +class UseCorrectExceptionLoggingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseEqualsToCompareStringsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseEqualsToCompareStringsTest.java index 903c0d420d..cca09e5922 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseEqualsToCompareStringsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseEqualsToCompareStringsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseEqualsToCompareStringsTest extends PmdRuleTst { +class UseEqualsToCompareStringsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseLocaleWithCaseConversionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseLocaleWithCaseConversionsTest.java index 7c0403ba8d..7c000a37b2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseLocaleWithCaseConversionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseLocaleWithCaseConversionsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseLocaleWithCaseConversionsTest extends PmdRuleTst { +class UseLocaleWithCaseConversionsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseProperClassLoaderTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseProperClassLoaderTest.java index ede7271289..7c968906b3 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseProperClassLoaderTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UseProperClassLoaderTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseProperClassLoaderTest extends PmdRuleTst { +class UseProperClassLoaderTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UselessOperationOnImmutableTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UselessOperationOnImmutableTest.java index 54012b3130..cee396363f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UselessOperationOnImmutableTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/UselessOperationOnImmutableTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UselessOperationOnImmutableTest extends PmdRuleTst { +class UselessOperationOnImmutableTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/JavaRuleUtilTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/JavaRuleUtilTest.java index be99b14c6a..43df20864c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/JavaRuleUtilTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/internal/JavaRuleUtilTest.java @@ -10,14 +10,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; -public class JavaRuleUtilTest extends BaseParserTest { +class JavaRuleUtilTest extends BaseParserTest { @Test - public void testCamelCaseWords() { + void testCamelCaseWords() { assertFalse(startsWithCamelCaseWord("getter", "get"), "no word boundary"); assertFalse(startsWithCamelCaseWord("get", "get"), "no following word"); assertTrue(startsWithCamelCaseWord("getX", "get"), "ok prefix"); @@ -28,7 +28,7 @@ public class JavaRuleUtilTest extends BaseParserTest { } @Test - public void testContainsCamelCaseWords() { + void testContainsCamelCaseWords() { assertFalse(containsCamelCaseWord("isABoolean", "Bool"), "no word boundary"); assertTrue(containsCamelCaseWord("isABoolean", "A"), "ok word in the middle"); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidSynchronizedAtMethodLevelTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidSynchronizedAtMethodLevelTest.java index 5c1793c6d8..5552da8928 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidSynchronizedAtMethodLevelTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidSynchronizedAtMethodLevelTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidSynchronizedAtMethodLevelTest extends PmdRuleTst { +class AvoidSynchronizedAtMethodLevelTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidThreadGroupTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidThreadGroupTest.java index 2afcbaa379..322be8e579 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidThreadGroupTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidThreadGroupTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidThreadGroupTest extends PmdRuleTst { +class AvoidThreadGroupTest extends PmdRuleTst { // Used by AvoidThreadGroup test cases public static class ThreadGroup { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidUsingVolatileTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidUsingVolatileTest.java index ce61a3e5c6..76a2a33966 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidUsingVolatileTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/AvoidUsingVolatileTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidUsingVolatileTest extends PmdRuleTst { +class AvoidUsingVolatileTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoNotUseThreadsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoNotUseThreadsTest.java index 9ba3e87d61..a1ee5cbb12 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoNotUseThreadsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoNotUseThreadsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoNotUseThreadsTest extends PmdRuleTst { +class DoNotUseThreadsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DontCallThreadRunTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DontCallThreadRunTest.java index c628ed4b78..6c19a37681 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DontCallThreadRunTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DontCallThreadRunTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DontCallThreadRunTest extends PmdRuleTst { +class DontCallThreadRunTest extends PmdRuleTst { // Used by DontCallThreadRun test cases public static class TestThread extends Thread { @Override diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoubleCheckedLockingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoubleCheckedLockingTest.java index 201f12e621..2dd1f220dc 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoubleCheckedLockingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/DoubleCheckedLockingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class DoubleCheckedLockingTest extends PmdRuleTst { +class DoubleCheckedLockingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/NonThreadSafeSingletonTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/NonThreadSafeSingletonTest.java index 928f350179..5de60a32d9 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/NonThreadSafeSingletonTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/NonThreadSafeSingletonTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class NonThreadSafeSingletonTest extends PmdRuleTst { +class NonThreadSafeSingletonTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterTest.java index f5d0288dfe..6581d6ae33 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UnsynchronizedStaticFormatterTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UnsynchronizedStaticFormatterTest extends PmdRuleTst { +class UnsynchronizedStaticFormatterTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseConcurrentHashMapTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseConcurrentHashMapTest.java index 2ddf93e4e9..30b6abe091 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseConcurrentHashMapTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseConcurrentHashMapTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseConcurrentHashMapTest extends PmdRuleTst { +class UseConcurrentHashMapTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseNotifyAllInsteadOfNotifyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseNotifyAllInsteadOfNotifyTest.java index c03cbd61d0..d9c2cde3f2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseNotifyAllInsteadOfNotifyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/multithreading/UseNotifyAllInsteadOfNotifyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseNotifyAllInsteadOfNotifyTest extends PmdRuleTst { +class UseNotifyAllInsteadOfNotifyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AddEmptyStringTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AddEmptyStringTest.java index c230229435..6d774c1f03 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AddEmptyStringTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AddEmptyStringTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AddEmptyStringTest extends PmdRuleTst { +class AddEmptyStringTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharTest.java index d289d83430..b2def502e2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AppendCharacterWithCharTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AppendCharacterWithCharTest extends PmdRuleTst { +class AppendCharacterWithCharTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidArrayLoopsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidArrayLoopsTest.java index 6377d8f891..9dc04979f6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidArrayLoopsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidArrayLoopsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidArrayLoopsTest extends PmdRuleTst { +class AvoidArrayLoopsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidCalendarDateCreationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidCalendarDateCreationTest.java index a3c8909f50..c065428ce7 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidCalendarDateCreationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidCalendarDateCreationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidCalendarDateCreationTest extends PmdRuleTst { +class AvoidCalendarDateCreationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidFileStreamTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidFileStreamTest.java index 592afe9c97..1fb6565a3b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidFileStreamTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidFileStreamTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidFileStreamTest extends PmdRuleTst { +class AvoidFileStreamTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidInstantiatingObjectsInLoopsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidInstantiatingObjectsInLoopsTest.java index 33cea34ab7..88ebdd345a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidInstantiatingObjectsInLoopsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/AvoidInstantiatingObjectsInLoopsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class AvoidInstantiatingObjectsInLoopsTest extends PmdRuleTst { +class AvoidInstantiatingObjectsInLoopsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/BigIntegerInstantiationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/BigIntegerInstantiationTest.java index 2903a45822..08343bb36d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/BigIntegerInstantiationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/BigIntegerInstantiationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class BigIntegerInstantiationTest extends PmdRuleTst { +class BigIntegerInstantiationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveAppendsShouldReuseTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveAppendsShouldReuseTest.java index e7b68474ad..9a15a27b88 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveAppendsShouldReuseTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveAppendsShouldReuseTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConsecutiveAppendsShouldReuseTest extends PmdRuleTst { +class ConsecutiveAppendsShouldReuseTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsTest.java index 53e2204c98..e93c5fc95f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class ConsecutiveLiteralAppendsTest extends PmdRuleTst { +class ConsecutiveLiteralAppendsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckTest.java index 3adeb48d5b..223946a1be 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientEmptyStringCheckTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InefficientEmptyStringCheckTest extends PmdRuleTst { +class InefficientEmptyStringCheckTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingTest.java index a7c07cecfa..ff0675aafa 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InefficientStringBufferingTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InefficientStringBufferingTest extends PmdRuleTst { +class InefficientStringBufferingTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationTest.java index d138b38196..91d0e92985 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InsufficientStringBufferDeclarationTest extends PmdRuleTst { +class InsufficientStringBufferDeclarationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/OptimizableToArrayCallTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/OptimizableToArrayCallTest.java index 2fc02260a8..d0c1e11209 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/OptimizableToArrayCallTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/OptimizableToArrayCallTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class OptimizableToArrayCallTest extends PmdRuleTst { +class OptimizableToArrayCallTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerTest.java index 0a3548a3f6..d8b57190f4 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/RedundantFieldInitializerTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class RedundantFieldInitializerTest extends PmdRuleTst { +class RedundantFieldInitializerTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringInstantiationTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringInstantiationTest.java index fc6fdbdd97..1f0b88431f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringInstantiationTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringInstantiationTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class StringInstantiationTest extends PmdRuleTst { +class StringInstantiationTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringTest.java index 90482891f0..826f9d275f 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/StringToStringTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class StringToStringTest extends PmdRuleTst { +class StringToStringTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/TooFewBranchesForASwitchStatementTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/TooFewBranchesForASwitchStatementTest.java index 730ab7469e..7a34936d2d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/TooFewBranchesForASwitchStatementTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/TooFewBranchesForASwitchStatementTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class TooFewBranchesForASwitchStatementTest extends PmdRuleTst { +class TooFewBranchesForASwitchStatementTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArrayListInsteadOfVectorTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArrayListInsteadOfVectorTest.java index 296890c709..6a6f20f34b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArrayListInsteadOfVectorTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArrayListInsteadOfVectorTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseArrayListInsteadOfVectorTest extends PmdRuleTst { +class UseArrayListInsteadOfVectorTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArraysAsListTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArraysAsListTest.java index bc196304e4..6a8a9908f8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArraysAsListTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseArraysAsListTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseArraysAsListTest extends PmdRuleTst { +class UseArraysAsListTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIOStreamsWithApacheCommonsFileItemTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIOStreamsWithApacheCommonsFileItemTest.java index 4eed642b53..6f10cf35c6 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIOStreamsWithApacheCommonsFileItemTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIOStreamsWithApacheCommonsFileItemTest.java @@ -6,5 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseIOStreamsWithApacheCommonsFileItemTest extends PmdRuleTst { +class UseIOStreamsWithApacheCommonsFileItemTest extends PmdRuleTst { + // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharTest.java index 401a76f34b..68837b160e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseIndexOfCharTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseIndexOfCharTest extends PmdRuleTst { +class UseIndexOfCharTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsTest.java index b1ae669420..1cc6ed59a2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferForStringAppendsTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseStringBufferForStringAppendsTest extends PmdRuleTst { +class UseStringBufferForStringAppendsTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferLengthTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferLengthTest.java index 1d7ebb58d6..af3368b481 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferLengthTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UseStringBufferLengthTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UseStringBufferLengthTest extends PmdRuleTst { +class UseStringBufferLengthTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UselessStringValueOfTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UselessStringValueOfTest.java index ef7221eafa..b18c5b6b9b 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UselessStringValueOfTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/performance/UselessStringValueOfTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.performance; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class UselessStringValueOfTest extends PmdRuleTst { +class UselessStringValueOfTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/HardCodedCryptoKeyTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/HardCodedCryptoKeyTest.java index e6502fbbcb..09046eec59 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/HardCodedCryptoKeyTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/HardCodedCryptoKeyTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class HardCodedCryptoKeyTest extends PmdRuleTst { +class HardCodedCryptoKeyTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/InsecureCryptoIvTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/InsecureCryptoIvTest.java index c6132a5d0d..a502887680 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/InsecureCryptoIvTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/security/InsecureCryptoIvTest.java @@ -6,6 +6,6 @@ package net.sourceforge.pmd.lang.java.rule.security; import net.sourceforge.pmd.testframework.PmdRuleTst; -public class InsecureCryptoIvTest extends PmdRuleTst { +class InsecureCryptoIvTest extends PmdRuleTst { // no additional unit tests } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseXPathFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseXPathFunctionTest.java index 69c06cc770..c939e1396d 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseXPathFunctionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/BaseXPathFunctionTest.java @@ -7,11 +7,11 @@ package net.sourceforge.pmd.lang.java.rule.xpath.internal; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.function.Consumer; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Assert; import net.sourceforge.pmd.Report; import net.sourceforge.pmd.Rule; @@ -27,7 +27,7 @@ import net.sourceforge.pmd.lang.rule.xpath.XPathVersion; * @author Clément Fournier * @since 7.0.0 */ -public class BaseXPathFunctionTest extends BaseParserTest { +class BaseXPathFunctionTest extends BaseParserTest { private static final String VIOLATION_MESSAGE = "violation"; private static final String RULE_NAME_PLACEHOLDER = "$rule_name"; @@ -57,7 +57,7 @@ public class BaseXPathFunctionTest extends BaseParserTest { Consumer exceptionSpec) { Rule rule = makeXpathRuleFromXPath(xpath); - FileAnalysisException thrown = Assert.assertThrows(FileAnalysisException.class, () -> executeRule(rule, code)); + FileAnalysisException thrown = assertThrows(FileAnalysisException.class, () -> executeRule(rule, code)); assertThat(thrown.getCause(), instanceOf(PmdXPathException.class)); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/GetModifiersFunctionsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/GetModifiersFunctionsTest.java index 37b67fd77b..c05e6d1e16 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/GetModifiersFunctionsTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/GetModifiersFunctionsTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException.Phase; @@ -17,11 +17,11 @@ import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException.Phase; * @author Clément Fournier * @since 7.0.0 */ -public class GetModifiersFunctionsTest extends BaseXPathFunctionTest { +class GetModifiersFunctionsTest extends BaseXPathFunctionTest { @Test - public void testEffectiveModifiers() { + void testEffectiveModifiers() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:modifiers() = ('public', 'abstract')]"); String code = "interface O { class Foo { } }"; @@ -29,7 +29,7 @@ public class GetModifiersFunctionsTest extends BaseXPathFunctionTest { } @Test - public void testExplicitModifiers() { + void testExplicitModifiers() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:explicitModifiers() = ('public', 'abstract')]"); String code = "interface O { class Foo { } }"; @@ -38,7 +38,7 @@ public class GetModifiersFunctionsTest extends BaseXPathFunctionTest { @Test - public void testNotAccessNodeReturnsEmptySequence() { + void testNotAccessNodeReturnsEmptySequence() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceBody[pmd-java:modifiers()]"); String code = "interface O { class Foo { } }"; @@ -47,7 +47,7 @@ public class GetModifiersFunctionsTest extends BaseXPathFunctionTest { @Test - public void testStaticTypeError() { + void testStaticTypeError() { testWithExpectedException( "//MethodDeclaration[(., .) is pmd-java:modifiers()]", "class Moo { void foo() {if(true){}} }", diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/HasAnnotationXPathTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/HasAnnotationXPathTest.java index 3079fb7071..51e396e4a0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/HasAnnotationXPathTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/HasAnnotationXPathTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.xpath.internal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; @@ -12,11 +12,11 @@ import net.sourceforge.pmd.Rule; * @author Clément Fournier * @since 7.0.0 */ -public class HasAnnotationXPathTest extends BaseXPathFunctionTest { +class HasAnnotationXPathTest extends BaseXPathFunctionTest { @Test - public void testHasAnnotation() { + void testHasAnnotation() { Rule rule = makeXpathRuleFromXPath("//MethodDeclaration[pmd-java:hasAnnotation('java.lang.Override')]"); String code = "interface O { @Override void foo(); }"; @@ -25,7 +25,7 @@ public class HasAnnotationXPathTest extends BaseXPathFunctionTest { @Test - public void testHasAnnotationNonQual() { + void testHasAnnotationNonQual() { Rule rule = makeXpathRuleFromXPath("//MethodDeclaration[pmd-java:hasAnnotation('Override')]"); String code = "interface O { @Override void foo(); }"; @@ -34,7 +34,7 @@ public class HasAnnotationXPathTest extends BaseXPathFunctionTest { } @Test - public void testWrongTypeReturnsFalse() { + void testWrongTypeReturnsFalse() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceBody[pmd-java:hasAnnotation('java.lang.Override')]"); String code = "interface O { @Override void foo(); }"; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/MatchesSignatureXPathTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/MatchesSignatureXPathTest.java index edc812faaa..384aea4eea 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/MatchesSignatureXPathTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/MatchesSignatureXPathTest.java @@ -4,10 +4,10 @@ package net.sourceforge.pmd.lang.java.rule.xpath.internal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException; @@ -17,10 +17,10 @@ import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException.Phase; * @author Clément Fournier * @since 7.0.0 */ -public class MatchesSignatureXPathTest extends BaseXPathFunctionTest { +class MatchesSignatureXPathTest extends BaseXPathFunctionTest { @Test - public void testMatchSig1() { + void testMatchSig1() { Rule rule = makeXpathRuleFromXPath("//MethodCall[pmd-java:matchesSig('_#equals(java.lang.Object)')]"); assertFinds(rule, 1, "class O { { this.equals(\"\"); } }"); @@ -29,7 +29,7 @@ public class MatchesSignatureXPathTest extends BaseXPathFunctionTest { @Test - public void testMatchSigWithReceiver() { + void testMatchSigWithReceiver() { Rule rule = makeXpathRuleFromXPath("//MethodCall[pmd-java:matchesSig('java.lang.Enum#equals(java.lang.Object)')]"); assertFinds(rule, 1, "enum O {; { this.equals(\"\"); } }"); @@ -37,14 +37,14 @@ public class MatchesSignatureXPathTest extends BaseXPathFunctionTest { } @Test - public void testMatchSigUnresolved() { + void testMatchSigUnresolved() { Rule rule = makeXpathRuleFromXPath("//MethodCall[pmd-java:matchesSig('java.lang.String#foobar()')]"); assertFinds(rule, 0, "enum O {; { \"\".foobar(); } }"); } @Test - public void testMatchSigNoName() { + void testMatchSigNoName() { Rule rule = makeXpathRuleFromXPath("//MethodCall[pmd-java:matchesSig('_#_(int,int)')]"); assertFinds(rule, 2, "enum O {; { \"\".substring(1, 2); this.foo(1, 'c');} void foo(int a, int b) {} }"); @@ -52,17 +52,17 @@ public class MatchesSignatureXPathTest extends BaseXPathFunctionTest { @Test - public void testMatchSigWrongTypeReturnsFalse() { + void testMatchSigWrongTypeReturnsFalse() { Rule rule = makeXpathRuleFromXPath("//EnumDeclaration[pmd-java:matchesSig('_#_(int,int)')]"); assertFinds(rule, 0, "enum O {; { \"\".substring(1, 2); this.foo(1, 'c');} void foo(int a, int b) {} }"); } @Test - public void testMatchInvalidSig() { + void testMatchInvalidSig() { Rule rule = makeXpathRuleFromXPath("//*[pmd-java:matchesSig('_#')]"); - PmdXPathException e = Assert.assertThrows(PmdXPathException.class, rule::getTargetSelector); + PmdXPathException e = assertThrows(PmdXPathException.class, rule::getTargetSelector); assertEquals(Phase.INITIALIZATION, e.getPhase()); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/NodeIsFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/NodeIsFunctionTest.java index 97a2b9a69c..030128c6cd 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/NodeIsFunctionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/NodeIsFunctionTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException.Phase; @@ -17,10 +17,10 @@ import net.sourceforge.pmd.lang.rule.xpath.PmdXPathException.Phase; * @author Clément Fournier * @since 7.0.0 */ -public class NodeIsFunctionTest extends BaseXPathFunctionTest { +class NodeIsFunctionTest extends BaseXPathFunctionTest { @Test - public void testWellFormedNodeName() { + void testWellFormedNodeName() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:nodeIs('ClassOrInterfaceDeclaration')]"); String code = "class Foo { Foo() {} void bar() {}}"; @@ -28,7 +28,7 @@ public class NodeIsFunctionTest extends BaseXPathFunctionTest { } @Test - public void testNodeNameStaticallyUnknown() { + void testNodeNameStaticallyUnknown() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:nodeIs(name())]"); String code = "class Foo { Foo() {} void bar() {}}"; @@ -37,7 +37,7 @@ public class NodeIsFunctionTest extends BaseXPathFunctionTest { @Test - public void testWellFormedNodeNameForSupertype() { + void testWellFormedNodeNameForSupertype() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:nodeIs('AnyTypeDeclaration')]"); String code = "class Foo { Foo() {} void bar() {}}"; @@ -47,7 +47,7 @@ public class NodeIsFunctionTest extends BaseXPathFunctionTest { @Test - public void testNonExistentNodeName() { + void testNonExistentNodeName() { // note that this would fail with a type error (boolean > integer) // if nodeIs fails to fail testWithExpectedException( @@ -62,7 +62,7 @@ public class NodeIsFunctionTest extends BaseXPathFunctionTest { @Test - public void testNonExistentNodeNameStaticallyUnknown() { + void testNonExistentNodeNameStaticallyUnknown() { testWithExpectedException( "//MethodDeclaration[pmd-java:nodeIs(name() || 'qqq')]", "class Moo { void foo() {if(true){}} }", diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/TypeIsFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/TypeIsFunctionTest.java index 2f96c75897..2f2ceb597a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/TypeIsFunctionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/TypeIsFunctionTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.xpath.internal; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; @@ -12,18 +12,18 @@ import net.sourceforge.pmd.Rule; * @author Clément Fournier * @since 7.0.0 */ -public class TypeIsFunctionTest extends BaseXPathFunctionTest { +class TypeIsFunctionTest extends BaseXPathFunctionTest { @Test - public void testHasAnnotation() { + void testHasAnnotation() { Rule rule = makeXpathRuleFromXPath("//Annotation[pmd-java:typeIs('java.lang.Override')]"); assertFinds(rule, 1, "interface O { @Override void foo(); }"); } @Test - public void testHasAnnotationNonQual() { + void testHasAnnotationNonQual() { Rule rule = makeXpathRuleFromXPath("//Annotation[pmd-java:typeIs('Override')]"); //does not match @@ -31,7 +31,7 @@ public class TypeIsFunctionTest extends BaseXPathFunctionTest { } @Test - public void testTypeIsArray() { + void testTypeIsArray() { Rule rule = makeXpathRuleFromXPath("//*[pmd-java:typeIs('int[]')]"); // ArrayType + VariableDeclaratorId @@ -39,7 +39,7 @@ public class TypeIsFunctionTest extends BaseXPathFunctionTest { } @Test - public void testWrongTypeReturnsFalse() { + void testWrongTypeReturnsFalse() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceBody[pmd-java:typeIs('java.lang.Override')]"); assertFinds(rule, 0, "interface O { @Override void foo(); }"); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/XPathMetricFunctionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/XPathMetricFunctionTest.java index be0beb8b79..7f7b00b6df 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/XPathMetricFunctionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/xpath/internal/XPathMetricFunctionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.java.rule.xpath.internal; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.Rule; @@ -15,10 +15,10 @@ import net.sourceforge.pmd.Rule; * @author Clément Fournier * @since 6.0.0 */ -public class XPathMetricFunctionTest extends BaseXPathFunctionTest { +class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testWellFormedClassMetricRule() { + void testWellFormedClassMetricRule() { Rule rule = makeXpathRuleFromXPath("//ClassOrInterfaceDeclaration[pmd-java:metric('NCSS') > 0]"); String code = "class Foo { Foo() {} void bar() {}}"; @@ -27,7 +27,7 @@ public class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testWellFormedOperationMetricRule() { + void testWellFormedOperationMetricRule() { Rule rule = makeXpathRuleFromXPath("//ConstructorDeclaration[pmd-java:metric('CYCLO') > 1]"); String code = "class Goo { Goo() {if(true){}} }"; @@ -36,7 +36,7 @@ public class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testBadCase() { + void testBadCase() { Rule rule = makeXpathRuleFromXPath("//ConstructorDeclaration[pmd-java:metric('cYclo') > 1]"); String code = "class Hoo { Hoo() {if(true){}} }"; @@ -45,7 +45,7 @@ public class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testNonexistentMetric() { + void testNonexistentMetric() { testWithExpectedException( "//ConstructorDeclaration[pmd-java:metric('FOOBAR') > 1]", "class Joo { Joo() {if(true){}} }", @@ -54,7 +54,7 @@ public class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testIfStmt() { + void testIfStmt() { Rule rule = makeXpathRuleFromXPath("//IfStatement[pmd-java:metric('NCSS') = 1]"); String code = "class Hoo { Hoo() {if(true){}} }"; @@ -63,7 +63,7 @@ public class XPathMetricFunctionTest extends BaseXPathFunctionTest { @Test - public void testWrongNodeTypeMeansEmptySequence() { + void testWrongNodeTypeMeansEmptySequence() { Rule rule = makeXpathRuleFromXPath("//EnumDeclaration[not(pmd-java:metric('NPATH'))]"); String code = "enum Loo { FOO; }"; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java index 048e702359..23a27129f2 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java @@ -5,12 +5,15 @@ package net.sourceforge.pmd.lang.java.symbols.table.internal; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; -import org.junit.Test; -import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; import net.sourceforge.pmd.lang.java.BaseParserTest; @@ -20,9 +23,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTIfStatement; import net.sourceforge.pmd.lang.java.ast.ASTStatement; -import junit.framework.AssertionFailedError; - -public class AbruptCompletionTests extends BaseParserTest { +class AbruptCompletionTests extends BaseParserTest { private final JavaParsingHelper java17 = java.withDefaultVersion("17"); @@ -45,8 +46,7 @@ public class AbruptCompletionTests extends BaseParserTest { private Executable canCompleteNormally(String stmtText, boolean expected, Function getNode) { return canCompleteNormally( stmtText, - (actual, stmt) -> Assertions.assertEquals(expected, actual, - "Can " + stmt.getText() + " complete normally?"), + (actual, stmt) -> assertEquals(expected, actual, "Can " + stmt.getText() + " complete normally?"), getNode ); } @@ -54,7 +54,7 @@ public class AbruptCompletionTests extends BaseParserTest { private Executable canCompleteNormally(String stmt) { return canCompleteNormally(stmt, actual -> { if (!actual) { - throw new AssertionFailedError("Code CAN complete normally: `" + stmt + "`"); + fail("Code CAN complete normally: `" + stmt + "`"); } }); } @@ -62,14 +62,14 @@ public class AbruptCompletionTests extends BaseParserTest { private Executable mustCompleteAbruptly(String stmt) { return canCompleteNormally(stmt, actual -> { if (actual) { - throw new AssertionFailedError("Code MUST complete abruptly: `" + stmt + "`"); + fail("Code MUST complete abruptly: `" + stmt + "`"); } }); } @Test - public void testIfStatements() { - Assertions.assertAll( + void testIfStatements() { + assertAll( canCompleteNormally( "if (foo) {}" + "else { throw new Exception(); }" @@ -87,7 +87,7 @@ public class AbruptCompletionTests extends BaseParserTest { @Test public void testWhileStmt() { - Assertions.assertAll( + assertAll( canCompleteNormally("while(foo) { return; }"), canCompleteNormally("while(foo) { break; }"), canCompleteNormally("l: while(foo) { break; }"), @@ -107,8 +107,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testForLoop() { - Assertions.assertAll( + void testForLoop() { + assertAll( canCompleteNormally("for(; foo; ) { return; }"), canCompleteNormally("for(;foo;) { break; }"), canCompleteNormally("l: for(;foo;) { break; }"), @@ -128,8 +128,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testDoLoop() { - Assertions.assertAll( + void testDoLoop() { + assertAll( canCompleteNormally("do { } while(foo);"), canCompleteNormally("do { continue; } while(foo);"), canCompleteNormally("do { break; } while(foo);"), @@ -145,8 +145,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testForeachLoop() { - Assertions.assertAll( + void testForeachLoop() { + assertAll( canCompleteNormally("for (int i : new int[]{}) { }"), canCompleteNormally("for (int i : new int[]{}) { continue; }"), canCompleteNormally("for (int i : new int[]{}) { break; }"), @@ -155,8 +155,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testWhileContinue() { - Assertions.assertAll( + void testWhileContinue() { + assertAll( canCompleteNormally("while(foo) { if (x) continue; }"), // this is trivial, but the condition may have side-effects @@ -169,8 +169,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testSwitchFallthrough() { - Assertions.assertAll( + void testSwitchFallthrough() { + assertAll( canCompleteNormally("switch(foo) {}"), canCompleteNormally("switch(foo) { case 1: break; }"), canCompleteNormally("switch(foo) { case 1: break; case 2: foo(); }"), @@ -179,8 +179,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testSwitchArrow() { - Assertions.assertAll( + void testSwitchArrow() { + assertAll( canCompleteNormally("switch(foo) {}"), canCompleteNormally("switch(foo) { case 1 -> X; default-> X;}"), @@ -192,8 +192,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testTry() { - Assertions.assertAll( + void testTry() { + assertAll( canCompleteNormally("try {}"), canCompleteNormally("try { foo(); }"), canCompleteNormally("try {{}}"), @@ -216,8 +216,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testSwitchExhaustive() { - Assertions.assertAll( + void testSwitchExhaustive() { + assertAll( // no default, even with exhaustive enum, means it can complete normally canCompleteNormally("enum Local { A } Local a = Local.A;\n" + "switch(a) { case A: return; }"), @@ -227,8 +227,8 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testYield() { - Assertions.assertAll( + void testYield() { + assertAll( canCompleteNormally("int i = switch(1) {" + " case 1 -> { yield 1; }" + " default -> { yield 2; }" @@ -251,16 +251,16 @@ public class AbruptCompletionTests extends BaseParserTest { } @Test - public void testFalseLoopIsUnreachable() { - Assertions.assertAll( + void testFalseLoopIsUnreachable() { + assertAll( canCompleteNormally("while(false) { }"), canCompleteNormally("for(;false;) { }") ); } @Test - public void testLabeledStmt() { - Assertions.assertAll( + void testLabeledStmt() { + assertAll( canCompleteNormally("l: if (foo) break l; else break l;"), mustCompleteAbruptly("if (foo) break l; else break l;") ); diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/PatternBindingsTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/PatternBindingsTests.java index 3183aab108..5da97f0278 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/PatternBindingsTests.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/PatternBindingsTests.java @@ -8,12 +8,12 @@ package net.sourceforge.pmd.lang.java.symbols.table.internal; import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toSet; import static net.sourceforge.pmd.util.CollectionUtil.setOf; +import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Set; -import org.junit.Test; -import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; import net.sourceforge.pmd.lang.java.BaseParserTest; @@ -24,13 +24,13 @@ import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.symbols.table.internal.PatternBindingsUtil.BindSet; import net.sourceforge.pmd.util.CollectionUtil; -public class PatternBindingsTests extends BaseParserTest { +class PatternBindingsTests extends BaseParserTest { - private final JavaParsingHelper java15p = java.withDefaultVersion("17"); + private final JavaParsingHelper java17 = java.withDefaultVersion("17"); private Executable declares(String expr, Set trueVars, Set falseVars) { return () -> { - ASTCompilationUnit ast = java15p.parse("class Foo {{ Object o = (" + expr + "); }}"); + ASTCompilationUnit ast = java17.parse("class Foo {{ Object o = (" + expr + "); }}"); ASTExpression e = ast.descendants(ASTExpression.class).crossFindBoundaries().firstOrThrow(); @@ -50,9 +50,9 @@ public class PatternBindingsTests extends BaseParserTest { } @Test - public void testUnaries() { + void testUnaries() { String stringS = "a instanceof String s"; - Assertions.assertAll( + assertAll( declares(stringS, setOf("s"), emptySet()), declares("!(" + stringS + ")", emptySet(), setOf("s")), @@ -62,10 +62,10 @@ public class PatternBindingsTests extends BaseParserTest { } @Test - public void testBooleanConditionals() { + void testBooleanConditionals() { String stringS = "(a instanceof String s)"; String stringP = "(a instanceof String p)"; - Assertions.assertAll( + assertAll( declares(stringS + " || " + stringP, emptySet(), emptySet()), declares(stringS + " && " + stringP, setOf("s", "p"), emptySet()), declares("!(" + stringS + " || " + stringP + ")", emptySet(), emptySet()), diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/GenericMethodReferenceTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/GenericMethodReferenceTest.java index 08c0232ec2..2d6e91158e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/GenericMethodReferenceTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/GenericMethodReferenceTest.java @@ -4,11 +4,13 @@ package net.sourceforge.pmd.lang.java.types; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.function.Supplier; import org.checkerframework.checker.nullness.qual.Nullable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; @@ -16,17 +18,17 @@ import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId; import net.sourceforge.pmd.lang.java.symbols.JTypeDeclSymbol; import net.sourceforge.pmd.lang.java.types.testdata.GenericMethodReference; -public class GenericMethodReferenceTest { +class GenericMethodReferenceTest { @Test - public void typeResolveVariable() { + void typeResolveVariable() { ASTCompilationUnit root = JavaParsingHelper.DEFAULT.parseClass(GenericMethodReference.class); root.descendants(ASTVariableDeclaratorId.class).forEach(variable -> { - Assert.assertTrue(variable.getName().startsWith("supplier")); + assertTrue(variable.getName().startsWith("supplier")); @Nullable JTypeDeclSymbol symbol = variable.getInitializer().getTypeMirror().getSymbol(); - Assert.assertEquals(Supplier.class.getSimpleName(), symbol.getSimpleName()); + assertEquals(Supplier.class.getSimpleName(), symbol.getSimpleName()); }); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/InvocationMatcherTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/InvocationMatcherTest.java index 598d27eec3..d9a949cf8e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/InvocationMatcherTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/InvocationMatcherTest.java @@ -6,20 +6,22 @@ package net.sourceforge.pmd.lang.java.types; import static net.sourceforge.pmd.lang.java.types.InvocationMatcher.parse; import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.ASTConstructorCall; import net.sourceforge.pmd.lang.java.ast.ASTMethodCall; import net.sourceforge.pmd.lang.java.ast.InvocationNode; -public class InvocationMatcherTest extends BaseParserTest { +class InvocationMatcherTest extends BaseParserTest { @Test - public void testSimpleMatcher() { + void testSimpleMatcher() { ASTMethodCall call = java.parse("class Foo {{ Integer.valueOf('c'); }}") @@ -36,7 +38,7 @@ public class InvocationMatcherTest extends BaseParserTest { } @Test - public void testCtorMatchers() { + void testCtorMatchers() { ASTConstructorCall call = java.parse("class Foo {{ new java.util.ArrayList('c'); }}") @@ -56,7 +58,7 @@ public class InvocationMatcherTest extends BaseParserTest { } @Test - public void testArray() { + void testArray() { ASTMethodCall call = java.parse("class Foo {{ new int[0].toString(); }}") @@ -75,10 +77,10 @@ public class InvocationMatcherTest extends BaseParserTest { } @Test - public void testWhitespaceErrorMessage() { + void testWhitespaceErrorMessage() { parse("_#_(int,int)"); // does not fail - IllegalArgumentException e = Assert.assertThrows(IllegalArgumentException.class, () -> parse("_#_(int, int)")); + IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> parse("_#_(int, int)")); MatcherAssert.assertThat(e.getMessage(), equalTo("Expected type at index 8:\n" + " \"_#_(int, int)\"\n" + " ^\n")); @@ -86,13 +88,11 @@ public class InvocationMatcherTest extends BaseParserTest { } private void assertMatch(InvocationNode call, String sig) { - Assert.assertTrue(sig + " should match " + call, - parse(sig).matchesCall(call)); + assertTrue(parse(sig).matchesCall(call), sig + " should match " + call); } private void assertNoMatch(InvocationNode call, String s) { - Assert.assertFalse(s + " should not match " + call, - parse(s).matchesCall(call)); + assertFalse(parse(s).matchesCall(call), s + " should not match " + call); } } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypeTestUtilTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypeTestUtilTest.java index 72ead82d26..3d02832279 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypeTestUtilTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/TypeTestUtilTest.java @@ -4,15 +4,19 @@ package net.sourceforge.pmd.lang.java.types; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.ObjectStreamField; import java.io.Serializable; import java.lang.annotation.Annotation; import java.util.concurrent.Callable; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.BaseParserTest; import net.sourceforge.pmd.lang.java.ast.ASTAnnotation; @@ -26,13 +30,10 @@ import net.sourceforge.pmd.lang.java.ast.ASTType; import net.sourceforge.pmd.lang.java.ast.TypeNode; import net.sourceforge.pmd.lang.java.types.testdata.SomeClassWithAnon; -public class TypeTestUtilTest extends BaseParserTest { - - @Rule - public final ExpectedException expect = ExpectedException.none(); +class TypeTestUtilTest extends BaseParserTest { @Test - public void testIsAFallback() { + void testIsAFallback() { ASTClassOrInterfaceDeclaration klass = java.parse("package org; import java.io.Serializable; " @@ -40,32 +41,32 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class); - Assert.assertNull(klass.getType()); - Assert.assertTrue(TypeTestUtil.isA("org.FooBar", klass)); - Assert.assertTrue(TypeTestUtil.isA("java.io.Serializable", klass)); - Assert.assertTrue(TypeTestUtil.isA(Serializable.class, klass)); + assertNull(klass.getType()); + assertTrue(TypeTestUtil.isA("org.FooBar", klass)); + assertTrue(TypeTestUtil.isA("java.io.Serializable", klass)); + assertTrue(TypeTestUtil.isA(Serializable.class, klass)); } @Test - public void testIsAFallbackWithUnresolvedClassReference() { // != declaration + void testIsAFallbackWithUnresolvedClassReference() { // != declaration ASTAnnotation annot = java.parse("import a.b.Test;" + "class FooBar { @Test void bar() {} }") .getFirstDescendantOfType(ASTAnnotation.class); - Assert.assertTrue(TypeTestUtil.isA("a.b.Test", annot)); - Assert.assertTrue(TypeOps.isUnresolved(annot.getTypeMirror())); + assertTrue(TypeTestUtil.isA("a.b.Test", annot)); + assertTrue(TypeOps.isUnresolved(annot.getTypeMirror())); - Assert.assertFalse(TypeTestUtil.isA(org.junit.Test.class, annot)); - Assert.assertFalse(TypeTestUtil.isA("org.junit.Test", annot)); - Assert.assertFalse(TypeTestUtil.isA(Override.class, annot)); - Assert.assertFalse(TypeTestUtil.isA("java.lang.Override", annot)); + assertFalse(TypeTestUtil.isA(org.junit.Test.class, annot)); + assertFalse(TypeTestUtil.isA("org.junit.Test", annot)); + assertFalse(TypeTestUtil.isA(Override.class, annot)); + assertFalse(TypeTestUtil.isA("java.lang.Override", annot)); } @Test - public void testIsAFallbackEnum() { + void testIsAFallbackEnum() { ASTEnumDeclaration klass = java.parse("package org; " @@ -73,8 +74,8 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTEnumDeclaration.class); - Assert.assertNull(klass.getType()); - Assert.assertTrue(TypeTestUtil.isA("org.FooBar", klass)); + assertNull(klass.getType()); + assertTrue(TypeTestUtil.isA("org.FooBar", klass)); assertIsStrictSubtype(klass, Iterable.class); assertIsStrictSubtype(klass, Enum.class); assertIsStrictSubtype(klass, Serializable.class); @@ -83,7 +84,7 @@ public class TypeTestUtilTest extends BaseParserTest { @Test - public void testIsAnArrayClass() { + void testIsAnArrayClass() { ASTType arrayT = java.parse("import java.io.ObjectStreamField; " @@ -99,20 +100,20 @@ public class TypeTestUtilTest extends BaseParserTest { } @Test - public void testIsAnAnnotationClass() { + void testIsAnAnnotationClass() { ASTType arrayT = java.parse("class Foo { org.junit.Test field; }") .getFirstDescendantOfType(ASTType.class); - assertIsExactlyA(arrayT, Test.class); + assertIsExactlyA(arrayT, org.junit.Test.class); assertIsStrictSubtype(arrayT, Annotation.class); assertIsStrictSubtype(arrayT, Object.class); } @Test - public void testIsAPrimitiveArrayClass() { + void testIsAPrimitiveArrayClass() { ASTType arrayT = java.parse("import java.io.ObjectStreamField; " @@ -129,7 +130,7 @@ public class TypeTestUtilTest extends BaseParserTest { } @Test - public void testIsAPrimitiveSubtype() { + void testIsAPrimitiveSubtype() { ASTType arrayT = java.parse("import java.io.ObjectStreamField; " @@ -146,7 +147,7 @@ public class TypeTestUtilTest extends BaseParserTest { @Test - public void testIsAFallbackAnnotation() { + void testIsAFallbackAnnotation() { ASTAnnotationTypeDeclaration klass = java.parse("package org; import foo.Stuff;" @@ -154,14 +155,14 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTAnnotationTypeDeclaration.class); - Assert.assertNull(klass.getType()); - Assert.assertTrue(TypeTestUtil.isA("org.FooBar", klass)); + assertNull(klass.getType()); + assertTrue(TypeTestUtil.isA("org.FooBar", klass)); assertIsA(klass, Annotation.class); assertIsA(klass, Object.class); } @Test - public void testIsATypeVarWithUnresolvedBound() { + void testIsATypeVarWithUnresolvedBound() { // a type var with an unresolved bound should not be considered // a subtype of everything @@ -177,7 +178,7 @@ public class TypeTestUtilTest extends BaseParserTest { } @Test - public void testIsAStringWithTypeArguments() { + void testIsAStringWithTypeArguments() { ASTAnyTypeDeclaration klass = java.parse("package org;" @@ -185,12 +186,12 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTAnyTypeDeclaration.class); - expect.expect(IllegalArgumentException.class); - TypeTestUtil.isA("java.util.List", klass); + assertThrows(IllegalArgumentException.class, + () -> TypeTestUtil.isA("java.util.List", klass)); } @Test - public void testIsAStringWithTypeArgumentsAnnotation() { + void testIsAStringWithTypeArgumentsAnnotation() { ASTAnyTypeDeclaration klass = java.parse("package org;" @@ -198,12 +199,12 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTAnyTypeDeclaration.class); - expect.expect(IllegalArgumentException.class); - TypeTestUtil.isA("java.util.List", klass); + assertThrows(IllegalArgumentException.class, () -> + TypeTestUtil.isA("java.util.List", klass)); } @Test - public void testAnonClassTypeNPE() { + void testAnonClassTypeNPE() { // #2756 ASTAnonymousClassDeclaration anon = @@ -211,18 +212,18 @@ public class TypeTestUtilTest extends BaseParserTest { .getFirstDescendantOfType(ASTAnonymousClassDeclaration.class); - Assert.assertTrue("Anon class", anon.getSymbol().isAnonymousClass()); - Assert.assertTrue("Should be a Runnable", TypeTestUtil.isA(Runnable.class, anon)); + assertTrue(anon.getSymbol().isAnonymousClass(), "Anon class"); + assertTrue(TypeTestUtil.isA(Runnable.class, anon), "Should be a Runnable"); // This is not a canonical name, so we give up early - Assert.assertFalse(TypeTestUtil.isA(SomeClassWithAnon.class.getName() + "$1", anon)); - Assert.assertFalse(TypeTestUtil.isExactlyA(SomeClassWithAnon.class.getName() + "$1", anon)); + assertFalse(TypeTestUtil.isA(SomeClassWithAnon.class.getName() + "$1", anon)); + assertFalse(TypeTestUtil.isExactlyA(SomeClassWithAnon.class.getName() + "$1", anon)); // this is the failure case: if the binary name doesn't match, we test the canoname, which was null - Assert.assertFalse(TypeTestUtil.isA(Callable.class, anon)); - Assert.assertFalse(TypeTestUtil.isA(Callable.class.getCanonicalName(), anon)); - Assert.assertFalse(TypeTestUtil.isExactlyA(Callable.class, anon)); - Assert.assertFalse(TypeTestUtil.isExactlyA(Callable.class.getCanonicalName(), anon)); + assertFalse(TypeTestUtil.isA(Callable.class, anon)); + assertFalse(TypeTestUtil.isA(Callable.class.getCanonicalName(), anon)); + assertFalse(TypeTestUtil.isExactlyA(Callable.class, anon)); + assertFalse(TypeTestUtil.isExactlyA(Callable.class.getCanonicalName(), anon)); } /** @@ -232,36 +233,36 @@ public class TypeTestUtilTest extends BaseParserTest { * simple names. */ @Test - public void testIsAFallbackAnnotationSimpleNameImport() { + void testIsAFallbackAnnotationSimpleNameImport() { ASTAnnotation annotation = java.parse("package org; import foo.Stuff; @Stuff public class FooBar {}") .getFirstDescendantOfType(ASTAnnotation.class); - Assert.assertNull(annotation.getType()); - Assert.assertTrue(TypeTestUtil.isA("foo.Stuff", annotation)); - Assert.assertFalse(TypeTestUtil.isA("other.Stuff", annotation)); + assertNull(annotation.getType()); + assertTrue(TypeTestUtil.isA("foo.Stuff", annotation)); + assertFalse(TypeTestUtil.isA("other.Stuff", annotation)); // we know it's not Stuff, it's foo.Stuff - Assert.assertFalse(TypeTestUtil.isA("Stuff", annotation)); + assertFalse(TypeTestUtil.isA("Stuff", annotation)); } @Test - public void testNullNode() { - Assert.assertFalse(TypeTestUtil.isA(String.class, (TypeNode) null)); - Assert.assertFalse(TypeTestUtil.isA("java.lang.String", (JTypeMirror) null)); - Assert.assertFalse(TypeTestUtil.isA("java.lang.String", (TypeNode) null)); - Assert.assertFalse(TypeTestUtil.isExactlyA(String.class, (TypeNode) null)); - Assert.assertFalse(TypeTestUtil.isExactlyA("java.lang.String", null)); + void testNullNode() { + assertFalse(TypeTestUtil.isA(String.class, (TypeNode) null)); + assertFalse(TypeTestUtil.isA("java.lang.String", (JTypeMirror) null)); + assertFalse(TypeTestUtil.isA("java.lang.String", (TypeNode) null)); + assertFalse(TypeTestUtil.isExactlyA(String.class, (TypeNode) null)); + assertFalse(TypeTestUtil.isExactlyA("java.lang.String", null)); } @Test - public void testNullClass() { + void testNullClass() { final ASTAnnotation node = java.parse("package org; import foo.Stuff; @Stuff public class FooBar {}") .getFirstDescendantOfType(ASTAnnotation.class); - Assert.assertNotNull(node); + assertNotNull(node); - Assert.assertThrows(NullPointerException.class, () -> TypeTestUtil.isA((String) null, node)); - Assert.assertThrows(NullPointerException.class, () -> TypeTestUtil.isA((Class) null, node)); - Assert.assertThrows(NullPointerException.class, () -> TypeTestUtil.isExactlyA((Class) null, node)); - Assert.assertThrows(NullPointerException.class, () -> TypeTestUtil.isExactlyA((String) null, node)); + assertThrows(NullPointerException.class, () -> TypeTestUtil.isA((String) null, node)); + assertThrows(NullPointerException.class, () -> TypeTestUtil.isA((Class) null, node)); + assertThrows(NullPointerException.class, () -> TypeTestUtil.isExactlyA((Class) null, node)); + assertThrows(NullPointerException.class, () -> TypeTestUtil.isExactlyA((String) null, node)); } private void assertIsA(TypeNode node, Class type) { @@ -288,14 +289,14 @@ public class TypeTestUtilTest extends BaseParserTest { } private void assertIsA(TypeNode node, Class type, boolean exactly, boolean expectTrue) { - Assert.assertEquals("TypeTestUtil::isA with class arg: " + type.getCanonicalName(), - expectTrue, - exactly ? TypeTestUtil.isExactlyA(type, node) - : TypeTestUtil.isA(type, node)); - Assert.assertEquals("TypeTestUtil::isA with string arg: " + type.getCanonicalName(), - expectTrue, - exactly ? TypeTestUtil.isExactlyA(type.getCanonicalName(), node) - : TypeTestUtil.isA(type.getCanonicalName(), node)); + assertEquals(expectTrue, + exactly ? TypeTestUtil.isExactlyA(type, node) + : TypeTestUtil.isA(type, node), + "TypeTestUtil::isA with class arg: " + type.getCanonicalName()); + assertEquals(expectTrue, + exactly ? TypeTestUtil.isExactlyA(type.getCanonicalName(), node) + : TypeTestUtil.isA(type.getCanonicalName(), node), + "TypeTestUtil::isA with string arg: " + type.getCanonicalName()); } 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 6f1180e1fb..38ebd79341 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 @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.java.types; import java.util.List; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper; @@ -23,9 +23,9 @@ import net.sourceforge.pmd.lang.rule.xpath.Attribute; /** * */ -public class TypesTreeDumpTest extends BaseTreeDumpTest { +class TypesTreeDumpTest extends BaseTreeDumpTest { - public TypesTreeDumpTest() { + TypesTreeDumpTest() { super(new JavaTypeAttrPrinter(), ".java"); } @@ -35,7 +35,7 @@ public class TypesTreeDumpTest extends BaseTreeDumpTest { } @Test - public void testIteratorUtilCopy() { + void testIteratorUtilCopy() { doTest("IteratorUtilCopy"); } diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/BaseTypeInferenceUnitTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/BaseTypeInferenceUnitTest.java index d6291de9f8..2c7f93cf6c 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/BaseTypeInferenceUnitTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/BaseTypeInferenceUnitTest.java @@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.java.types.internal.infer; import static net.sourceforge.pmd.util.CollectionUtil.listOf; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,7 +25,6 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.hamcrest.SelfDescribing; -import org.junit.Assert; import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.symbols.JClassSymbol; @@ -39,7 +39,7 @@ import net.sourceforge.pmd.lang.java.types.internal.infer.InferenceVar.BoundKind /** * */ -public class BaseTypeInferenceUnitTest { +class BaseTypeInferenceUnitTest { protected final TypeSystem ts = JavaParsingHelper.TEST_TYPE_SYSTEM; @@ -81,29 +81,28 @@ public class BaseTypeInferenceUnitTest { protected void subtypeConstraintShouldFail(InferenceContext ctx, JTypeMirror t, JTypeMirror s) { t.isConvertibleTo(s); // nota: this captures t - Assert.assertThrows(ResolutionFailedException.class, - ctx::incorporate); + assertThrows(ResolutionFailedException.class, ctx::incorporate); } - public @NonNull JTypeMirror listType(JTypeMirror t) { + @NonNull JTypeMirror listType(JTypeMirror t) { return ts.parameterise(listSym, listOf(t)); } - public @NonNull JWildcardType extendsWild(JTypeMirror t) { + @NonNull JWildcardType extendsWild(JTypeMirror t) { return ts.wildcard(true, t); } - public @NonNull JWildcardType superWild(JTypeMirror t) { + @NonNull JWildcardType superWild(JTypeMirror t) { return ts.wildcard(false, t); } - public @NonNull JIntersectionType intersect(JTypeMirror... types) { + @NonNull JIntersectionType intersect(JTypeMirror... types) { JTypeMirror glb = ts.glb(Arrays.asList(types)); assertThat(glb, Matchers.isA(JIntersectionType.class)); return (JIntersectionType) glb; } - public static Matcher hasBound(BoundKind kind, JTypeMirror t) { + static Matcher hasBound(BoundKind kind, JTypeMirror t) { return new BaseMatcher() { @Override public void describeTo(Description description) { @@ -123,7 +122,7 @@ public class BaseTypeInferenceUnitTest { /** * Exactly, modulo the upper(OBJECT), which can be omitted. */ - public static Matcher hasBoundsExactly(Bound... bounds) { + static Matcher hasBoundsExactly(Bound... bounds) { return new BaseMatcher() { @Override public void describeTo(Description description) { @@ -190,7 +189,7 @@ public class BaseTypeInferenceUnitTest { }; } - public static @NonNull Map> getBounds(InferenceVar actual) { + static @NonNull Map> getBounds(InferenceVar actual) { Map> actualBounds = new HashMap<>(); for (BoundKind kind : BoundKind.values()) { @@ -203,7 +202,7 @@ public class BaseTypeInferenceUnitTest { return actualBounds; } - public static @NonNull Set getBoundsObj(InferenceVar actual) { + static @NonNull Set getBoundsObj(InferenceVar actual) { Set bounds = new LinkedHashSet<>(); for (BoundKind kind : BoundKind.values()) { @@ -214,7 +213,7 @@ public class BaseTypeInferenceUnitTest { return bounds; } - public static class Bound implements SelfDescribing { + static class Bound implements SelfDescribing { final BoundKind kind; final JTypeMirror t; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/InferenceCtxUnitTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/InferenceCtxUnitTests.java index 304ee94073..9d3c96cc33 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/InferenceCtxUnitTests.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/types/internal/infer/InferenceCtxUnitTests.java @@ -9,9 +9,9 @@ import static net.sourceforge.pmd.lang.java.types.internal.infer.BaseTypeInferen import static net.sourceforge.pmd.lang.java.types.internal.infer.BaseTypeInferenceUnitTest.Bound.lower; import static net.sourceforge.pmd.lang.java.types.internal.infer.BaseTypeInferenceUnitTest.Bound.upper; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.never; @@ -19,7 +19,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.java.types.JTypeMirror; import net.sourceforge.pmd.lang.java.types.TypeOps; @@ -28,10 +28,10 @@ import net.sourceforge.pmd.lang.java.types.internal.infer.InferenceVar.BoundKind /** * */ -public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { +class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { @Test - public void testHasPrimaryBound() { + void testHasPrimaryBound() { TypeInferenceLogger log = spy(TypeInferenceLogger.noop()); InferenceContext ctx = emptyCtx(log); @@ -56,7 +56,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testBoundsOnConvertibilityCheck() { + void testBoundsOnConvertibilityCheck() { TypeInferenceLogger log = spy(TypeInferenceLogger.noop()); InferenceContext ctx = emptyCtx(log); @@ -75,7 +75,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testEqBoundWithGenerics() { + void testEqBoundWithGenerics() { TypeInferenceLogger log = spy(TypeInferenceLogger.noop()); InferenceContext ctx = emptyCtx(log); @@ -104,7 +104,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { @Test - public void testEqBoundMergesIvar() { + void testEqBoundMergesIvar() { TypeInferenceLogger log = spy(TypeInferenceLogger.noop()); InferenceContext ctx = emptyCtx(log); @@ -127,7 +127,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testSymmetricPropagationOfUpper() { + void testSymmetricPropagationOfUpper() { TypeInferenceLogger log = spy(TypeInferenceLogger.noop()); InferenceContext ctx = emptyCtx(log); @@ -147,7 +147,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testWildLowerLower() { + void testWildLowerLower() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -162,7 +162,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testWildUpperUpper() { + void testWildUpperUpper() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -191,7 +191,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { */ @Test - public void testWildLowerUpper() { + void testWildLowerUpper() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -206,7 +206,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testWildUpperLower() { + void testWildUpperLower() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -235,7 +235,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { @Test - public void testIntersectionRight() { + void testIntersectionRight() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -256,7 +256,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { @Test - public void testIntersectionLeft() { + void testIntersectionLeft() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -286,7 +286,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testArrayLower() { + void testArrayLower() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); @@ -301,7 +301,7 @@ public class InferenceCtxUnitTests extends BaseTypeInferenceUnitTest { } @Test - public void testArrayUpper() { + void testArrayUpper() { InferenceContext ctx = emptyCtx(); InferenceVar a = newIvar(ctx); From 868883819020b0780313358e00f6132b3e8dc73f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Mon, 3 Oct 2022 16:15:30 +0200 Subject: [PATCH 30/31] Migrate leftover tests to JUnit5 --- .../pmd/lang/apex/ast/ApexCommentTest.java | 8 +- .../multifile/ApexMultifileAnalysisTest.java | 2 +- .../net/sourceforge/pmd/PmdAnalysisTest.java | 12 +- .../pmd/RulesetFactoryTestBase.java | 6 +- .../lang/ast/impl/javacc/CharStreamTest.java | 26 ++-- .../ast/impl/javacc/JavaEscapeReaderTest.java | 20 +-- .../pmd/lang/document/CharsTest.java | 70 +++++----- .../pmd/lang/document/FileLocationTest.java | 12 +- .../document/SourceCodePositionerTest.java | 18 +-- .../pmd/lang/document/TextDocumentTest.java | 83 +++++------ .../lang/document/TextFileContentTest.java | 132 ++++++++---------- .../pmd/lang/document/TextFilesTest.java | 63 ++++----- .../pmd/lang/document/TextPos2dTest.java | 18 +-- .../pmd/lang/document/TextRange2dTest.java | 20 +-- .../pmd/lang/document/TextRegionTest.java | 106 +++++++------- .../pmd/util/CollectionUtilTest.java | 8 +- pmd-dist/pom.xml | 5 + .../it/AbstractBinaryDistributionTest.java | 23 +-- .../net/sourceforge/pmd/it/AllRulesIT.java | 22 ++- .../java/net/sourceforge/pmd/it/AntIT.java | 15 +- .../pmd/it/BinaryDistributionIT.java | 40 +++--- .../sourceforge/pmd/it/ExecutionResult.java | 30 ++-- .../pmd/it/SourceDistributionIT.java | 14 +- .../sourceforge/pmd/it/ZipFileExtractor.java | 2 +- pmd-doc/pom.xml | 5 + .../sourceforge/pmd/docs/EscapeUtilsTest.java | 12 +- .../pmd/docs/RuleDocGeneratorTest.java | 25 ++-- .../pmd/docs/RuleSetResolverTest.java | 12 +- .../pmd/docs/RuleTagCheckerTest.java | 25 ++-- .../pmd/docs/SidebarGeneratorTest.java | 14 +- pmd-gherkin/pom.xml | 5 + .../pmd/cpd/GherkinTokenizerTest.java | 10 +- 32 files changed, 425 insertions(+), 438 deletions(-) diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentTest.java index 9652528256..d0f5c75c4e 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexCommentTest.java @@ -4,11 +4,11 @@ package net.sourceforge.pmd.lang.apex.ast; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class ApexCommentTest extends ApexParserTestBase { +import org.junit.jupiter.api.Test; +class ApexCommentTest extends ApexParserTestBase { @Test public void testContainsComment1() { @@ -18,6 +18,6 @@ public class ApexCommentTest extends ApexParserTestBase { + "}}}"); ASTCatchBlockStatement catchBlock = file.descendants(ASTCatchBlockStatement.class).crossFindBoundaries().firstOrThrow(); - Assert.assertTrue(catchBlock.getContainsComment()); + assertTrue(catchBlock.getContainsComment()); } } diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java index b2b54727e6..c88133f447 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/multifile/ApexMultifileAnalysisTest.java @@ -23,7 +23,7 @@ import net.sourceforge.pmd.util.IOUtil; import com.github.stefanbirkner.systemlambda.SystemLambda; -public class ApexMultifileAnalysisTest { +class ApexMultifileAnalysisTest { @TempDir private Path tempFolder; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/PmdAnalysisTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/PmdAnalysisTest.java index 9ca21e38a8..b47561bc75 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/PmdAnalysisTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/PmdAnalysisTest.java @@ -8,7 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; @@ -83,7 +83,7 @@ public class PmdAnalysisTest { } @Test - public void testParseException() { + void testParseException() { PMDConfiguration config = new PMDConfiguration(); config.setThreads(1); config.setForceLanguageVersion(PmdRunnableTest.getVersionWithParserThatThrowsSemanticError()); @@ -92,13 +92,13 @@ public class PmdAnalysisTest { pmd.files().addSourceFile("file", "some source"); ReportStats stats = pmd.runAndReturnStats(); - assertEquals("Errors", 1, stats.getNumErrors()); - assertEquals("Violations", 0, stats.getNumViolations()); + assertEquals(1, stats.getNumErrors(), "Errors"); + assertEquals(0, stats.getNumViolations(), "Violations"); } } @Test - public void testFileWithSpecificLanguage() { + void testFileWithSpecificLanguage() { final Language language = Dummy2LanguageModule.getInstance(); PMDConfiguration config = new PMDConfiguration(); config.setIgnoreIncrementalAnalysis(true); @@ -117,7 +117,7 @@ public class PmdAnalysisTest { } @Test - public void testTextFileWithSpecificLanguage() { + void testTextFileWithSpecificLanguage() { final Language language = Dummy2LanguageModule.getInstance(); PMDConfiguration config = new PMDConfiguration(); config.setIgnoreIncrementalAnalysis(true); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/RulesetFactoryTestBase.java b/pmd-core/src/test/java/net/sourceforge/pmd/RulesetFactoryTestBase.java index 43bc6f0958..9396ad128f 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/RulesetFactoryTestBase.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/RulesetFactoryTestBase.java @@ -5,7 +5,7 @@ package net.sourceforge.pmd; import static net.sourceforge.pmd.util.CollectionUtil.buildMap; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.any; import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.eq; @@ -32,12 +32,12 @@ import net.sourceforge.pmd.util.internal.xml.SchemaConstants; import net.sourceforge.pmd.util.log.MessageReporter; import net.sourceforge.pmd.util.log.internal.SimpleMessageReporter; -public class RulesetFactoryTestBase { +class RulesetFactoryTestBase { protected MessageReporter mockReporter; @BeforeEach - public void setup() { + void setup() { SimpleMessageReporter reporter = new SimpleMessageReporter(LoggerFactory.getLogger(RulesetFactoryTestBase.class)); mockReporter = spy(reporter); } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/CharStreamTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/CharStreamTest.java index 6e4662e5cd..ff730aec42 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/CharStreamTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/CharStreamTest.java @@ -4,26 +4,26 @@ package net.sourceforge.pmd.lang.ast.impl.javacc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.EOFException; import java.io.IOException; import java.util.Collections; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.DummyLanguageModule; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccTokenDocument.TokenDocumentBehavior; import net.sourceforge.pmd.lang.document.TextDocument; -public class CharStreamTest { +class CharStreamTest { private LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion(); @Test - public void testReadZeroChars() throws IOException { + void testReadZeroChars() throws IOException { CharStream stream = simpleCharStream(""); @@ -34,7 +34,7 @@ public class CharStreamTest { } @Test - public void testMultipleEofReads() throws IOException { + void testMultipleEofReads() throws IOException { CharStream stream = simpleCharStream(""); @@ -45,7 +45,7 @@ public class CharStreamTest { } @Test - public void testReadStuff() throws IOException { + void testReadStuff() throws IOException { CharStream stream = simpleCharStream("abcd"); @@ -58,7 +58,7 @@ public class CharStreamTest { } @Test - public void testReadBacktrack() throws IOException { + void testReadBacktrack() throws IOException { CharStream stream = simpleCharStream("abcd"); @@ -78,7 +78,7 @@ public class CharStreamTest { } @Test - public void testReadBacktrackWithEscapes() throws IOException { + void testReadBacktrackWithEscapes() throws IOException { CharStream stream = javaCharStream("__\\u00a0_\\u00a0_"); @@ -106,7 +106,7 @@ public class CharStreamTest { } @Test - public void testBacktrackTooMuch() throws IOException { + void testBacktrackTooMuch() throws IOException { CharStream stream = simpleCharStream("abcd"); @@ -121,7 +121,7 @@ public class CharStreamTest { } @Test - public void testBacktrackTooMuch2() throws IOException { + void testBacktrackTooMuch2() throws IOException { CharStream stream = simpleCharStream("abcd"); @@ -134,11 +134,11 @@ public class CharStreamTest { } - public CharStream simpleCharStream(String abcd) { + CharStream simpleCharStream(String abcd) { return CharStream.create(TextDocument.readOnlyString(abcd, dummyVersion), TokenDocumentBehavior.DEFAULT); } - public CharStream javaCharStream(String abcd) { + CharStream javaCharStream(String abcd) { return CharStream.create( TextDocument.readOnlyString(abcd, dummyVersion), new TokenDocumentBehavior(Collections.emptyList()) { diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaEscapeReaderTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaEscapeReaderTest.java index 6c0f5ec6e9..a1e8c8faec 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaEscapeReaderTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/impl/javacc/JavaEscapeReaderTest.java @@ -4,27 +4,27 @@ package net.sourceforge.pmd.lang.ast.impl.javacc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.DummyLanguageModule; import net.sourceforge.pmd.lang.document.Chars; import net.sourceforge.pmd.lang.document.TextDocument; -public class JavaEscapeReaderTest { +class JavaEscapeReaderTest { - public TextDocument readString(String input) { + TextDocument readString(String input) { TextDocument intext = TextDocument.readOnlyString(Chars.wrap(input), DummyLanguageModule.getInstance().getDefaultVersion()); return new JavaEscapeTranslator(intext).translateDocument(); } @Test - public void testSimpleRead() throws IOException { + void testSimpleRead() throws IOException { String input = "abcdede"; try (TextDocument r = readString(input)) { @@ -33,7 +33,7 @@ public class JavaEscapeReaderTest { } @Test - public void testNotAnEscape1Read() throws IOException { + void testNotAnEscape1Read() throws IOException { String input = "abc\\dede"; try (TextDocument r = readString(input)) { @@ -42,7 +42,7 @@ public class JavaEscapeReaderTest { } @Test - public void testNotAnEscape1Read2() throws IOException { + void testNotAnEscape1Read2() throws IOException { String input = "abc\\\\\\dede"; try (TextDocument r = readString(input)) { @@ -51,7 +51,7 @@ public class JavaEscapeReaderTest { } @Test - public void testAnEscapeStopAtEnd() throws IOException { + void testAnEscapeStopAtEnd() throws IOException { String input = "abc\\\\\\u00a0dede"; try (TextDocument r = readString(input)) { @@ -60,7 +60,7 @@ public class JavaEscapeReaderTest { } @Test - public void testSeveralEscapes() throws IOException { + void testSeveralEscapes() throws IOException { String input = "abc\\\\\\u00a0d\\uu00a0ede"; try (TextDocument r = readString(input)) { @@ -69,7 +69,7 @@ public class JavaEscapeReaderTest { } @Test - public void testAnEscapeInsideBlock() throws IOException { + void testAnEscapeInsideBlock() throws IOException { String input = "abc\\\\\\u00a0dede\\u00a0"; try (TextDocument r = readString(input)) { diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java index 67b7976579..3b896b97e7 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/CharsTest.java @@ -26,22 +26,22 @@ import net.sourceforge.pmd.util.CollectionUtil; /** * */ -public class CharsTest { +class CharsTest { @Test - public void wrapStringRoundTrip() { + void wrapStringRoundTrip() { String s = "ooo"; assertSame(s, Chars.wrap(s).toString()); } @Test - public void wrapCharsRoundTrip() { + void wrapCharsRoundTrip() { Chars s = Chars.wrap("ooo"); assertSame(s, Chars.wrap(s)); } @Test - public void appendChars() { + void appendChars() { StringBuilder sb = new StringBuilder(); Chars bc = Chars.wrap("abcd").slice(1, 2); assertEquals("bc", bc.toString()); @@ -51,7 +51,7 @@ public class CharsTest { } @Test - public void appendCharsWithOffsets() { + void appendCharsWithOffsets() { StringBuilder sb = new StringBuilder(); Chars bc = Chars.wrap("abcd").slice(1, 2); assertEquals("bc", bc.toString()); @@ -61,7 +61,7 @@ public class CharsTest { } @Test - public void toStringBuilder() { + void toStringBuilder() { Chars bc = Chars.wrap("abcd").slice(1, 2); assertEquals("bc", bc.toString()); @@ -69,7 +69,7 @@ public class CharsTest { } @Test - public void write() throws IOException { + void write() throws IOException { StringWriter writer = new StringWriter(); Chars bc = Chars.wrap("abcd").slice(1, 2); assertEquals("bc", bc.toString()); @@ -82,7 +82,7 @@ public class CharsTest { } @Test - public void getChars() { + void getChars() { char[] arr = new char[4]; Chars bc = Chars.wrap("abcd").slice(1, 2); @@ -97,7 +97,7 @@ public class CharsTest { } @Test - public void indexOf() { + void indexOf() { Chars bc = Chars.wrap("aaaaabcdb").slice(5, 2); // -- assertEquals(0, bc.indexOf('b', 0)); @@ -111,7 +111,7 @@ public class CharsTest { } @Test - public void indexOfString() { + void indexOfString() { Chars bc = Chars.wrap("aaaaabcdb").slice(5, 2); // -- assertEquals(0, bc.indexOf("b", 0)); @@ -136,7 +136,7 @@ public class CharsTest { } @Test - public void lastIndexOf() { + void lastIndexOf() { Chars bc = Chars.wrap("aaaaabcdb").slice(5, 2); // -- assertEquals(0, bc.lastIndexOf('b', 0)); @@ -153,7 +153,7 @@ public class CharsTest { } @Test - public void startsWith() { + void startsWith() { Chars bc = Chars.wrap("abcdb").slice(1, 2); assertTrue(bc.startsWith("bc")); @@ -179,7 +179,7 @@ public class CharsTest { } @Test - public void removeSuffix() { + void removeSuffix() { Chars bc = Chars.wrap("abcdb").slice(1, 2); // -- @@ -195,7 +195,7 @@ public class CharsTest { } @Test - public void removePrefix() { + void removePrefix() { Chars bc = Chars.wrap("abcdb").slice(1, 2); // -- @@ -213,7 +213,7 @@ public class CharsTest { } @Test - public void trimNoop() { + void trimNoop() { Chars bc = Chars.wrap("abcdb").slice(1, 2); assertEquals("bc", bc.toString()); assertEquals("bc", bc.trimStart().toString()); @@ -222,7 +222,7 @@ public class CharsTest { } @Test - public void trimStartAndEnd() { + void trimStartAndEnd() { Chars bc = Chars.wrap("a bc db").slice(1, 6); // ------ assertEquals(" bc ", bc.toString()); @@ -232,7 +232,7 @@ public class CharsTest { } @Test - public void charAt() { + void charAt() { Chars bc = Chars.wrap("a bc db").slice(1, 6); // ------ @@ -245,7 +245,7 @@ public class CharsTest { } @Test - public void linesTest() { + void linesTest() { Chars bc = Chars.wrap("a \n \r\nbc db").slice(1, 9); // ------------ @@ -254,28 +254,28 @@ public class CharsTest { } @Test - public void linesTest2() { + void linesTest2() { Chars bc = Chars.wrap("aa\n"); List lines = CollectionUtil.map(bc.lines(), Chars::toString); assertEquals(listOf("aa"), lines); } @Test - public void linesStreamTest() { + void linesStreamTest() { Chars bc = Chars.wrap("aa\nb\rded\r\nlff"); List lines = bc.lineStream().map(Chars::toString).collect(Collectors.toList()); assertEquals(listOf("aa", "b", "ded", "lff"), lines); } @Test - public void linesTest3WithCr() { + void linesTest3WithCr() { Chars bc = Chars.wrap("aa\rb"); List lines = CollectionUtil.map(bc.lines(), Chars::toString); assertEquals(listOf("aa", "b"), lines); } @Test - public void testEqualsHashCode() { + void testEqualsHashCode() { Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5); @@ -292,7 +292,7 @@ public class CharsTest { } @Test - public void testContentEquals() { + void testContentEquals() { Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5); @@ -308,7 +308,7 @@ public class CharsTest { } @Test - public void testSlice() { + void testSlice() { // slice is offset + length Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5); // ----- @@ -318,7 +318,7 @@ public class CharsTest { } @Test - public void testSubsequence() { + void testSubsequence() { // subsequence is start + end Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5); // ----- @@ -328,7 +328,7 @@ public class CharsTest { } @Test - public void testSubstring() { + void testSubstring() { // substring is start + end Chars chars = Chars.wrap("a_a_b_c_s").slice(2, 5); // ----- @@ -339,7 +339,7 @@ public class CharsTest { @Test - public void testTrimBlankLines() { + void testTrimBlankLines() { assertTrimBlankLinesEquals(" \n \n abc \n \n de \n \n ", " abc \n \n de "); assertTrimBlankLinesEquals("", ""); @@ -352,7 +352,7 @@ public class CharsTest { @Test - public void testReaderSingleChars() throws IOException { + void testReaderSingleChars() throws IOException { Chars bc = Chars.wrap("a \n \r\nbc db").slice(1, 9); // ------------ @@ -371,7 +371,7 @@ public class CharsTest { } @Test - public void testReaderBuffer() throws IOException { + void testReaderBuffer() throws IOException { Chars bc = Chars.wrap("a \n \r\nbc db").slice(1, 9); // ------------ @@ -389,7 +389,7 @@ public class CharsTest { } @Test - public void testReaderSlicedBuffer() throws IOException { + void testReaderSlicedBuffer() throws IOException { Chars bc = Chars.wrap("a \n \r\nbc db").slice(1, 9); // ------------ @@ -408,7 +408,7 @@ public class CharsTest { } @Test - public void testReadClosed() throws IOException { + void testReadClosed() throws IOException { Chars bc = Chars.wrap("a \n \r\nbc db").slice(1, 9); // ------------ @@ -418,7 +418,7 @@ public class CharsTest { } @Test - public void testReaderMark() throws IOException { + void testReaderMark() throws IOException { Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9); // ------------ @@ -448,7 +448,7 @@ public class CharsTest { } @Test - public void testReaderMissingMark() throws IOException { + void testReaderMissingMark() throws IOException { Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9); // ------------ @@ -461,7 +461,7 @@ public class CharsTest { } @Test - public void testReaderSkip() throws IOException { + void testReaderSkip() throws IOException { Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9); // ------------ @@ -485,7 +485,7 @@ public class CharsTest { } @Test - public void testReaderInvalidParams() throws IOException { + void testReaderInvalidParams() throws IOException { Chars bc = Chars.wrap("abcdefghijklmnop").slice(1, 9); // ------------ char[] cbuf = new char[4]; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java index a583a70adc..e3d90fb99b 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/FileLocationTest.java @@ -5,18 +5,18 @@ package net.sourceforge.pmd.lang.document; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Test; /** * @author Clément Fournier */ -public class FileLocationTest { +class FileLocationTest { @Test - public void testSimple() { + void testSimple() { FileLocation loc = FileLocation.range("fname", TextRange2d.range2d(1, 1, 1, 2)); assertEquals("fname", loc.getFileName()); assertEquals(1, loc.getStartLine()); @@ -26,14 +26,14 @@ public class FileLocationTest { } @Test - public void testToRange() { + void testToRange() { TextRange2d range2d = TextRange2d.range2d(1, 1, 1, 2); FileLocation loc = FileLocation.range("fname", range2d); assertEquals(range2d, loc.toRange2d()); } @Test - public void testToString() { + void testToString() { FileLocation loc = FileLocation.range("fname", TextRange2d.range2d(1, 1, 1, 2)); assertEquals( @@ -45,7 +45,7 @@ public class FileLocationTest { loc.startPosToStringWithFile() ); - MatcherAssert.assertThat(loc.toString(), containsString("!debug only!")); + assertThat(loc.toString(), containsString("!debug only!")); } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java index 5b7c2dc7aa..7a48aced91 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/SourceCodePositionerTest.java @@ -12,10 +12,10 @@ import org.junit.jupiter.api.Test; /** * Unit test for {@link SourceCodePositioner}. */ -public class SourceCodePositionerTest { +class SourceCodePositionerTest { @Test - public void testLineNumberFromOffset() { + void testLineNumberFromOffset() { final String source = "abcd\ndefghi\n\rjklmn\ropq"; SourceCodePositioner positioner = SourceCodePositioner.create(source); @@ -48,7 +48,7 @@ public class SourceCodePositionerTest { } @Test - public void testOffsetFromLineColumn() { + void testOffsetFromLineColumn() { final String source = "abcd\ndefghi\r\njklmn\nopq"; SourceCodePositioner positioner = SourceCodePositioner.create(source); @@ -71,7 +71,7 @@ public class SourceCodePositionerTest { @Test - public void testWrongOffsets() { + void testWrongOffsets() { final String source = "abcd\ndefghi\r\njklmn\nopq"; SourceCodePositioner positioner = SourceCodePositioner.create(source); @@ -89,7 +89,7 @@ public class SourceCodePositionerTest { @Test - public void testEmptyDocument() { + void testEmptyDocument() { SourceCodePositioner positioner = SourceCodePositioner.create(""); @@ -105,7 +105,7 @@ public class SourceCodePositionerTest { } @Test - public void testDocumentStartingWithNl() { + void testDocumentStartingWithNl() { SourceCodePositioner positioner = SourceCodePositioner.create("\n"); @@ -121,7 +121,7 @@ public class SourceCodePositionerTest { @Test - public void lineToOffsetMappingWithLineFeedShouldSucceed() { + void lineToOffsetMappingWithLineFeedShouldSucceed() { final String code = "public static int main(String[] args) {\n" + "int var;\n" + "}"; @@ -132,7 +132,7 @@ public class SourceCodePositionerTest { } @Test - public void lineToOffsetMappingWithCarriageReturnFeedLineFeedShouldSucceed() { + void lineToOffsetMappingWithCarriageReturnFeedLineFeedShouldSucceed() { final String code = "public static int main(String[] args) {\r\n" + "int var;\r\n" + "}"; @@ -143,7 +143,7 @@ public class SourceCodePositionerTest { } @Test - public void lineToOffsetMappingWithMixedLineSeparatorsShouldSucceed() { + void lineToOffsetMappingWithMixedLineSeparatorsShouldSucceed() { final String code = "public static int main(String[] args) {\r\n" + "int var;\n" + "}"; diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java index 78e85c4503..08e3edab7a 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextDocumentTest.java @@ -6,26 +6,23 @@ package net.sourceforge.pmd.lang.document; import static net.sourceforge.pmd.PmdCoreTestUtils.dummyVersion; import static net.sourceforge.pmd.lang.document.TextPos2d.pos2d; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import net.sourceforge.pmd.lang.DummyLanguageModule; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.util.IOUtil; -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; - -@RunWith(JUnitParamsRunner.class) -public class TextDocumentTest { +class TextDocumentTest { @Test - public void testSingleLineRegion() { + void testSingleLineRegion() { TextDocument doc = TextDocument.readOnlyString("bonjour\ntristesse", dummyVersion()); TextRegion region = TextRegion.fromOffsetLength(0, "bonjour".length()); @@ -44,7 +41,7 @@ public class TextDocumentTest { } @Test - public void testRegionAtEol() { + void testRegionAtEol() { TextDocument doc = TextDocument.readOnlyString("bonjour\ntristesse", dummyVersion()); TextRegion region = TextRegion.fromOffsetLength(0, "bonjour\n".length()); @@ -59,7 +56,7 @@ public class TextDocumentTest { } @Test - public void testEmptyRegionAtEol() { + void testEmptyRegionAtEol() { TextDocument doc = TextDocument.readOnlyString("bonjour\ntristesse", dummyVersion()); // ^ The caret position right after the \n // We consider it's part of the next line @@ -76,7 +73,7 @@ public class TextDocumentTest { } @Test - public void testRegionForEol() { + void testRegionForEol() { TextDocument doc = TextDocument.readOnlyString("bonjour\ntristesse", dummyVersion()); // [ [ The region containing the \n // We consider it ends on the same line, not the next one @@ -94,7 +91,7 @@ public class TextDocumentTest { } @Test - public void testRegionAtEndOfFile() { + void testRegionAtEndOfFile() { TextDocument doc = TextDocument.readOnlyString("flemme", dummyVersion()); TextRegion region = TextRegion.fromOffsetLength(0, doc.getLength()); @@ -109,7 +106,7 @@ public class TextDocumentTest { } @Test - public void testMultiLineRegion() { + void testMultiLineRegion() { TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion()); TextRegion region = TextRegion.fromOffsetLength("bonjou".length(), "r\noha\ntri".length()); @@ -128,7 +125,7 @@ public class TextDocumentTest { @Test - public void testLineColumnFromOffset() { + void testLineColumnFromOffset() { TextDocument doc = TextDocument.readOnlyString("ab\ncd\n", dummyVersion()); assertPos2dEqualsAt(doc, 0, "a", pos2d(1, 1), true); @@ -151,7 +148,7 @@ public class TextDocumentTest { } @Test - public void testEmptyRegion() { + void testEmptyRegion() { TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion()); TextRegion region = TextRegion.fromOffsetLength("bonjour".length(), 0); @@ -170,7 +167,7 @@ public class TextDocumentTest { @Test - public void testLineRange() { + void testLineRange() { TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion()); assertEquals(Chars.wrap("bonjour\n"), doc.sliceTranslatedText(doc.createLineRange(1, 1))); @@ -182,46 +179,40 @@ public class TextDocumentTest { assertThrows(IndexOutOfBoundsException.class, () -> doc.createLineRange(0, 2)); } - @Test - @Parameters(source = DocumentsProvider.class) - public void testEntireRegion(TextDocument doc) { - assertEquals("getEntireRegion should return something based on length", - TextRegion.fromOffsetLength(0, doc.getLength()), - doc.getEntireRegion()); + @ParameterizedTest + @MethodSource("documentProvider") + void testEntireRegion(TextDocument doc) { + assertEquals(TextRegion.fromOffsetLength(0, doc.getLength()), + doc.getEntireRegion(), + "getEntireRegion should return something based on length"); } - @Test - @Parameters(source = DocumentsProvider.class) - public void testReader(TextDocument doc) throws IOException { + @ParameterizedTest + @MethodSource("documentProvider") + void testReader(TextDocument doc) throws IOException { - assertEquals("NewReader should read the text", - doc.getText().toString(), - IOUtil.readToString(doc.newReader()) - ); + assertEquals(doc.getText().toString(), + IOUtil.readToString(doc.newReader()), + "NewReader should read the text"); } @Test - public void testRegionOutOfBounds() { + void testRegionOutOfBounds() { TextDocument doc = TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion()); assertThrows(AssertionError.class, () -> TextRegion.isValidRegion(0, 40, doc)); } - // for junit params runner - public static final class DocumentsProvider { - - - @SuppressWarnings("resource") - public static Object[] provideParameters() { - LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion(); - return new TextDocument[] { - TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion), - TextDocument.readOnlyString("bonjour\n", dummyVersion), - TextDocument.readOnlyString("\n", dummyVersion), - TextDocument.readOnlyString("", dummyVersion), - }; - } + @SuppressWarnings("resource") + static Object[] documentProvider() { + LanguageVersion dummyVersion = DummyLanguageModule.getInstance().getDefaultVersion(); + return new TextDocument[] { + TextDocument.readOnlyString("bonjour\noha\ntristesse", dummyVersion), + TextDocument.readOnlyString("bonjour\n", dummyVersion), + TextDocument.readOnlyString("\n", dummyVersion), + TextDocument.readOnlyString("", dummyVersion), + }; } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java index 136a9f4f5f..6773dbfd64 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFileContentTest.java @@ -4,137 +4,132 @@ package net.sourceforge.pmd.lang.document; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringReader; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; - -@RunWith(JUnitParamsRunner.class) -public class TextFileContentTest { +class TextFileContentTest { // in real life it's System.lineSeparator() // to make the class more testable (and avoid some test failures being hidden depending on the platform), // we use this dummy value private static final String LINESEP_SENTINEL = ":fallback:"; - @Rule - public ExpectedException expect = ExpectedException.none(); - - @Test - @Parameters(source = TextContentOrigin.class) - public void testMixedDelimiters(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testMixedDelimiters(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("a\r\nb\n\rc"); - Assert.assertEquals(Chars.wrap("a\nb\n\nc"), content.getNormalizedText()); - Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); + assertEquals(Chars.wrap("a\nb\n\nc"), content.getNormalizedText()); + assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testFormFeedIsNotNewline(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testFormFeedIsNotNewline(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("a\f\nb\nc"); - Assert.assertEquals(Chars.wrap("a\f\nb\nc"), content.getNormalizedText()); - Assert.assertEquals("\n", content.getLineTerminator()); + assertEquals(Chars.wrap("a\f\nb\nc"), content.getNormalizedText()); + assertEquals("\n", content.getLineTerminator()); } @Test - public void testNormTextPreservation() { + void testNormTextPreservation() { Chars input = Chars.wrap("a\nb\nc"); TextFileContent content = TextFileContent.fromCharSeq(input); - Assert.assertSame(input, content.getNormalizedText()); - Assert.assertEquals("\n", content.getLineTerminator()); + assertSame(input, content.getNormalizedText()); + assertEquals("\n", content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testBomElimination(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testBomElimination(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("\ufeffabc"); Chars normalizedText = content.getNormalizedText(); - Assert.assertEquals(Chars.wrap("abc"), normalizedText); + assertEquals(Chars.wrap("abc"), normalizedText); // This means the string underlying the Chars does not start with the bom marker. // It's useful for performance to have `textDocument.getText().toString()` be O(1), // and not create a new string. - Assert.assertTrue("should be full string", normalizedText.isFullString()); - Assert.assertSame(normalizedText.toString(), normalizedText.toString()); + assertTrue(normalizedText.isFullString(), "should be full string"); + assertSame(normalizedText.toString(), normalizedText.toString()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testNoExplicitLineMarkers(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testNoExplicitLineMarkers(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("a"); - Assert.assertEquals(Chars.wrap("a"), content.getNormalizedText()); - Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); + assertEquals(Chars.wrap("a"), content.getNormalizedText()); + assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testEmptyFile(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testEmptyFile(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize(""); - Assert.assertEquals(Chars.wrap(""), content.getNormalizedText()); - Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); + assertEquals(Chars.wrap(""), content.getNormalizedText()); + assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); } @Test - public void testCrlfSplitOnBuffer() throws IOException { + void testCrlfSplitOnBuffer() throws IOException { StringReader reader = new StringReader("a\r\nb"); // now the buffer is of size 2, so we read first [a\r] then [\nb] // but there is a single line TextFileContent content = TextFileContent.normalizingRead(reader, 2, System.lineSeparator()); - Assert.assertEquals(Chars.wrap("a\nb"), content.getNormalizedText()); - Assert.assertEquals("\r\n", content.getLineTerminator()); + assertEquals(Chars.wrap("a\nb"), content.getNormalizedText()); + assertEquals("\r\n", content.getLineTerminator()); } @Test - public void testCrSplitOnBufferFp() throws IOException { + void testCrSplitOnBufferFp() throws IOException { StringReader reader = new StringReader("a\rb\n"); // the buffer is of size 2, so we read first [a\r] then [b\n] // the \r is a line terminator on its own TextFileContent content = TextFileContent.normalizingRead(reader, 2, LINESEP_SENTINEL); - Assert.assertEquals(Chars.wrap("a\nb\n"), content.getNormalizedText()); - Assert.assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); + assertEquals(Chars.wrap("a\nb\n"), content.getNormalizedText()); + assertEquals(LINESEP_SENTINEL, content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testCrCr(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testCrCr(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("a\r\rb"); - Assert.assertEquals(Chars.wrap("a\n\nb"), content.getNormalizedText()); - Assert.assertEquals("\r", content.getLineTerminator()); + assertEquals(Chars.wrap("a\n\nb"), content.getNormalizedText()); + assertEquals("\r", content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testCrIsEol(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testCrIsEol(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("a\rb\rdede"); - Assert.assertEquals(Chars.wrap("a\nb\ndede"), content.getNormalizedText()); - Assert.assertEquals("\r", content.getLineTerminator()); + assertEquals(Chars.wrap("a\nb\ndede"), content.getNormalizedText()); + assertEquals("\r", content.getLineTerminator()); } - @Test - @Parameters(source = TextContentOrigin.class) - public void testLfAtStartOfFile(TextContentOrigin origin) throws IOException { + @ParameterizedTest + @EnumSource + void testLfAtStartOfFile(TextContentOrigin origin) throws IOException { TextFileContent content = origin.normalize("\nohio"); - Assert.assertEquals(Chars.wrap("\nohio"), content.getNormalizedText()); - Assert.assertEquals("\n", content.getLineTerminator()); + assertEquals(Chars.wrap("\nohio"), content.getNormalizedText()); + assertEquals("\n", content.getLineTerminator()); } @Test - public void testCrCrSplitBuffer() throws IOException { + void testCrCrSplitBuffer() throws IOException { StringReader reader = new StringReader("a\r\r"); // the buffer is of size 2, so we read first [a\r] then [\ro] // the \r is not a line terminator though TextFileContent content = TextFileContent.normalizingRead(reader, 2, LINESEP_SENTINEL); - Assert.assertEquals(Chars.wrap("a\n\n"), content.getNormalizedText()); - Assert.assertEquals("\r", content.getLineTerminator()); + assertEquals(Chars.wrap("a\n\n"), content.getNormalizedText()); + assertEquals("\r", content.getLineTerminator()); } enum TextContentOrigin { @@ -164,10 +159,5 @@ public class TextFileContentTest { }; abstract TextFileContent normalize(String input) throws IOException; - - // for junitParams - public static Object[] provideParameters() { - return values(); - } } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java index 0d0effe48b..e76b2870b9 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextFilesTest.java @@ -5,12 +5,12 @@ package net.sourceforge.pmd.lang.document; import static net.sourceforge.pmd.PmdCoreTestUtils.dummyVersion; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.BufferedWriter; import java.io.IOException; @@ -20,22 +20,21 @@ import java.nio.file.Files; import java.nio.file.Path; import org.checkerframework.checker.nullness.qual.NonNull; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import net.sourceforge.pmd.PMDConfiguration; import net.sourceforge.pmd.lang.DummyLanguageModule; import net.sourceforge.pmd.util.datasource.DataSource; import net.sourceforge.pmd.util.datasource.FileDataSource; -public class TextFilesTest { +class TextFilesTest { - @Rule - public TemporaryFolder tempDir = TemporaryFolder.builder().build(); + @TempDir + Path tempDir; @Test - public void testNioFile() throws IOException { + void testNioFile() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { assertEquals(file.toAbsolutePath().toString(), tf.getPathId()); @@ -46,7 +45,7 @@ public class TextFilesTest { } @Test - public void testEquals() throws IOException { + void testEquals() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content").toAbsolutePath(); try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { try (TextFile tfPrime = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { @@ -71,7 +70,7 @@ public class TextFilesTest { } @Test - public void testStringDataSourceCompat() throws IOException { + void testStringDataSourceCompat() throws IOException { DataSource ds = DataSource.forString("text", "filename.dummy"); PMDConfiguration config = new PMDConfiguration(); try (TextFile tf = TextFile.dataSourceCompat(ds, config)) { @@ -83,7 +82,7 @@ public class TextFilesTest { } @Test - public void testFileDataSourceCompat() throws IOException { + void testFileDataSourceCompat() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); DataSource ds = new FileDataSource(file.toFile()); @@ -97,7 +96,7 @@ public class TextFilesTest { } @Test - public void testFileDataSourceCompatWithEncoding() throws IOException { + void testFileDataSourceCompatWithEncoding() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_16BE, "some content"); DataSource ds = new FileDataSource(file.toFile()); @@ -116,11 +115,11 @@ public class TextFilesTest { } @Test - public void testNioFileWrite() throws IOException { + void testNioFileWrite() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText()); - assertFalse("readonly", tf.isReadOnly()); + assertFalse(tf.isReadOnly(), "readonly"); // write with CRLF tf.writeContents( @@ -142,11 +141,11 @@ public class TextFilesTest { } @Test - public void testNioFileExplicitReadOnly() throws IOException { + void testNioFileExplicitReadOnly() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); try (TextFile tf = TextFile.builderForPath(file, StandardCharsets.UTF_8, dummyVersion()) .asReadOnly().build()) { - assertTrue("readonly", tf.isReadOnly()); + assertTrue(tf.isReadOnly(), "readonly"); assertThrows(ReadOnlyFileException.class, () -> tf.writeContents( TextFileContent.fromCharSeq("new content") @@ -155,7 +154,7 @@ public class TextFilesTest { } @Test - public void testNioFileCanBeReadMultipleTimes() throws IOException { + void testNioFileCanBeReadMultipleTimes() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { assertEquals(Chars.wrap("some content"), tf.readContents().getNormalizedText()); @@ -164,7 +163,7 @@ public class TextFilesTest { } @Test - public void testNioFileBuilder() throws IOException { + void testNioFileBuilder() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some content"); try (TextFile tf = TextFile.builderForPath(file, StandardCharsets.UTF_8, dummyVersion()) .withDisplayName("aname") @@ -177,7 +176,7 @@ public class TextFilesTest { } @Test - public void testNioFileEscape() throws IOException { + void testNioFileEscape() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent"); try (TextFile tf = TextFile.forPath(file, StandardCharsets.UTF_8, dummyVersion())) { assertEquals(Chars.wrap("some\ncontent"), tf.readContents().getNormalizedText()); @@ -185,7 +184,7 @@ public class TextFilesTest { } @Test - public void testReaderFile() throws IOException { + void testReaderFile() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent"); try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion())) { assertEquals("filename", tf.getPathId()); @@ -196,10 +195,10 @@ public class TextFilesTest { } @Test - public void testReaderFileIsReadOnly() throws IOException { + void testReaderFileIsReadOnly() throws IOException { Path file = makeTmpFile(StandardCharsets.UTF_8, "some\r\ncontent"); try (TextFile tf = TextFile.forReader(Files.newBufferedReader(file, StandardCharsets.UTF_8), "filename", dummyVersion())) { - assertTrue("readonly", tf.isReadOnly()); + assertTrue(tf.isReadOnly(), "readonly"); assertThrows(ReadOnlyFileException.class, () -> tf.writeContents( TextFileContent.fromCharSeq("new content") )); @@ -207,7 +206,7 @@ public class TextFilesTest { } @Test - public void testStringFileEscape() throws IOException { + void testStringFileEscape() throws IOException { try (TextFile tf = TextFile.forCharSeq("cont\r\nents", "filename", dummyVersion())) { assertEquals("filename", tf.getPathId()); assertEquals("filename", tf.getDisplayName()); @@ -220,7 +219,7 @@ public class TextFilesTest { } @Test - public void testStringFileCanBeReadMultipleTimes() throws IOException { + void testStringFileCanBeReadMultipleTimes() throws IOException { try (TextFile tf = TextFile.forCharSeq("contents", "filename", dummyVersion())) { assertEquals(Chars.wrap("contents"), tf.readContents().getNormalizedText()); assertEquals(Chars.wrap("contents"), tf.readContents().getNormalizedText()); @@ -229,9 +228,9 @@ public class TextFilesTest { } @Test - public void testStringFileIsReadonly() throws IOException { + void testStringFileIsReadonly() throws IOException { try (TextFile tf = TextFile.forCharSeq("contents", "filename", dummyVersion())) { - assertTrue("readonly", tf.isReadOnly()); + assertTrue(tf.isReadOnly(), "readonly"); assertThrows(ReadOnlyFileException.class, () -> tf.writeContents( TextFileContent.fromCharSeq("new content") )); @@ -239,7 +238,7 @@ public class TextFilesTest { } private @NonNull Path makeTmpFile(Charset charset, String content) throws IOException { - Path file = tempDir.newFile().toPath(); + Path file = Files.createTempFile(tempDir, null, null); try (BufferedWriter writer = Files.newBufferedWriter(file, charset)) { writer.write(content); } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java index 7b4e6165f9..fec89d5b21 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextPos2dTest.java @@ -5,19 +5,19 @@ package net.sourceforge.pmd.lang.document; import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.hamcrest.MatcherAssert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Clément Fournier */ -public class TextPos2dTest { +class TextPos2dTest { @Test - public void testToString() { + void testToString() { TextPos2d pos = TextPos2d.pos2d(1, 2); assertEquals( "line 1, column 2", @@ -31,11 +31,11 @@ public class TextPos2dTest { "(line=1, column=2)", pos.toTupleString() ); - MatcherAssert.assertThat(pos.toString(), containsString("!debug only!")); + assertThat(pos.toString(), containsString("!debug only!")); } @Test - public void testEquals() { + void testEquals() { TextPos2d pos = TextPos2d.pos2d(1, 1); TextPos2d pos2 = TextPos2d.pos2d(1, 2); assertNotEquals(pos, pos2); @@ -44,7 +44,7 @@ public class TextPos2dTest { } @Test - public void testCompareTo() { + void testCompareTo() { TextPos2d pos = TextPos2d.pos2d(1, 1); TextPos2d pos2 = TextPos2d.pos2d(1, 2); TextPos2d pos3 = TextPos2d.pos2d(2, 1); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java index ed5f067fd8..4f9df557c2 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRange2dTest.java @@ -5,26 +5,26 @@ package net.sourceforge.pmd.lang.document; import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import org.hamcrest.MatcherAssert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Clément Fournier */ -public class TextRange2dTest { +class TextRange2dTest { @Test - public void testCtors() { + void testCtors() { TextRange2d pos = TextRange2d.range2d(1, 2, 3, 4); TextRange2d pos2 = TextRange2d.range2d(TextPos2d.pos2d(1, 2), TextPos2d.pos2d(3, 4)); assertEquals(pos, pos2); } @Test - public void testEquals() { + void testEquals() { TextRange2d pos = TextRange2d.range2d(1, 1, 1, 1); TextRange2d pos2 = TextRange2d.range2d(1, 1, 1, 2); assertNotEquals(pos, pos2); @@ -33,7 +33,7 @@ public class TextRange2dTest { } @Test - public void testCompareTo() { + void testCompareTo() { TextRange2d pos = TextRange2d.range2d(1, 1, 1, 1); TextRange2d pos2 = TextRange2d.range2d(1, 1, 1, 2); @@ -43,13 +43,13 @@ public class TextRange2dTest { } @Test - public void testToString() { + void testToString() { TextRange2d range = TextRange2d.range2d(1, 2, 3, 4); assertEquals( "1:2-3:4", range.toDisplayStringWithColon() ); - MatcherAssert.assertThat(range.toString(), containsString("!debug only!")); + assertThat(range.toString(), containsString("!debug only!")); } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java index 33e4b56a29..3f989a9435 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/document/TextRegionTest.java @@ -4,37 +4,33 @@ package net.sourceforge.pmd.lang.document; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; -public class TextRegionTest { - - @Rule - public ExpectedException expect = ExpectedException.none(); +class TextRegionTest { @Test - public void testIsEmpty() { + void testIsEmpty() { TextRegion r = TextRegion.fromOffsetLength(0, 0); assertTrue(r.isEmpty()); } @Test - public void testEmptyContains() { + void testEmptyContains() { TextRegion r1 = TextRegion.fromOffsetLength(0, 0); assertFalse(r1.contains(0)); } @Test - public void testContains() { + void testContains() { TextRegion r1 = TextRegion.fromOffsetLength(1, 2); assertFalse(r1.contains(0)); @@ -44,7 +40,7 @@ public class TextRegionTest { } @Test - public void testIntersectZeroLen() { + void testIntersectZeroLen() { // r1: [[----- // r2: [ -----[ TextRegion r1 = TextRegion.fromOffsetLength(0, 0); @@ -56,7 +52,7 @@ public class TextRegionTest { } @Test - public void testIntersectZeroLen2() { + void testIntersectZeroLen2() { // r1: -----[[ // r2: [-----[ TextRegion r1 = TextRegion.fromOffsetLength(5, 0); @@ -68,7 +64,7 @@ public class TextRegionTest { } @Test - public void testIntersectZeroLen3() { + void testIntersectZeroLen3() { // r1: -- -[---[ // r2: --[-[--- TextRegion r1 = TextRegion.fromOffsetLength(3, 3); @@ -82,7 +78,7 @@ public class TextRegionTest { @Test - public void testIntersectZeroLen4() { + void testIntersectZeroLen4() { TextRegion r1 = TextRegion.fromOffsetLength(0, 0); TextRegion inter = doIntersect(r1, r1); @@ -91,7 +87,7 @@ public class TextRegionTest { } @Test - public void testNonEmptyIntersect() { + void testNonEmptyIntersect() { // r1: ---[-- --[ // r2: [--- --[-- // i: ---[--[-- @@ -104,7 +100,7 @@ public class TextRegionTest { } @Test - public void testIntersectContained() { + void testIntersectContained() { // r1: --[- - ---[ // r2: -- -[-[--- // i: -- -[-[--- @@ -117,7 +113,7 @@ public class TextRegionTest { } @Test - public void testIntersectDisjoint() { + void testIntersectDisjoint() { // r1: -- -[---[ // r2: --[-[--- TextRegion r1 = TextRegion.fromOffsetLength(4, 3); @@ -127,7 +123,7 @@ public class TextRegionTest { } @Test - public void testOverlapContained() { + void testOverlapContained() { // r1: --[- - ---[ // r2: -- -[-[--- // i: -- -[-[--- @@ -138,7 +134,7 @@ public class TextRegionTest { } @Test - public void testOverlapDisjoint() { + void testOverlapDisjoint() { // r1: -- -[---[ // r2: --[-[--- TextRegion r1 = TextRegion.fromOffsetLength(4, 3); @@ -149,7 +145,7 @@ public class TextRegionTest { @Test - public void testOverlapBoundary() { + void testOverlapBoundary() { // r1: -- -[---[ // r2: --[-[--- TextRegion r1 = TextRegion.fromOffsetLength(3, 3); @@ -159,7 +155,7 @@ public class TextRegionTest { } @Test - public void testCompare() { + void testCompare() { // r1: --[-[--- // r2: -- -[---[ TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -169,7 +165,7 @@ public class TextRegionTest { } @Test - public void testCompareSameOffset() { + void testCompareSameOffset() { // r1: [-[-- // r2: [- --[ TextRegion r1 = TextRegion.fromOffsetLength(0, 1); @@ -180,7 +176,7 @@ public class TextRegionTest { @Test - public void testUnion() { + void testUnion() { // r1: --[-[--- // r2: -- -[---[ TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -192,7 +188,7 @@ public class TextRegionTest { } @Test - public void testUnionDisjoint() { + void testUnionDisjoint() { // r1: --[-[- --- // r2: -- ---[---[ TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -204,7 +200,7 @@ public class TextRegionTest { } @Test - public void testGrowLeft() { + void testGrowLeft() { // r1: --[-[- // r2: [-- -[- TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -215,7 +211,7 @@ public class TextRegionTest { } @Test - public void testGrowLeftNegative() { + void testGrowLeftNegative() { // r1: --[- [- // r2: -- -[[- TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -226,16 +222,15 @@ public class TextRegionTest { } @Test - public void testGrowLeftOutOfBounds() { + void testGrowLeftOutOfBounds() { // r1: --[-[- TextRegion r1 = TextRegion.fromOffsetLength(2, 1); - expect.expect(AssertionError.class); - r1.growLeft(4); + assertThrows(AssertionError.class, () -> r1.growLeft(4)); } @Test - public void testGrowRight() { + void testGrowRight() { // r1: --[-[- // r2: --[- -[ TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -246,7 +241,7 @@ public class TextRegionTest { } @Test - public void testGrowRightNegative() { + void testGrowRightNegative() { // r1: --[ -[- // r2: --[[- - TextRegion r1 = TextRegion.fromOffsetLength(2, 1); @@ -257,39 +252,38 @@ public class TextRegionTest { } @Test - public void testGrowRightOutOfBounds() { + void testGrowRightOutOfBounds() { // r1: --[-[- TextRegion r1 = TextRegion.fromOffsetLength(2, 1); - expect.expect(AssertionError.class); - r1.growRight(-2); + assertThrows(AssertionError.class, () -> r1.growRight(-2)); } - public void assertRegionEquals(TextRegion region, int start, int len) { - assertEquals("Start offset", start, region.getStartOffset()); - assertEquals("Length", len, region.getLength()); + private static void assertRegionEquals(TextRegion region, int start, int len) { + assertEquals(start, region.getStartOffset(), "Start offset"); + assertEquals(len, region.getLength(), "Length"); } - public void assertIsBefore(TextRegion r1, TextRegion r2) { - assertTrue("Region " + r1 + " should be before " + r2, r1.compareTo(r2) < 0); - assertTrue("Region " + r2 + " should be after " + r1, r2.compareTo(r1) > 0); + private static void assertIsBefore(TextRegion r1, TextRegion r2) { + assertTrue(r1.compareTo(r2) < 0, "Region " + r1 + " should be before " + r2); + assertTrue(r2.compareTo(r1) > 0, "Region " + r2 + " should be after " + r1); } - private void assertNoOverlap(TextRegion r1, TextRegion r2) { - assertFalse("Regions " + r1 + " and " + r2 + " should not overlap", r1.overlaps(r2)); + private static void assertNoOverlap(TextRegion r1, TextRegion r2) { + assertFalse(r1.overlaps(r2), "Regions " + r1 + " and " + r2 + " should not overlap"); } - private void assertOverlap(TextRegion r1, TextRegion r2) { - assertTrue("Regions " + r1 + " and " + r2 + " should overlap", r1.overlaps(r2)); + private static void assertOverlap(TextRegion r1, TextRegion r2) { + assertTrue(r1.overlaps(r2), "Regions " + r1 + " and " + r2 + " should overlap"); } private TextRegion doIntersect(TextRegion r1, TextRegion r2) { TextRegion inter = TextRegion.intersect(r1, r2); - assertNotNull("Intersection of " + r1 + " and " + r2 + " must exist", inter); + assertNotNull(inter, "Intersection of " + r1 + " and " + r2 + " must exist"); TextRegion symmetric = TextRegion.intersect(r2, r1); - assertEquals("Intersection of " + r1 + " and " + r2 + " must be symmetric", inter, symmetric); + assertEquals(inter, symmetric, "Intersection of " + r1 + " and " + r2 + " must be symmetric"); return inter; } @@ -297,20 +291,20 @@ public class TextRegionTest { private TextRegion doUnion(TextRegion r1, TextRegion r2) { TextRegion union = TextRegion.union(r1, r2); - assertTrue("Union of " + r1 + " and " + r2 + " must contain first region", union.contains(r1)); - assertTrue("Union of " + r1 + " and " + r2 + " must contain second region", union.contains(r2)); + assertTrue(union.contains(r1), "Union of " + r1 + " and " + r2 + " must contain first region"); + assertTrue(union.contains(r2), "Union of " + r1 + " and " + r2 + " must contain second region"); TextRegion symmetric = TextRegion.union(r2, r1); - assertEquals("Union of " + r1 + " and " + r2 + " must be symmetric", union, symmetric); + assertEquals(union, symmetric, "Union of " + r1 + " and " + r2 + " must be symmetric"); return union; } private void noIntersect(TextRegion r1, TextRegion r2) { TextRegion inter = TextRegion.intersect(r1, r2); - assertNull("Intersection of " + r1 + " and " + r2 + " must not exist", inter); + assertNull(inter, "Intersection of " + r1 + " and " + r2 + " must not exist"); TextRegion symmetric = TextRegion.intersect(r2, r1); - assertEquals("Intersection of " + r1 + " and " + r2 + " must be symmetric", inter, symmetric); + assertEquals(inter, symmetric, "Intersection of " + r1 + " and " + r2 + " must be symmetric"); } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java index 08234fe50c..d64e633066 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/util/CollectionUtilTest.java @@ -5,22 +5,22 @@ package net.sourceforge.pmd.util; import static net.sourceforge.pmd.util.CollectionUtil.listOf; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Collections; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.document.Chars; /** * @author Clément Fournier */ -public class CollectionUtilTest { +class CollectionUtilTest { @Test - public void testJoinOn() { + void testJoinOn() { testJoinOn(listOf("a", "b", "c"), ".", "a.b.c"); testJoinOn(Collections.emptyList(), ".", diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 2f2062dd91..fea824a7f1 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -281,6 +281,11 @@ commons-lang3 + + org.junit.jupiter + junit-jupiter + test + junit junit diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AbstractBinaryDistributionTest.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AbstractBinaryDistributionTest.java index d45bcd7cd6..5162c6f7dc 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AbstractBinaryDistributionTest.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AbstractBinaryDistributionTest.java @@ -5,23 +5,24 @@ package net.sourceforge.pmd.it; import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.io.TempDir; import net.sourceforge.pmd.PMDVersion; -public abstract class AbstractBinaryDistributionTest { +abstract class AbstractBinaryDistributionTest { public static final String PMD_BIN_PREFIX = "pmd-bin-"; protected static File getBinaryDistribution() { return new File(".", "target/" + PMD_BIN_PREFIX + PMDVersion.VERSION + ".zip"); } - @ClassRule - public static TemporaryFolder folder = new TemporaryFolder(); + @TempDir + static Path folder; /** * The temporary directory, to which the binary distribution will be extracted. @@ -29,9 +30,13 @@ public abstract class AbstractBinaryDistributionTest { */ protected static Path tempDir; - @BeforeClass - public static void setupTempDirectory() throws Exception { - tempDir = folder.newFolder().toPath(); + protected Path createTemporaryReportFile() throws IOException { + return Files.createTempFile(folder, null, null); + } + + @BeforeAll + static void setupTempDirectory() throws Exception { + tempDir = Files.createTempDirectory(folder, null); if (getBinaryDistribution().exists()) { ZipFileExtractor.extractZipFile(getBinaryDistribution().toPath(), tempDir); } diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java index bc1ab661b8..74faa00fbc 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AllRulesIT.java @@ -7,30 +7,24 @@ package net.sourceforge.pmd.it; import java.io.File; import java.util.Arrays; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) -public class AllRulesIT extends AbstractBinaryDistributionTest { +class AllRulesIT extends AbstractBinaryDistributionTest { - @Parameter - public String language; - @Parameters - public static Iterable languagesToTest() { + static Iterable languagesToTest() { // note: scala and wsdl have no rules return Arrays.asList("java", "apex", "html", "javascript", "jsp", "modelica", "plsql", "pom", "visualforce", "velocitytemplate", "xml", "xsl"); } - @Test - public void runRuleTests() throws Exception { + @ParameterizedTest + @MethodSource("languagesToTest") + void runRuleTests(String language) throws Exception { String srcDir = new File(".", "src/test/resources/sample-source/" + language + "/").getAbsolutePath(); - ExecutionResult result = PMDExecutor.runPMDRules(folder.newFile().toPath(), tempDir, srcDir, + ExecutionResult result = PMDExecutor.runPMDRules(createTemporaryReportFile(), tempDir, srcDir, "src/test/resources/rulesets/all-" + language + ".xml"); assertDefaultExecutionResult(result); } diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AntIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AntIT.java index 2c840d2487..78114cb84e 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/AntIT.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/AntIT.java @@ -15,9 +15,9 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang3.SystemUtils; -import org.junit.Assume; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; import net.sourceforge.pmd.PMDVersion; import net.sourceforge.pmd.util.IOUtil; @@ -28,12 +28,11 @@ import net.sourceforge.pmd.util.IOUtil; *

* See How to trick an application into thinking its stdout is a terminal, not a pipe. */ -public class AntIT extends AbstractBinaryDistributionTest { +class AntIT extends AbstractBinaryDistributionTest { @Test - public void runAnt() throws IOException, InterruptedException { - Assume.assumeTrue(SystemUtils.IS_OS_LINUX); - + @EnabledOnOs(OS.LINUX) + void runAnt() throws IOException, InterruptedException { String antBasepath = new File("target/ant").getAbsolutePath(); String pmdHome = tempDir.resolve(PMD_BIN_PREFIX + PMDVersion.VERSION).toAbsolutePath().toString(); File antTestProjectFolder = prepareAntTestProjectFolder(); @@ -46,7 +45,7 @@ public class AntIT extends AbstractBinaryDistributionTest { private File prepareAntTestProjectFolder() throws IOException { final Path sourceProjectFolder = new File("src/test/resources/ant-it").toPath(); - final Path projectFolder = folder.newFolder().toPath(); + final Path projectFolder = Files.createTempDirectory(folder, null); Files.walkFileTree(sourceProjectFolder, new SimpleFileVisitor() { @Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java index a011878546..1b402fe607 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.it; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.io.File; import java.io.IOException; @@ -15,12 +15,12 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; import net.sourceforge.pmd.PMDVersion; import net.sourceforge.pmd.cli.internal.CliMessages; -public class BinaryDistributionIT extends AbstractBinaryDistributionTest { +class BinaryDistributionIT extends AbstractBinaryDistributionTest { private static final String SUPPORTED_LANGUAGES_CPD; private static final String SUPPORTED_LANGUAGES_PMD; @@ -33,7 +33,7 @@ public class BinaryDistributionIT extends AbstractBinaryDistributionTest { private final String srcDir = new File(".", "src/test/resources/sample-source/java/").getAbsolutePath(); @Test - public void testFileExistence() { + void testFileExistence() { assertTrue(getBinaryDistribution().exists()); } @@ -52,7 +52,7 @@ public class BinaryDistributionIT extends AbstractBinaryDistributionTest { } @Test - public void testZipFileContent() throws IOException { + void testZipFileContent() throws IOException { Set expectedFileNames = getExpectedFileNames(); ZipFile zip = new ZipFile(getBinaryDistribution()); @@ -71,65 +71,65 @@ public class BinaryDistributionIT extends AbstractBinaryDistributionTest { } @Test - public void testPmdJavaQuickstart() throws Exception { - ExecutionResult result = PMDExecutor.runPMDRules(folder.newFile().toPath(), tempDir, srcDir, "rulesets/java/quickstart.xml"); + void testPmdJavaQuickstart() throws Exception { + ExecutionResult result = PMDExecutor.runPMDRules(createTemporaryReportFile(), tempDir, srcDir, "rulesets/java/quickstart.xml"); result.assertExecutionResult(4, ""); } @Test - public void testPmdXmlFormat() throws Exception { - ExecutionResult result = PMDExecutor.runPMDRules(folder.newFile().toPath(), tempDir, srcDir, "src/test/resources/rulesets/sample-ruleset.xml", "xml"); + void testPmdXmlFormat() throws Exception { + ExecutionResult result = PMDExecutor.runPMDRules(createTemporaryReportFile(), tempDir, srcDir, "src/test/resources/rulesets/sample-ruleset.xml", "xml"); result.assertExecutionResult(4, "", "JumbledIncrementer.java\">"); result.assertExecutionResult(4, "", " exclusions = new HashSet<>(); exclusions.add(BASE_PATH + "/.ci/files/id_rsa"); exclusions.add(BASE_PATH + "/.ci/files/private-env"); @@ -38,7 +38,7 @@ public class SourceDistributionIT { List files = ZipFileExtractor.readZipFile(getSourceDistribution().toPath()); for (String file : files) { - Assert.assertFalse("File " + file + " must not be included", exclusions.contains(file)); + assertFalse(exclusions.contains(file), "File " + file + " must not be included"); } } } diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/ZipFileExtractor.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/ZipFileExtractor.java index dbfe2d13a5..609dde0e44 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/ZipFileExtractor.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/ZipFileExtractor.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.it; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.FileOutputStream; diff --git a/pmd-doc/pom.xml b/pmd-doc/pom.xml index 132c2cd552..45b7773695 100644 --- a/pmd-doc/pom.xml +++ b/pmd-doc/pom.xml @@ -96,6 +96,11 @@ snakeyaml + + org.junit.jupiter + junit-jupiter + test + junit junit diff --git a/pmd-doc/src/test/java/net/sourceforge/pmd/docs/EscapeUtilsTest.java b/pmd-doc/src/test/java/net/sourceforge/pmd/docs/EscapeUtilsTest.java index 7e06c58574..439a9f41bc 100644 --- a/pmd-doc/src/test/java/net/sourceforge/pmd/docs/EscapeUtilsTest.java +++ b/pmd-doc/src/test/java/net/sourceforge/pmd/docs/EscapeUtilsTest.java @@ -4,17 +4,17 @@ package net.sourceforge.pmd.docs; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class EscapeUtilsTest { +class EscapeUtilsTest { @Test - public void testEscapeMarkdown() { + void testEscapeMarkdown() { assertEquals("This is a \\\\backslash", EscapeUtils.escapeMarkdown("This is a \\backslash")); assertEquals("This \"\\*\" is not a emphasis", EscapeUtils.escapeMarkdown("This \"*\" is not a emphasis")); assertEquals("This \"\\*\\*\" is not a strong style", EscapeUtils.escapeMarkdown("This \"**\" is not a strong style")); @@ -25,7 +25,7 @@ public class EscapeUtilsTest { } @Test - public void testEscapeHtmlWithinMarkdownSingleLine() { + void testEscapeHtmlWithinMarkdownSingleLine() { assertEquals("a <script> tag outside of `