hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

[java] Consolidate test packages

Browse Source
This commit is contained in:
Andreas Dangel
2024-02-23 14:54:22 +01:00
parent 194f759533
commit a00916b4f0
10 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ExcludeLinesTest.java
View File

@ -2,14 +2,13 @@
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd;
package net.sourceforge.pmd.lang.java;
import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSuppressed;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.java.BaseParserTest;
import net.sourceforge.pmd.lang.java.ast.ASTVariableId;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
import net.sourceforge.pmd.lang.rule.Rule;

2
pmd-java/src/test/java/net/sourceforge/pmd/FooRule.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/FooRule.java
View File

@ -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.lang.java;
import net.sourceforge.pmd.lang.java.ast.ASTClassDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTVariableId;

4
pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionDiscovererTest.java
View File

@ -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.lang.java;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -11,11 +11,11 @@ import java.io.File;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.PMDConfiguration;
import net.sourceforge.pmd.lang.Language;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.LanguageVersionDiscoverer;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
class LanguageVersionDiscovererTest {

3
pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDCoverageTest.java
View File

@ -2,7 +2,7 @@
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.coverage;
package net.sourceforge.pmd.lang.java;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@ -25,7 +25,6 @@ import net.sourceforge.pmd.PMDConfiguration;
import net.sourceforge.pmd.PmdAnalysis;
import net.sourceforge.pmd.internal.util.IOUtil;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import com.github.stefanbirkner.systemlambda.SystemLambda;

3
pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDTaskTest.java
View File

@ -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.lang.java;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -19,6 +19,7 @@ import net.sourceforge.pmd.test.AbstractAntTestHelper;
class PMDTaskTest extends AbstractAntTestHelper {
PMDTaskTest() {
pathToTestScript = "target/test-classes/net/sourceforge/pmd/lang/java/ant/xml";
antTestScriptFilename = "pmdtasktest.xml";
}

3
pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java → pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ReportTest.java
View File

@ -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.lang.java;
import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSuppressed;
@ -13,7 +13,6 @@ import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.lang.java.JavaParsingHelper;
import net.sourceforge.pmd.lang.rule.Rule;
import net.sourceforge.pmd.reporting.Report;

1
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
View File

@ -9,7 +9,6 @@ import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.FooRule;
import net.sourceforge.pmd.lang.java.ast.ASTClassDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;

0
pmd-java/src/test/resources/net/sourceforge/pmd/ant/classpathtest/ruleset.xml → pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/classpathtest/ruleset.xml
View File

0
pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/custom_ruleset.xml → pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/custom_ruleset.xml
View File

4
pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml → pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/pmdtasktest.xml
View File

@ -101,9 +101,7 @@
<classpath>
<pathelement path="${pmd.home}/target/classes"/>
<pathelement path="${pmd.home}/target/test-classes"/>
<pathelement path="${pmd.home}/target/test-classes/net/sourceforge/pmd/ant"/>
<pathelement path="${pmd.home}/target/clover/test-classes"/>
<pathelement path="${pmd.home}/target/clover/test-classes/net/sourceforge/pmd/ant"/>
<pathelement path="${pmd.home}/target/test-classes/net/sourceforge/pmd/lang/java/ant"/>
</classpath>
</pmd>
</target>