diff --git a/docs/pages/pmd/userdocs/extending/testing.md b/docs/pages/pmd/userdocs/extending/testing.md index e60652242c..d746464657 100644 --- a/docs/pages/pmd/userdocs/extending/testing.md +++ b/docs/pages/pmd/userdocs/extending/testing.md @@ -25,7 +25,7 @@ Each category-ruleset has a single abstract base test class, from which the indi We have one test class per rule, which executes all test cases for a single rule. The actual test cases are stored in separate XML files, for each rule a separate file is used. -All the test classes inherit from {% jdoc test::testframework.PmdRuleTst %}, +All the test classes inherit from {% jdoc test::test.PmdRuleTst %}, which provides the seamless integration with JUnit5. This base class determines the language, the category name and the rule name from the concrete test class. It then searches the test code on its own. E.g. the individual rule test class @@ -41,7 +41,7 @@ test case and just execute this one. ## Where to place the test code -The {% jdoc test::testframework.PmdRuleTst %} class searches the XML file, that describes the test cases +The {% jdoc test::test.PmdRuleTst %} class searches the XML file, that describes the test cases for a certain rule using the following convention: The XML file is a test resource, so it is searched in the tree under `src/test/resources`. @@ -76,13 +76,13 @@ see [Using the test framework externally](#using-the-test-framework-externally). ### Test Class: AbstractClassWithoutAbstractMethodTest -This class inherits from {% jdoc test::testframework.PmdRuleTst %} and is located in the package "bestpractices", +This class inherits from {% jdoc test::test.PmdRuleTst %} and is located in the package "bestpractices", since the rule belongs to the category "Best Practices": ``` java package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AbstractClassWithoutAbstractMethodTest extends PmdRuleTst { // no additional unit tests @@ -251,7 +251,7 @@ the rule test manually, as SimpleAggregatorTst will fail to determine it correct ``` java package com.example.pmd.rules; -import net.sourceforge.pmd.testframework.SimpleAggregatorTst; +import net.sourceforge.pmd.test.SimpleAggregatorTst; class CustomRuleTest extends SimpleAggregatorTst { @Override @@ -272,19 +272,19 @@ The test data should be placed in an XML file located in "src/test/resources" un The framework uses the [dynamic test feature](https://junit.org/junit5/docs/current/user-guide/#writing-tests-dynamic-tests) of JUnit5 under the hood, among a couple of utility classes: -* {% jdoc test::testframework.PmdRuleTst %}: This is the base class for tests in PMD's code base. It is a subclass of - {% jdoc test::testframework.RuleTst %} and just +* {% jdoc test::test.PmdRuleTst %}: This is the base class for tests in PMD's code base. It is a subclass of + {% jdoc test::test.RuleTst %} and just contains the logic to determine the test resources based on the test class name. -* {% jdoc test::testframework.SimpleAggregatorTst %}: This is a more generic base class for the test classes. +* {% jdoc test::test.SimpleAggregatorTst %}: This is a more generic base class for the test classes. It doesn't register any test cases on its own. You can register your own rule tests. - It itself is a subclass of {% jdoc test::testframework.RuleTst %}. + It itself is a subclass of {% jdoc test::test.RuleTst %}. * The maven module "pmd-test-schema" contains the logic to parse the XML files and provides a {% jdoc test-schema::test.schema.RuleTestCollection %}. This in turn contains a list of {% jdoc test-schema::test.schema.RuleTestDescriptor %}s. Each rule test descriptor describes a single test case. -* {% jdoc test::testframework.RuleTst %}: uses the {%jdoc test-schema::test.schema.TestSchemaParser %} +* {% jdoc test::test.RuleTst %}: uses the {%jdoc test-schema::test.schema.TestSchemaParser %} from module "pmd-test-schema" to parse the test cases, executes each rule test descriptor and asserts the results. It defines a test method `ruleTests()` which is a test factory and returns one dynamic test per rule test. diff --git a/docs/pages/pmd/userdocs/migrating_to_pmd7.md b/docs/pages/pmd/userdocs/migrating_to_pmd7.md index 13eda0dfd0..ec092e1261 100644 --- a/docs/pages/pmd/userdocs/migrating_to_pmd7.md +++ b/docs/pages/pmd/userdocs/migrating_to_pmd7.md @@ -115,9 +115,13 @@ Once you have reviewed your ruleset(s), you can switch to PMD 7. ### I'm using custom rules +#### Testing Ideally, you have written good tests already for your custom rules - see [Testing your rules](pmd_userdocs_extending_testing.html). This helps to identify problems early on. +The base test classes {%jdoc test::test.PmdRuleTst %} and {%jdoc test::test.SimpleAggregatorTst %} have been moved out +of package `net.sourceforge.pmd.testframework`. You'll need to adjust your imports. + #### Ruleset XML The `` tag, that defines your custom rule, is required to have a `language` attribute now. This was always the case for XPath rules, but is now a requirement for Java rules. diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index 12382eba63..c61910f235 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -341,6 +341,13 @@ in the migration guide for details. * pmd-scala * {%jdoc scala::lang.scala.cpd.ScalaCpdLexer %} (moved from `net.sourceforge.pmd.lang.scala.cpd.ScalaCpdLexer`) * {%jdoc scala::lang.scala.cpd.ScalaTokenAdapter %} (moved from `net.sourceforge.pmd.lang.scala.cpd.ScalaTokenAdapter`) +* pmd-test + * {%jdoc test::test.lang.rule.AbstractRuleSetFactoryTest %} (moved from `net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest`) + * {%jdoc test::test.AbstractAntTestHelper %} (moved from `net.sourceforge.pmd.ant.AbstractAntTestHelper`) + * {%jdoc test::test.AbstractLanguageVersionTest %} (moved from `net.sourceforge.pmd.AbstractLanguageVersionTest`) + * {%jdoc test::test.PmdRuleTst %} (moved from `net.sourceforge.pmd.testframework.PmdRuleTst`) + * {%jdoc test::test.RuleTst %} (moved from `net.sourceforge.pmd.testframework.RuleTst`) + * {%jdoc test::test.SimpleAggregatorTst %} (moved from `net.sourceforge.pmd.testframework.SimpleAggregatorTst`) * pmd-xml * {%jdoc xml::lang.xml.pom.PomLanguageModule %} (moved from `net.sourceforge.pmd.lang.pom.PomLanguageModule`) * {%jdoc xml::lang.xml.wsdl.WsdlLanguageModule %} (moved from `net.sourceforge.pmd.lang.wsdl.WsdlLanguageModule`) diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java index 8d899d0549..30cdbc7c69 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.apex; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java index d56fdaecf8..b34849d528 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/QuickstartRulesetTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import net.sourceforge.pmd.lang.rule.RuleSet; import net.sourceforge.pmd.lang.rule.RuleSetLoader; diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/RuleSetFactoryTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/RuleSetFactoryTest.java index c3dd9beaa2..2017f895c2 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/RuleSetFactoryTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { // no additional tests yet 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 2936a9d81a..b568e90a14 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 @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.apex.metrics.impl; import net.sourceforge.pmd.lang.apex.ast.ApexQualifiableNode; import net.sourceforge.pmd.lang.ast.Node; -import net.sourceforge.pmd.testframework.SimpleAggregatorTst; +import net.sourceforge.pmd.test.SimpleAggregatorTst; /** * Executes the metrics testing rules. 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 46ab3aff19..4bf289fe69 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8da6170cb0..5fbb7c8c26 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ApexUnitTestClassShouldHaveAssertsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveRunAsTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveRunAsTest.java index 1c20e4ad7c..cb4d8c5141 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveRunAsTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/bestpractices/ApexUnitTestClassShouldHaveRunAsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; public class ApexUnitTestClassShouldHaveRunAsTest 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 983448dce7..5917436c6c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 150bcfecd6..5485453809 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 eff39e8739..9b6143c880 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 21cd2021d9..e95f227e07 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 939ad1b510..5e9ce1c8a8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class DebugsShouldUseLoggingLevelTest extends PmdRuleTst { 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 fe40d55ecc..0e42710876 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0ebe54c2a2..3da177d181 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3a3224f1dc..1ad6d892b6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cc04dbc5ca..b2e251df95 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 22891df41c..b884764b70 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 79561ea4a8..3642c8c0a0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a5b04aaf90..7331b729a2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8d91dd649b..e405118d3b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0915626fce..0c428f5c6c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 291fa815fc..a62c323436 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 37fbf81509..7a6385bb8b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6e78c8d37f..96c1d7fa94 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 03b7109932..2246058de9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5002fe75d2..bd2541ea5a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 07ece5a9a3..f494a21ed0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e0c5c3696d..b55778bce9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 99b4becd66..beb8138b8a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 78bb4a0c43..178f7e1255 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 256d0f3847..e2eae7a804 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 100985cb5c..70bb6b81b0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 af10fcdbfd..a334a639e7 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 92ec3a77be..a1147606c6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cdd02ad007..27dd2cc552 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 080b396560..c4f0fb2356 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.documentation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 85f7f104e0..694907f980 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 09f59fac05..8f9ddd1e0f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2a88bb417b..2896accded 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b6519db2cd..f244db32e4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1bc971edbc..329de97e77 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4c131f7cd4..e21bb438ba 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 44cad0042f..7df8c60d6b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1e68857b57..0adb332e79 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a7a297124d..5f6fc34e81 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 31e1ebd383..e423dc004b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3a15b5dae8..19def64a1e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 29ab1310c3..637e9f1cdf 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1d4f6539a5..4ea8975c09 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 38e591773e..8f9fec9c3a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidDebugStatementsTest 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 ddc191c0a6..4f73dcb894 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class EagerlyLoadedDescribeSObjectResultTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithHighCostInLoopTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithHighCostInLoopTest.java index 6dc7ff3ba8..e61681e5ec 100644 --- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithHighCostInLoopTest.java +++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/performance/OperationWithHighCostInLoopTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class OperationWithHighCostInLoopTest 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 e80764adbc..9c13461634 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 280a1c8cb2..988e4c1401 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2e74b0a0ad..b8367a79e0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ApexCRUDViolationTest extends PmdRuleTst { 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 8796b360a4..60f2e9a0bf 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 000e2544c3..7189c176bd 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4108b3b9a0..f16dcb4572 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cde095f6e4..4b9381632d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ApexSOQLInjectionTest extends PmdRuleTst { // no additional unit tests 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 2e918f1e56..b228dd48da 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 442ed24f96..e13e2f4821 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6ede53430d..4d0ad58f8a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0286092d14..283f8de051 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.apex.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ApexXSSFromURLParamTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/InternalApiBridge.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/InternalApiBridge.java index b532eef955..802d07ccad 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/InternalApiBridge.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/InternalApiBridge.java @@ -6,9 +6,12 @@ package net.sourceforge.pmd.lang.rule; import java.util.List; +import org.checkerframework.checker.nullness.qual.NonNull; + import net.sourceforge.pmd.annotation.InternalApi; import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.document.FileId; +import net.sourceforge.pmd.util.log.PmdReporter; /** * Internal API. @@ -36,4 +39,8 @@ public final class InternalApiBridge { public static List loadRuleSetsWithoutException(RuleSetLoader ruleSetLoader, List rulesetPaths) { return ruleSetLoader.loadRuleSetsWithoutException(rulesetPaths); } + + public static RuleSetLoader withReporter(RuleSetLoader ruleSetLoader, @NonNull PmdReporter reporter) { + return ruleSetLoader.withReporter(reporter); + } } diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/LanguageVersionTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/LanguageVersionTest.java index 0a8b032163..9315ee0525 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/LanguageVersionTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.html; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java index f3255130e1..a79d09a0af 100644 --- a/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java +++ b/pmd-html/src/test/java/net/sourceforge/pmd/lang/html/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.html; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { // no additional tests yet 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 ca4314861d..e3dab36338 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ade5f87078..aaf2915ebf 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c4904a4aee..a336b2d2de 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.html.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UseAltAttributeForImagesTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java index b4d8e5a12c..d855a4743e 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java @@ -14,6 +14,7 @@ import java.util.Locale; import org.junit.jupiter.api.Test; import net.sourceforge.pmd.internal.util.IOUtil; +import net.sourceforge.pmd.test.AbstractAntTestHelper; class PMDTaskTest extends AbstractAntTestHelper { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java index 47f1619085..19511c5ae1 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionTest.java @@ -4,13 +4,13 @@ package net.sourceforge.pmd.lang.java; -import static net.sourceforge.pmd.AbstractLanguageVersionTest.TestDescriptor.defaultVersionIs; -import static net.sourceforge.pmd.AbstractLanguageVersionTest.TestDescriptor.versionDoesNotExist; +import static net.sourceforge.pmd.test.AbstractLanguageVersionTest.TestDescriptor.defaultVersionIs; +import static net.sourceforge.pmd.test.AbstractLanguageVersionTest.TestDescriptor.versionDoesNotExist; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.Language; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java index 6f3d7e4f37..5fa5b76c2a 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/QuickstartRulesetTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; import net.sourceforge.pmd.lang.rule.RuleSet; import net.sourceforge.pmd.lang.rule.RuleSetLoader; diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/RuleSetFactoryTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/RuleSetFactoryTest.java index eac601291e..7276d213b0 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/RuleSetFactoryTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test java's rulesets 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 bedece59e4..b227d27b90 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 @@ -8,7 +8,7 @@ import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.java.ast.ASTExecutableDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTTypeDeclaration; import net.sourceforge.pmd.lang.java.ast.internal.PrettyPrintingUtil; -import net.sourceforge.pmd.testframework.SimpleAggregatorTst; +import net.sourceforge.pmd.test.SimpleAggregatorTst; /** * Executes the metrics testing rules. 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 b319c5e9f1..f1d3e1eb28 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1c922fd22e..b4818807f8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7ef92f4c8e..a4bff3af89 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0fba328ac6..9df0a31644 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 df4543674d..1403fe41f3 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 436d56f150..c3c2d9a56e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 25ab862bfe..67fd392bde 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a15f9742fb..b7deb6616c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 68ab080b7d..aa1eecf167 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1b1e7898cf..7f1b4a2e16 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 82d84a3c05..fe7b0ce420 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cba377fd59..8699d4134d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 bf685f3ad7..c81183b7b6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1a407779e8..b316a1881f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 26eee695b6..8a6947126a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e0b774b80d..771debeb16 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5843550a3a..059c71f39d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 84dce65d9c..5a1979c853 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 dc2c92f4ae..2765a69ce2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 341829e928..ea6070f9e3 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b92ab68100..d32f7a5087 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6710c145be..15b507dafb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 bf8190b559..d39a19249b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 239cce7659..e77dd78150 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c91e0ec567..30404275d4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b638b6931a..933f3f612c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 fccdcb4321..3ad1c36784 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ad573713aa..a5720ad7f7 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2d702101d4..5578b24fd5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4ac38bd990..f3646e5d54 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0d374f3810..fd9b847b62 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 84c2a6d5b5..8c21b1715c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3ee1e1f9ec..56e4f6de8b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c4c4242233..6e656beb8e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ae43342146..125b827b3a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 96c695b7d9..32a5a7d682 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6e6c42ebfa..ef8f827443 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4e8f183411..3d40f44bd2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c1e3024e73..1e413f1bde 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f56c1d553a..eb401c15bc 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e0268e6b19..0401dd83ec 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1498848b13..d50db5eed9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cef06f1d28..e036436f04 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2dbebb0d75..393832d452 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 95c69992cb..a865a70706 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c5ff68ec34..59f03df249 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9ca82a74bf..aca984101e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6ae963e5b7..07334453bd 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d427a9b63a..d3c6b35411 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c123e41fb9..4fe2c32ef5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a01faa8ee8..0016e9ddbc 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3912331a26..34a6e215bb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6f12fef002..f7776cd225 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 26f19cbefb..7d7e2cfa3b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d6be3157ba..fae466967b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4ecd11cdae..1b239e2ab1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c1df93ea1c..34310381de 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 32796e3fd4..ca721c867a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 57e297e29a..c6e02b62f5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 383ded2194..ed559d2e32 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 02ba0a4103..c94aed935c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 70bbcd8897..4cb1a84298 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 44de194856..27bb5620d1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a5b01cc926..6e66ca54e4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2a46f0ccc8..f1c9cfcb91 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ad43201f57..e4a1157bf2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 68a325445b..8efa889742 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0e77ed8483..427e066be8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 16f76366c5..2327c1cd2f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1408b7f3f2..4ed583d9fe 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9b306eb379..87875e0f14 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2535e6a9a0..fd1466df70 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8f9adcc264..04fdee75ab 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ff39a550b0..ff119c1a28 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 610f44eecd..5c49860210 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 103742c709..18753981b9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f93806cc6a..86ad669aac 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5a9477e98e..5104b29ffc 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 589830413c..55d4325665 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 eaa4fde1e9..67a7557ec0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 df3821dc03..80badeb38c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9cd086b1e5..bf2e0d75eb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cdd036a17d..f82f7071ce 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 16f56fc61a..7449842bd8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6985386725..99b7caad86 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5e95b5525f..8c9a2dba9c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c4ae1aff0d..cc08d111d9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9fab5587dc..77f1793eca 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b178ba1bf7..e505d0ef49 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ae659dcfdc..6346aa9a48 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 75d06a7980..051a52d508 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 09e83074a5..bb37cb806f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b479fdfa98..ddbca59128 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 @@ -5,7 +5,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4e0c2bf4b7..b5111c5bb4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b8edf924a3..9f0c2eec0f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UnnecessaryFullyQualifiedNameTest extends PmdRuleTst { // Do not delete these two enums - it is needed for a test case 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 4cdbf50000..ea4bea97d4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UnnecessaryImportTest extends PmdRuleTst { // these 2 methods are used for a test case, do not delete 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 d6fe2b3a65..10bf3efae5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 442d89734b..5c77459d42 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 de89b09b55..9213d7d9f2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6258d531d9..9e488c285c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 fe6f6c19b4..3148d3a690 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UseDiamondOperatorTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseExplicitTypesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseExplicitTypesTest.java index e535efd39c..506bbd7095 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseExplicitTypesTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseExplicitTypesTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UseExplicitTypesTest 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 28959ae4c0..a4cec59f39 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 df002dba91..71098101c0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2ff2cb875e..8e4050c9aa 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 @@ -15,7 +15,7 @@ import net.sourceforge.pmd.lang.java.JavaParsingHelper; import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit; import net.sourceforge.pmd.lang.java.ast.ASTExpression; import net.sourceforge.pmd.lang.java.rule.codestyle.UselessParenthesesRule.Necessity; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UselessParenthesesTest extends PmdRuleTst { 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 d4c28d5193..c7eed79cee 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2707edc916..a5d9253ee2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9014238a7b..32fecf59f8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ffeb2eff0b..28eab0fdf1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8b4946aba8..aa3bbd57ba 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 80992fa8b8..14e7a6b7df 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 47eace4526..c1b437ab41 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 be27cc8e00..8cffad6aeb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidThrowingRawExceptionTypesTest extends PmdRuleTst { public static class Throwable extends java.lang.Throwable { 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 0a18773aa2..146b4990f3 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5310503f78..7328a0999f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c6c2edcebc..b20c1035a8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3f13ce5287..44d831ea9e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7c2948ec32..79ab664ae7 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 df859e7e08..7833abbb86 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 af2152f439..6a7cccfdd9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e5d9b7b301..57280be3f8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 292fde945d..2dbd142d27 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExceptionAsFlowControlTest 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 74fd72a16c..7547ce785a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveImportsTest 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 6308b1fe4f..30fa157b94 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 760e4807fe..7417e82f49 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cf9d950639..71b86c4014 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 dd69734923..eac3f10322 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b974fad282..eb0972d72b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ImmutableFieldTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/InvalidJavaBeanTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/InvalidJavaBeanTest.java index dc8c949263..f50fbe1971 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/InvalidJavaBeanTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/design/InvalidJavaBeanTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; public class InvalidJavaBeanTest 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 99e77ad459..b4e94a6e26 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3a4cb92739..b59044573a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 00e0b010c9..b838934226 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cb5e29d512..df946baa86 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 98ddc7cae6..f23536ba55 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 48e984d9ad..537485d26c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d44e58ec86..d5e0bc20af 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3f2a8a5daf..dc68ac28bd 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0b1a4bc204..f17434579f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ab631f2194..e385db5af1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 47400d35cf..9ad90e779d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 95fd5ff04c..81835c7c5b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 588ab69e8d..20788f1419 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 05933e2507..9c3c33d7ee 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 122519449a..fa9d3db763 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9a397a435a..fc4a699a0d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 41ff6bd799..7d023149da 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 85ff3df3d9..ead57712d1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 322a64200a..9ecdfb0ba9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.documentation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4c026b25c3..5675facab9 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 @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import net.sourceforge.pmd.lang.rule.Rule; import net.sourceforge.pmd.properties.PropertyDescriptor; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class CommentRequiredTest extends PmdRuleTst { @Test 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 5d4e204836..5c7b46c604 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.documentation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0bb603709c..07db696d06 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.documentation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8c2095d737..cf02536ff6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.documentation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4edf718a2d..bcc9a1a047 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4813dfffbc..a0ec733db1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 03bde11b12..299773b485 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 886c08b67d..2181e84e4b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 191b68987d..e220e19d13 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 246bce0db7..d677bbb03e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 006cc3d84e..b232a83d67 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c11ea40e2a..c8a5c0c84d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 267bb84ab9..89ea4cb63c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d2f660a2e9..c08bad740b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 be57423730..8b6da14263 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f8486d435e..9cea99c577 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3edcfcf304..3583b1a557 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 68b781f08a..a839a4c68a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 802b8dca59..d2a8f2c42b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d31247dec4..e1cdd89895 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 68121b5dc5..3d2893f02c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 968d7ca76b..9b396d1519 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidUsingOctalValuesTest 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 2b1ba4ff7e..bf48e3784a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 311a13ff74..930906b275 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a368b2bc75..c9102640ca 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 55bb58982b..26fc541489 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 dfd5d2066f..502cf5ea4f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2a96cb6855..371d240c06 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9aef788c64..3f37f37eaf 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 717ac81df4..63df372d7a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 bdbf15e7c2..20856ab956 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 05acb24255..25e111a8fa 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 723d440e4c..1015af42ed 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 2440994922..8420a865ab 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 74a15e36ae..f2def6539a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4796425f69..46202e927a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7e5494958d..6a849194f6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 dd4a99f308..bdfd5d58cb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f6cc3a8bb1..dcb0f8f4ee 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 aed669dc83..7eefe57ee0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1498a6db2a..f4c0ae4184 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 eedf01e2d5..1572170e72 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a953c3e013..9a5537230b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6f7cd4674f..cd31622ab2 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class EmptyFinalizerTest 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 fc903ce4bb..f0cfd64e5c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a8de36f386..d1747d4885 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f94cb50b83..7da75fa5c1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9df63b451b..c529f24a4a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ddc8e610b3..e2cab4ed1a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b636426e8d..424df37768 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 99ad4868f7..3a14a27009 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c85239d5ea..f575d90629 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7e9abea98c..933231b1bc 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 047f7313e3..faaffea06c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6d7a5b846d..858cc27ba4 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 db5032bbfa..ac16e6555e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 386383efd1..fe78042cbf 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ca68722bec..3f5c5a0106 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a7358da129..bb338c5969 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5cf642ed8e..cadf17f5f9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 f1deb552a7..fedc2ed326 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d19b90912d..9d914a9552 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NonCaseLabelInSwitchStatementTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassTest.java index 9fc73d7ba0..5cc867bdb8 100644 --- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassTest.java +++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/errorprone/NonSerializableClassTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NonSerializableClassTest 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 543bd5d56c..a971ea77c3 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 84845a7d57..140df2e813 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 bed7dd18c3..7611bfaa34 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 caf7485fac..a6f9bbe99a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e301881e75..602ad8bdd5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 88dc7a7593..499e6d6728 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 3a53638de2..b3e87a6011 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 efe247e0c8..51199fb499 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ff818721ae..e77ffe6cb0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 838a2b4cd6..2b178c9b72 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cfabdd6c67..0b3916d131 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 60250e0167..f33dfcfd38 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9536facef4..0193d8d266 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9d234b5800..6e341e0ebd 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 36a97b83ba..5c17a20755 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 39f0f4fc47..b0a4edebce 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e9fb6da5a1..6485314b6c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e652838fc1..87621208a9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c2e0d37c4c..1a39ba29be 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4a08348e6b..54dfa6fc6c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 eaea9ff7e5..03383eca02 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 8c735a1623..deda76b27e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cca09e5922..482ed8de75 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7c000a37b2..d592198d36 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7c968906b3..c310e27248 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 cee396363f..eb8596e34e 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UselessOperationOnImmutableTest extends PmdRuleTst { // no additional unit tests 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 5552da8928..dd623cd341 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 322be8e579..0c06cbd520 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidThreadGroupTest extends PmdRuleTst { // Used by AvoidThreadGroup test cases 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 76a2a33966..5b34e87a17 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a1ee5cbb12..dc8b383e6b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6c19a37681..53120d9528 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class DontCallThreadRunTest extends PmdRuleTst { // Used by DontCallThreadRun test cases 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 2dd1f220dc..903ad31b5f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 5de60a32d9..b3ff3d7dba 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6581d6ae33..0d3f1cbd57 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 30b6abe091..2959aeaee6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d9c2cde3f2..5a93c3355b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.multithreading; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6d774c1f03..37fddac850 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b2def502e2..46ece8b851 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9dc04979f6..a0bca3e5f5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c065428ce7..dfbab65527 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1fb6565a3b..5df006ff24 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 88ebdd345a..852c358a13 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 08343bb36d..61670a7828 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 9a15a27b88..d0579e70f7 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e93c5fc95f..7c8a188152 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 223946a1be..480a307698 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 ff0675aafa..54ffe496af 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 91d0e92985..e98a01ad11 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d0c1e11209..e5f1e92834 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d8b57190f4..515a3ea422 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1f0b88431f..893a5a4332 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 826f9d275f..54ceb4ad7d 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 7a34936d2d..3916959a96 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6a6f20f34b..57a489e815 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6a8a9908f8..db1b6dc67b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 6f10cf35c6..53cca44137 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 68837b160e..fdb10da98c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1cc6ed59a2..f7b764b30b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 af3368b481..a79cf05c1a 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b18c5b6b9b..4ddf1ee025 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 09046eec59..df2d6542ad 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 a502887680..019b3e8dd0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.java.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class InsecureCryptoIvTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java index 79bc52e1f5..eaee7817c1 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java @@ -6,6 +6,8 @@ package net.sourceforge.pmd.ant; import org.junit.jupiter.api.Test; +import net.sourceforge.pmd.test.AbstractAntTestHelper; + class PMDTaskTest extends AbstractAntTestHelper { PMDTaskTest() { diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/LanguageVersionTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/LanguageVersionTest.java index de8217aae9..c835b51951 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/LanguageVersionTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.ecmascript; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/RuleSetFactoryTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/RuleSetFactoryTest.java index 32b1211d9d..61cfb5bfc0 100644 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/RuleSetFactoryTest.java +++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test javascript's rulesets 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 5d308cf576..be636f6ca7 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 65afa849ce..0d2066ec8b 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0645d97bd6..e949d1e498 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 03052f13ed..390b61c5f0 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c3dc0e1f8a..b6aab8d246 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 09d7db44c8..8d83dfa58c 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 1ad9afc710..c992b704b9 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 b122d7a4b6..d2afcf84f1 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 0d8595570d..e5d996f654 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 92b91cd7d7..abbe38ecbb 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 53c6ceb9c4..97390b04c5 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 c94b0b9e40..b50f4927af 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 e60cb484c9..438e03aa2f 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d681626c2c..4878c6aac6 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 d865674576..2406d43308 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 86e1b9defc..b794703157 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.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 4cdd66abbd..73cbf9e509 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.ecmascript.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class InnaccurateNumericLiteralTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/LanguageVersionTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/LanguageVersionTest.java index eb2eb31267..303be4dbd6 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/LanguageVersionTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.jsp; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/RuleSetFactoryTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/RuleSetFactoryTest.java index 531bde227b..e9e19c024c 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/RuleSetFactoryTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test jsp's rulesets diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/DontNestJsfInJstlIterationTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/DontNestJsfInJstlIterationTest.java index 285d9aca99..9947b4b753 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/DontNestJsfInJstlIterationTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/DontNestJsfInJstlIterationTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class DontNestJsfInJstlIterationTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoClassAttributeTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoClassAttributeTest.java index 32aed17829..672db299c7 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoClassAttributeTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoClassAttributeTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoClassAttributeTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoHtmlCommentsTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoHtmlCommentsTest.java index 2433b7b9e7..3832823a05 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoHtmlCommentsTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoHtmlCommentsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoHtmlCommentsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoJspForwardTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoJspForwardTest.java index 7dc9cedd19..a76a1aea75 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoJspForwardTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/bestpractices/NoJspForwardTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoJspForwardTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsTest.java index 80de35ba95..3beab29c65 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/codestyle/DuplicateJspImportsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class DuplicateJspImportsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineScriptTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineScriptTest.java index aadd16a811..f0bf436d1b 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineScriptTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineScriptTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoInlineScriptTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationTest.java index 946daafaf8..e7333d6da4 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoInlineStyleInformationTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoInlineStyleInformationTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoLongScriptsTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoLongScriptsTest.java index 79ad52d4e3..fef126e2c5 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoLongScriptsTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoLongScriptsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoLongScriptsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoScriptletsTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoScriptletsTest.java index 9e98971cd3..6723f8fabe 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoScriptletsTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/design/NoScriptletsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoScriptletsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/JspEncodingTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/JspEncodingTest.java index d14fb6b962..fc2bfc86f2 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/JspEncodingTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/errorprone/JspEncodingTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class JspEncodingTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/IframeMissingSrcAttributeTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/IframeMissingSrcAttributeTest.java index fab1bea703..6eb20112d8 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/IframeMissingSrcAttributeTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/IframeMissingSrcAttributeTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class IframeMissingSrcAttributeTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionTest.java b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionTest.java index 4fdb59501c..21f79ed3d6 100644 --- a/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionTest.java +++ b/pmd-jsp/src/test/java/net/sourceforge/pmd/lang/jsp/rule/security/NoUnsanitizedJSPExpressionTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.jsp.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoUnsanitizedJSPExpressionTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/LanguageVersionTest.java b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/LanguageVersionTest.java index 3e94f483bf..ba4d734a05 100644 --- a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/LanguageVersionTest.java +++ b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.kotlin; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/RuleSetFactoryTest.java b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/RuleSetFactoryTest.java index 190b8401ef..d90e854b6c 100644 --- a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/RuleSetFactoryTest.java +++ b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.kotlin; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { // no additional tests yet diff --git a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/bestpractices/FunctionNameTooShortTest.java b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/bestpractices/FunctionNameTooShortTest.java index 1d26e10589..24d80ce15e 100644 --- a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/bestpractices/FunctionNameTooShortTest.java +++ b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/bestpractices/FunctionNameTooShortTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.kotlin.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class FunctionNameTooShortTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java index 673aa3946e..8e8a35b270 100644 --- a/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java +++ b/pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/rule/errorprone/OverrideBothEqualsAndHashcodeTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.kotlin.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class OverrideBothEqualsAndHashcodeTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/LanguageVersionTest.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/LanguageVersionTest.java index 74c79e1e35..f09c75c2ba 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/LanguageVersionTest.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.modelica; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/RuleSetFactoryTest.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/RuleSetFactoryTest.java index 53fc1834d1..fe3902f6de 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/RuleSetFactoryTest.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.modelica; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { // no additional tests yet diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/AmbiguousResolutionTest.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/AmbiguousResolutionTest.java index 53652d299b..201788ca19 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/AmbiguousResolutionTest.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/AmbiguousResolutionTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.modelica.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AmbiguousResolutionTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ClassStartNameEqualsEndNameTest.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ClassStartNameEqualsEndNameTest.java index e02c11b19d..edebad3f18 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ClassStartNameEqualsEndNameTest.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ClassStartNameEqualsEndNameTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.modelica.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ClassStartNameEqualsEndNameTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ConnectUsingNonConnectorTest.java b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ConnectUsingNonConnectorTest.java index 31a860a80a..67b2348d79 100644 --- a/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ConnectUsingNonConnectorTest.java +++ b/pmd-modelica/src/test/java/net/sourceforge/pmd/lang/modelica/rule/bestpractices/ConnectUsingNonConnectorTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.modelica.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ConnectUsingNonConnectorTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/LanguageVersionTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/LanguageVersionTest.java index c9e3d8a20a..85ad70e843 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/LanguageVersionTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.plsql; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/RuleSetFactoryTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/RuleSetFactoryTest.java index fbf61181a6..9e1b17520b 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/RuleSetFactoryTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test plsql's rulesets diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java index 64a423e233..37d924c615 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/bestpractices/TomKytesDespairTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class TomKytesDespairTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java index 636f854a35..a5956b6ff1 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/AvoidTabCharacterTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidTabCharacterTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java index 7f047772e5..1f159c060e 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/CodeFormatTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class CodeFormatTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java index 1d8591a22a..a558d99427 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/ForLoopNamingTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ForLoopNamingTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java index 40c5e9de7e..3e60f684a2 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/LineLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class LineLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java index 9b41c0468e..93868afc24 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/codestyle/MisplacedPragmaTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class MisplacedPragmaTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java index d010d2bfa2..55681426ef 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class CyclomaticComplexityTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java index 3ebc558d4a..05c012e36e 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveMethodLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveMethodLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java index 4c794cfaa9..c7087894eb 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveObjectLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveObjectLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java index 78adcc1eb2..380e6230b6 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageBodyLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessivePackageBodyLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java index b8a642a1b5..15147ca728 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessivePackageSpecificationLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessivePackageSpecificationLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java index fda74a8d80..2b55d6800f 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveParameterListTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveParameterListTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java index 3d96d024ba..136ef873e4 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveTypeLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveTypeLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java index 6714824a8a..7ea85366ad 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NPathComplexityTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NPathComplexityTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java index f8032c9396..d1354c3f01 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssMethodCountTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NcssMethodCountTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java index 8075fbd624..3d5034ef2e 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/NcssObjectCountTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NcssObjectCountTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java index 36126a01f5..09fc17ad94 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyFieldsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class TooManyFieldsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java index 17e3237791..5d7b9e24e8 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/design/TooManyMethodsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.plsql.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class TooManyMethodsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java index 044a86be62..986da1dd6d 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateToCharTest.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import net.sourceforge.pmd.lang.rule.Rule; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ToDateToCharTest extends PmdRuleTst { // No additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java index a70adbc735..7c75ad1d5b 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToDateWithoutDateFormatTest.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import net.sourceforge.pmd.lang.rule.Rule; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ToDateWithoutDateFormatTest extends PmdRuleTst { // No additional unit tests diff --git a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java index 730292e731..45a227884c 100644 --- a/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java +++ b/pmd-plsql/src/test/java/net/sourceforge/pmd/lang/plsql/rule/errorprone/ToTimestampWithoutDateFormatTest.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import net.sourceforge.pmd.lang.rule.Rule; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ToTimestampWithoutDateFormatTest extends PmdRuleTst { // No additional unit tests diff --git a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/LanguageVersionTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/LanguageVersionTest.java index c7b906aa40..c68489cad7 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/LanguageVersionTest.java +++ b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.scala; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/RulesetFactoryTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/RulesetFactoryTest.java index a7965850f3..ba6dac0f71 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/RulesetFactoryTest.java +++ b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/RulesetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.scala; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test scala rulesets diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/LanguageVersionTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/LanguageVersionTest.java index 203431069d..cd27506bcd 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/LanguageVersionTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.swift; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/RuleSetFactoryTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/RuleSetFactoryTest.java index 320fbf91a5..27add5aaef 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/RuleSetFactoryTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.swift; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { // no additional unit tests diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/ProhibitedInterfaceBuilderTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/ProhibitedInterfaceBuilderTest.java index d5771bc4c8..76a14465bf 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/ProhibitedInterfaceBuilderTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/ProhibitedInterfaceBuilderTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.swift.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ProhibitedInterfaceBuilderTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/UnavailableFunctionTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/UnavailableFunctionTest.java index 08bda9b025..f8b0f5bc2c 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/UnavailableFunctionTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/bestpractices/UnavailableFunctionTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.swift.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UnavailableFunctionTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceCastTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceCastTest.java index 93212509bb..7255f6bbc5 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceCastTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceCastTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.swift.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ForceCastTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceTryTest.java b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceTryTest.java index 14668e37f6..ddca99ad3d 100644 --- a/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceTryTest.java +++ b/pmd-swift/src/test/java/net/sourceforge/pmd/lang/swift/rule/errorprone/ForceTryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.swift.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ForceTryTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractAntTestHelper.java similarity index 99% rename from pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractAntTestHelper.java index f6e3f3eef2..66becd81dd 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/ant/AbstractAntTestHelper.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractAntTestHelper.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.ant; +package net.sourceforge.pmd.test; import static java.io.File.separator; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/AbstractLanguageVersionTest.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractLanguageVersionTest.java similarity index 99% rename from pmd-test/src/main/java/net/sourceforge/pmd/AbstractLanguageVersionTest.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractLanguageVersionTest.java index 9121161096..54ec50a108 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/AbstractLanguageVersionTest.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/AbstractLanguageVersionTest.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd; +package net.sourceforge.pmd.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PmdRuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/PmdRuleTst.java similarity index 94% rename from pmd-test/src/main/java/net/sourceforge/pmd/testframework/PmdRuleTst.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/PmdRuleTst.java index b9bd7f5555..0e7764693b 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/PmdRuleTst.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/PmdRuleTst.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.testframework; +package net.sourceforge.pmd.test; import java.util.Collections; import java.util.List; diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/RuleTst.java similarity index 99% rename from pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/RuleTst.java index bb0719095e..7802e4cd9f 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/RuleTst.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.testframework; +package net.sourceforge.pmd.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/SimpleAggregatorTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/SimpleAggregatorTst.java similarity index 96% rename from pmd-test/src/main/java/net/sourceforge/pmd/testframework/SimpleAggregatorTst.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/SimpleAggregatorTst.java index 1d067dfb74..db2e3f8daa 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/SimpleAggregatorTst.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/SimpleAggregatorTst.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.testframework; +package net.sourceforge.pmd.test; import java.util.ArrayList; import java.util.List; diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleSetFactoryTest.java b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/rule/AbstractRuleSetFactoryTest.java similarity index 98% rename from pmd-test/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleSetFactoryTest.java rename to pmd-test/src/main/java/net/sourceforge/pmd/test/lang/rule/AbstractRuleSetFactoryTest.java index 99100db008..f611484ac8 100644 --- a/pmd-test/src/main/java/net/sourceforge/pmd/lang/rule/AbstractRuleSetFactoryTest.java +++ b/pmd-test/src/main/java/net/sourceforge/pmd/test/lang/rule/AbstractRuleSetFactoryTest.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.lang.rule; +package net.sourceforge.pmd.test.lang.rule; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; @@ -45,6 +45,12 @@ import org.xml.sax.helpers.DefaultHandler; import net.sourceforge.pmd.internal.util.IOUtil; import net.sourceforge.pmd.lang.Language; import net.sourceforge.pmd.lang.LanguageRegistry; +import net.sourceforge.pmd.lang.rule.InternalApiBridge; +import net.sourceforge.pmd.lang.rule.Rule; +import net.sourceforge.pmd.lang.rule.RuleReference; +import net.sourceforge.pmd.lang.rule.RuleSet; +import net.sourceforge.pmd.lang.rule.RuleSetLoader; +import net.sourceforge.pmd.lang.rule.RuleSetWriter; import net.sourceforge.pmd.lang.rule.xpath.XPathRule; import net.sourceforge.pmd.properties.PropertyDescriptor; import net.sourceforge.pmd.util.log.internal.MessageReporterBase; @@ -355,8 +361,7 @@ public abstract class AbstractRuleSetFactoryTest { } } - RuleSet ruleSet = new RuleSetLoader() - .withReporter(new Reporter()) + RuleSet ruleSet = InternalApiBridge.withReporter(new RuleSetLoader(), new Reporter()) .loadFromResource(ruleSetFileName); assertThat("There should be no warnings while loading the ruleset", diff --git a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java b/pmd-test/src/test/java/net/sourceforge/pmd/test/RuleTstTest.java similarity index 98% rename from pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java rename to pmd-test/src/test/java/net/sourceforge/pmd/test/RuleTstTest.java index b10d6a3962..3321a7895b 100644 --- a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java +++ b/pmd-test/src/test/java/net/sourceforge/pmd/test/RuleTstTest.java @@ -2,7 +2,7 @@ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html */ -package net.sourceforge.pmd.testframework; +package net.sourceforge.pmd.test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/LanguageVersionTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/LanguageVersionTest.java index f1020ad052..b595f07ad7 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/LanguageVersionTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.vf; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/RuleSetFactoryTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/RuleSetFactoryTest.java index 4023f74ed7..a70c934d67 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/RuleSetFactoryTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/RuleSetFactoryTest.java @@ -5,7 +5,7 @@ package net.sourceforge.pmd.lang.vf; import net.sourceforge.pmd.lang.apex.ApexLanguageModule; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; class RuleSetFactoryTest extends AbstractRuleSetFactoryTest { RuleSetFactoryTest() { diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfCsrfTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfCsrfTest.java index deff451dc8..d48fd98e3c 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfCsrfTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfCsrfTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vf.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class VfCsrfTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfHtmlStyleTagXssTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfHtmlStyleTagXssTest.java index 07c8242e8b..1071c6a987 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfHtmlStyleTagXssTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfHtmlStyleTagXssTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vf.rule.security; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class VfHtmlStyleTagXssTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElTest.java b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElTest.java index 5046d28f62..d9adf67898 100644 --- a/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElTest.java +++ b/pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/rule/security/VfUnescapeElTest.java @@ -17,7 +17,7 @@ import net.sourceforge.pmd.lang.vf.VFTestUtils; import net.sourceforge.pmd.lang.vf.ast.VfParsingHelper; import net.sourceforge.pmd.reporting.Report; import net.sourceforge.pmd.reporting.RuleViolation; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class VfUnescapeElTest extends PmdRuleTst { private static final String EXPECTED_RULE_MESSAGE = "Avoid unescaped user controlled content in EL"; diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/LanguageVersionTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/LanguageVersionTest.java index 0f2b715e44..bd51aaae2f 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/LanguageVersionTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.vm; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; class LanguageVersionTest extends AbstractLanguageVersionTest { diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/RuleSetFactoryTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/RuleSetFactoryTest.java index 63278e21d7..b549df0edd 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/RuleSetFactoryTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test velocity's rulesets. diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/AvoidReassigningParametersTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/AvoidReassigningParametersTest.java index 4fb9224dae..3b14ac5628 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/AvoidReassigningParametersTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/AvoidReassigningParametersTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidReassigningParametersTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/UnusedMacroParameterTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/UnusedMacroParameterTest.java index 997bea144e..b9f961adb2 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/UnusedMacroParameterTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/bestpractices/UnusedMacroParameterTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UnusedMacroParameterTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsTest.java index 698bc4711f..720ffeaa50 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/AvoidDeeplyNestedIfStmtsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidDeeplyNestedIfStmtsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/CollapsibleIfStatementsTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/CollapsibleIfStatementsTest.java index 9eb705dabb..a5053b4c86 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/CollapsibleIfStatementsTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/CollapsibleIfStatementsTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class CollapsibleIfStatementsTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/ExcessiveTemplateLengthTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/ExcessiveTemplateLengthTest.java index 64142b26ca..bb77ea067e 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/ExcessiveTemplateLengthTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/ExcessiveTemplateLengthTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ExcessiveTemplateLengthTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineJavaScriptTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineJavaScriptTest.java index 42a2739945..a2ca069449 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineJavaScriptTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineJavaScriptTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoInlineJavaScriptTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineStylesTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineStylesTest.java index 2d5c7b65b4..1f9592a738 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineStylesTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/design/NoInlineStylesTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.design; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class NoInlineStylesTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyForeachStmtTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyForeachStmtTest.java index 56a4b90477..ccd9182e67 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyForeachStmtTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyForeachStmtTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class EmptyForeachStmtTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyIfStmtTest.java b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyIfStmtTest.java index 63fe618db2..034e362b8f 100644 --- a/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyIfStmtTest.java +++ b/pmd-vm/src/test/java/net/sourceforge/pmd/lang/vm/rule/errorprone/EmptyIfStmtTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.vm.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class EmptyIfStmtTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java index 463babc041..0a4bfe7f68 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/LanguageVersionTest.java @@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.xml; import java.util.Arrays; import java.util.Collection; -import net.sourceforge.pmd.AbstractLanguageVersionTest; +import net.sourceforge.pmd.test.AbstractLanguageVersionTest; import net.sourceforge.pmd.lang.xml.pom.PomLanguageModule; import net.sourceforge.pmd.lang.xml.wsdl.WsdlLanguageModule; import net.sourceforge.pmd.lang.xml.xsl.XslLanguageModule; diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/PMDTaskTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/PMDTaskTest.java index f3a873ff13..bb270df6b8 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/PMDTaskTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/PMDTaskTest.java @@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.xml; import org.junit.jupiter.api.Test; -import net.sourceforge.pmd.ant.AbstractAntTestHelper; +import net.sourceforge.pmd.test.AbstractAntTestHelper; class PMDTaskTest extends AbstractAntTestHelper { diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/RuleSetFactoryTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/RuleSetFactoryTest.java index 4d4ce31948..c98dba1c9d 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/RuleSetFactoryTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/RuleSetFactoryTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml; -import net.sourceforge.pmd.lang.rule.AbstractRuleSetFactoryTest; +import net.sourceforge.pmd.test.lang.rule.AbstractRuleSetFactoryTest; /** * Test xml's and xslt's rulesets diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/InvalidDependencyTypesTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/InvalidDependencyTypesTest.java index 0b6dd1f036..10c6674a36 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/InvalidDependencyTypesTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/InvalidDependencyTypesTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.pom.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class InvalidDependencyTypesTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/ProjectVersionAsDependencyVersionTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/ProjectVersionAsDependencyVersionTest.java index 78805a4fc3..8011eb18a0 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/ProjectVersionAsDependencyVersionTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/pom/rule/errorprone/ProjectVersionAsDependencyVersionTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.pom.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class ProjectVersionAsDependencyVersionTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/bestpractices/MissingEncodingTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/bestpractices/MissingEncodingTest.java index ba1fd2964b..499d979dfb 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/bestpractices/MissingEncodingTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/rule/bestpractices/MissingEncodingTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.rule.bestpractices; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class MissingEncodingTest extends PmdRuleTst { // no additional unit tests 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 d83318a1d0..bc78d8d8d8 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 @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.rule.errorprone; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class MistypedCDATASectionTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/codestyle/UseConcatOnceTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/codestyle/UseConcatOnceTest.java index b4ea085fb1..b9b36aed24 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/codestyle/UseConcatOnceTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/codestyle/UseConcatOnceTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.xsl.rule.codestyle; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class UseConcatOnceTest extends PmdRuleTst { // no additional unit tests diff --git a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/performance/AvoidAxisNavigationTest.java b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/performance/AvoidAxisNavigationTest.java index 741f2598fa..ee4fbc514e 100644 --- a/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/performance/AvoidAxisNavigationTest.java +++ b/pmd-xml/src/test/java/net/sourceforge/pmd/lang/xml/xsl/rule/performance/AvoidAxisNavigationTest.java @@ -4,7 +4,7 @@ package net.sourceforge.pmd.lang.xml.xsl.rule.performance; -import net.sourceforge.pmd.testframework.PmdRuleTst; +import net.sourceforge.pmd.test.PmdRuleTst; class AvoidAxisNavigationTest extends PmdRuleTst { // no additional unit tests