From a00916b4f0765f057daba14f6d6f54dc04c2f16c Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Fri, 23 Feb 2024 14:54:22 +0100
Subject: [PATCH] [java] Consolidate test packages

---
 .../net/sourceforge/pmd/{ => lang/java}/ExcludeLinesTest.java | 3 +--
 .../java/net/sourceforge/pmd/{ => lang/java}/FooRule.java     | 2 +-
 .../pmd/{ => lang/java}/LanguageVersionDiscovererTest.java    | 4 ++--
 .../pmd/{coverage => lang/java}/PMDCoverageTest.java          | 3 +--
 .../net/sourceforge/pmd/{ant => lang/java}/PMDTaskTest.java   | 3 ++-
 .../java/net/sourceforge/pmd/{ => lang/java}/ReportTest.java  | 3 +--
 .../net/sourceforge/pmd/lang/java/SuppressWarningsTest.java   | 1 -
 .../pmd/{ => lang/java}/ant/classpathtest/ruleset.xml         | 0
 .../pmd/{ => lang/java}/ant/xml/custom_ruleset.xml            | 0
 .../sourceforge/pmd/{ => lang/java}/ant/xml/pmdtasktest.xml   | 4 +---
 10 files changed, 9 insertions(+), 14 deletions(-)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{ => lang/java}/ExcludeLinesTest.java (96%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{ => lang/java}/FooRule.java (96%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{ => lang/java}/LanguageVersionDiscovererTest.java (96%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{coverage => lang/java}/PMDCoverageTest.java (97%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{ant => lang/java}/PMDTaskTest.java (97%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/{ => lang/java}/ReportTest.java (96%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/{ => lang/java}/ant/classpathtest/ruleset.xml (100%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/{ => lang/java}/ant/xml/custom_ruleset.xml (100%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/{ => lang/java}/ant/xml/pmdtasktest.xml (96%)

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ExcludeLinesTest.java
similarity index 96%
rename from pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ExcludeLinesTest.java
index 1a4385924d..f8be02dc22 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ExcludeLinesTest.java
@@ -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;
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/FooRule.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/FooRule.java
similarity index 96%
rename from pmd-java/src/test/java/net/sourceforge/pmd/FooRule.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/FooRule.java
index 8c16cc9e74..7875410bdd 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/FooRule.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/FooRule.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.lang.java;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTVariableId;
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionDiscovererTest.java
similarity index 96%
rename from pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionDiscovererTest.java
index 4b190e8689..77ff85c6c7 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/LanguageVersionDiscovererTest.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.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 {
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDCoverageTest.java
similarity index 97%
rename from pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDCoverageTest.java
index ff9265a678..5202134e26 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/coverage/PMDCoverageTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDCoverageTest.java
@@ -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;
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDTaskTest.java
similarity index 97%
rename from pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDTaskTest.java
index d855a4743e..268b850b11 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ant/PMDTaskTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/PMDTaskTest.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.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";
     }
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ReportTest.java
similarity index 96%
rename from pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ReportTest.java
index a69985f815..2e6befc748 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ReportTest.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.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;
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
index 6eac1121fb..40a023f965 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
@@ -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;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/classpathtest/ruleset.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/classpathtest/ruleset.xml
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/ant/classpathtest/ruleset.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/classpathtest/ruleset.xml
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/custom_ruleset.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/custom_ruleset.xml
similarity index 100%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/custom_ruleset.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/custom_ruleset.xml
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/pmdtasktest.xml
similarity index 96%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/pmdtasktest.xml
index a1abe53864..4378af2f1e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/ant/xml/pmdtasktest.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/ant/xml/pmdtasktest.xml
@@ -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>