[lang-test] Move classes into n.s.p.lang.test

docs/pages/pmd/devdocs/major_contributions/adding_a_new_javacc_based_language.md

@@ -119,7 +119,7 @@ against a previously recorded version. If there are differences, the test fails.
 This helps to detect anything in the AST structure that changed, maybe unexpectedly.
 
 *   Create a test class in the package `net.sourceforge.pmd.lang.$lang.ast` with the name `$langTreeDumpTest`.
-*   This test class must extend `net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest`. Note: This class
+*   This test class must extend `net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest`. Note: This class
     is written in kotlin and is available in the module "lang-test".
 *   Add a default constructor, that calls the super constructor like so:
     
@@ -131,7 +131,7 @@ This helps to detect anything in the AST structure that changed, maybe unexpecte
     
     Replace "$lang" and "$extension" accordingly.
 *   Implement the method `getParser()`. It must return a
-    subclass of `net.sourceforge.pmd.lang.ast.test.BaseParsingHelper`. See 
+    subclass of `net.sourceforge.pmd.lang.test.ast.BaseParsingHelper`. See 
     `net.sourceforge.pmd.lang.ecmascript.ast.JsParsingHelper` for an example.
     With this parser helper you can also specify, where the test files are searched, by using
     the method `withResourceContext(Class<?>, String)`.

docs/pages/release_notes.md

@@ -332,6 +332,12 @@ in the migration guide for details.
   * {%jdoc core::lang.rule.xpath.XPathRule %} has been moved into subpackage {% jdoc_package core::lang.rule.xpath %}.
 * pmd-html
   * `net.sourceforge.pmd.lang.html.ast.HtmlCpdLexer` moved into package `cpd`: {%jdoc html::lang.html.cpd.HtmlCpdLexer %}.
+* pmd-lang-test: All types have been moved under the new base package {%jdoc_package lang-test::lang.test %}:
+  * {%jdoc lang-test::lang.test.AbstractMetricTestRule %} (moved from `net.sourceforge.pmd.test.AbstractMetricTestRule`)
+  * {%jdoc lang-test::lang.test.BaseTextComparisonTest %} (moved from `net.sourceforge.pmd.test.BaseTextComparisonTest`)
+  * {%jdoc lang-test::lang.test.cpd.CpdTextComparisonTest %} (moved from `net.sourceforge.pmd.cpd.test.CpdTextComparisonTest`)
+  * {%jdoc lang-test::lang.test.ast.BaseTreeDumpTest %} (moved from `net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest`)
+  * Any many other types have been moved from `net.sourceforge.pmd.lang.ast.test` to `net.sourceforge.pmd.lang.test`.
 
 **Internalized classes and interfaces and methods**
 

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/SuppressWarningsTest.java

@@ -4,8 +4,8 @@
 
 package net.sourceforge.pmd.lang.apex;
 
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSuppressed;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java

@@ -4,8 +4,8 @@
 
 package net.sourceforge.pmd.lang.apex.ast;
 
-import static net.sourceforge.pmd.lang.ast.test.NodeExtensionsKt.textOfReportLocation;
+import static net.sourceforge.pmd.lang.test.ast.NodeExtensionsKt.textOfReportLocation;
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertPosition;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertPosition;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.core.StringContains.containsString;

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParsingHelper.java

@@ -5,7 +5,7 @@
 package net.sourceforge.pmd.lang.apex.ast;
 
 import net.sourceforge.pmd.lang.apex.ApexLanguageModule;
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
 
 public class ApexParsingHelper extends BaseParsingHelper<ApexParsingHelper, ASTApexFile> {
 

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeDumpTest.java

@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.apex.ast;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
-import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest;
-import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter;
 
 class ApexTreeDumpTest extends BaseTreeDumpTest {
 

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.apex.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 import net.sourceforge.pmd.lang.apex.ApexLanguageModule;
 
 class ApexCpdLexerTest extends CpdTextComparisonTest {

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/CognitiveComplexityTestRule.java

@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.apex.metrics.impl;
 import net.sourceforge.pmd.lang.apex.ast.ASTMethod;
 import net.sourceforge.pmd.lang.apex.metrics.ApexMetrics;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.test.AbstractMetricTestRule;
+import net.sourceforge.pmd.lang.test.AbstractMetricTestRule;
 
 /**
  * @author Gwilym Kuiper

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/CycloTestRule.java

@@ -8,7 +8,7 @@ import net.sourceforge.pmd.lang.apex.ast.ASTMethod;
 import net.sourceforge.pmd.lang.apex.ast.ASTUserClassOrInterface;
 import net.sourceforge.pmd.lang.apex.metrics.ApexMetrics;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.test.AbstractMetricTestRule;
+import net.sourceforge.pmd.lang.test.AbstractMetricTestRule;
 
 /**
  * Tests standard cyclo.

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/metrics/impl/WmcTestRule.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.apex.metrics.impl;
 
 import net.sourceforge.pmd.lang.apex.metrics.ApexMetrics;
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.test.AbstractMetricTestRule;
+import net.sourceforge.pmd.lang.test.AbstractMetricTestRule;
 
 /**
  * @author Clément Fournier

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRuleTest.java

@@ -12,7 +12,7 @@ import net.sourceforge.pmd.lang.apex.ast.ASTUserEnum;
 import net.sourceforge.pmd.lang.apex.ast.ASTUserInterface;
 import net.sourceforge.pmd.lang.apex.ast.ASTUserTrigger;
 import net.sourceforge.pmd.lang.apex.ast.ApexParserTestBase;
-import net.sourceforge.pmd.lang.ast.test.TestUtilsKt;
+import net.sourceforge.pmd.lang.test.ast.TestUtilsKt;
 import net.sourceforge.pmd.reporting.Report;
 
 class AbstractApexRuleTest extends ApexParserTestBase {

pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRuleTest.java

@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.apex.rule;
 
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
 
 import org.junit.jupiter.api.Test;
 

pmd-coco/src/test/java/net/sourceforge/pmd/lang/coco/cpd/CocoCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.coco.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 import net.sourceforge.pmd.lang.coco.CocoLanguageModule;
 
 class CocoCpdLexerTest extends CpdTextComparisonTest {

pmd-cpp/src/test/java/net/sourceforge/pmd/lang/cpp/cpd/CppCpdLexerTest.java

@@ -12,8 +12,8 @@ import org.junit.jupiter.api.Test;
 import net.sourceforge.pmd.cpd.CpdLanguageProperties;
 import net.sourceforge.pmd.cpd.CpdLexer;
 import net.sourceforge.pmd.cpd.Tokens;
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
-import net.sourceforge.pmd.cpd.test.LanguagePropertyConfig;
+import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig;
 import net.sourceforge.pmd.lang.cpp.CppLanguageModule;
 
 class CppCpdLexerTest extends CpdTextComparisonTest {

pmd-cs/src/test/java/net/sourceforge/pmd/lang/cs/cpd/CsCpdLexerTest.java

@@ -10,8 +10,8 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.jupiter.api.Test;
 
 import net.sourceforge.pmd.cpd.CpdLanguageProperties;
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
-import net.sourceforge.pmd.cpd.test.LanguagePropertyConfig;
+import net.sourceforge.pmd.lang.test.cpd.LanguagePropertyConfig;
 import net.sourceforge.pmd.lang.ast.LexException;
 
 class CsCpdLexerTest extends CpdTextComparisonTest {

pmd-dart/src/test/java/net/sourceforge/pmd/lang/dart/cpd/DartCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.dart.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 
 class DartCpdLexerTest extends CpdTextComparisonTest {
 

pmd-fortran/src/test/java/net/sourceforge/pmd/lang/fortran/cpd/FortranCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.fortran.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 
 /**
  * @author rpelisse

pmd-gherkin/src/test/java/net/sourceforge/pmd/lang/gherkin/cpd/GherkinCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.gherkin.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 
 class GherkinCpdLexerTest extends CpdTextComparisonTest {
     GherkinCpdLexerTest() {

pmd-go/src/test/java/net/sourceforge/pmd/lang/go/cpd/GoCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.go.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 
 class GoCpdLexerTest extends CpdTextComparisonTest {
 

pmd-groovy/src/test/java/net/sourceforge/pmd/lang/groovy/cpd/GroovyCpdLexerTest.java

@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.groovy.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 
 class GroovyCpdLexerTest extends CpdTextComparisonTest {
 

pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlParsingHelper.java

@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.html.ast;
 
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
 import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
 
 public final class HtmlParsingHelper extends BaseParsingHelper<HtmlParsingHelper, ASTHtmlDocument> {

pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/HtmlTreeDumpTest.java

@@ -7,9 +7,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
-import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest;
-import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter;
 
 class HtmlTreeDumpTest extends BaseTreeDumpTest {
     HtmlTreeDumpTest() {

pmd-html/src/test/java/net/sourceforge/pmd/lang/html/ast/PositionTest.java

@@ -6,9 +6,9 @@ package net.sourceforge.pmd.lang.html.ast;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
-import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest;
-import net.sourceforge.pmd.lang.ast.test.CoordinatesPrinter;
+import net.sourceforge.pmd.lang.test.ast.CoordinatesPrinter;
 
 class PositionTest extends BaseTreeDumpTest {
     PositionTest() {

pmd-html/src/test/java/net/sourceforge/pmd/lang/html/cpd/HtmlCpdLexerTest.java

@@ -7,7 +7,7 @@ package net.sourceforge.pmd.lang.html.cpd;
 
 import org.junit.jupiter.api.Test;
 
-import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
+import net.sourceforge.pmd.lang.test.cpd.CpdTextComparisonTest;
 import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
 
 class HtmlCpdLexerTest extends CpdTextComparisonTest {

pmd-java/src/test/java/net/sourceforge/pmd/ExcludeLinesTest.java

@@ -4,8 +4,8 @@
 
 package net.sourceforge.pmd;
 
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSuppressed;
 
 import org.junit.jupiter.api.Test;
 

pmd-java/src/test/java/net/sourceforge/pmd/ReportTest.java

@@ -4,8 +4,8 @@
 
 package net.sourceforge.pmd;
 
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSuppressed;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSuppressed;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.Optional;

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/BaseJavaTreeDumpTest.java

@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.java;
 
-import net.sourceforge.pmd.lang.ast.test.BaseTreeDumpTest;
+import net.sourceforge.pmd.lang.test.ast.BaseTreeDumpTest;
 
 /**
  * Special tweak of BaseTreeDumpTest to remove deprecated attributes

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java

@@ -11,7 +11,7 @@ import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import net.sourceforge.pmd.lang.ast.Node;
-import net.sourceforge.pmd.lang.ast.test.RelevantAttributePrinter;
+import net.sourceforge.pmd.lang.test.ast.RelevantAttributePrinter;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTModifierList;

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java

@@ -24,7 +24,7 @@ import net.sourceforge.pmd.lang.LanguageProcessor;
 import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
 import net.sourceforge.pmd.lang.ast.SemanticException;
-import net.sourceforge.pmd.lang.ast.test.BaseParsingHelper;
+import net.sourceforge.pmd.lang.test.ast.BaseParsingHelper;
 import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
 import net.sourceforge.pmd.lang.java.ast.JavaParser;
 import net.sourceforge.pmd.lang.java.internal.JavaAstProcessor;

pmd-java/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java

@@ -4,7 +4,7 @@
 
 package net.sourceforge.pmd.lang.java;
 
-import static net.sourceforge.pmd.lang.ast.test.TestUtilsKt.assertSize;
+import static net.sourceforge.pmd.lang.test.ast.TestUtilsKt.assertSize;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.junit.jupiter.api.Test;