You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/09/29 14:12:10 UTC
[sis] 02/02: Move some tests closer to the place where they are used.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 66ca33f85325d8a97faba0bdfd10ba33fe5a053a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Sep 29 15:57:14 2023 +0200
Move some tests closer to the place where they are used.
---
endorsed/build.gradle.kts | 8 ++----
.../test}/FeatureComparator.java | 2 +-
.../feature => feature/test}/package-info.java | 2 +-
.../test/org/apache/sis/metadata/Assertions.java | 2 +-
.../sis/metadata/PropertyConsistencyCheck.java | 2 +-
.../sis/metadata/iso/CustomMetadataTest.java | 2 +-
.../sis/metadata/iso/DefaultIdentifierTest.java | 2 +-
.../sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../constraint/DefaultLegalConstraintsTest.java | 2 +-
.../sis/metadata/iso/content/DefaultBandTest.java | 2 +-
.../identification/DefaultBrowseGraphicTest.java | 2 +-
.../DefaultRepresentativeFractionTest.java | 2 +-
.../iso/identification/DefaultResolutionTest.java | 2 +-
.../metadata/iso/lineage/DefaultLineageTest.java | 2 +-
.../sis/metadata/iso/quality/ScopeCodeTest.java | 2 +-
.../sis/metadata/sql/IdentifierGeneratorTest.java | 2 +-
.../sis/metadata/sql/MetadataFallbackVerifier.java | 1 -
.../sis/metadata/sql/MetadataSourceTest.java | 1 -
.../sis/metadata/sql/MetadataWriterTest.java | 1 -
.../sis/{test => metadata}/sql/TestDatabase.java | 2 +-
.../sis/metadata/sql/util/ScriptRunnerTest.java | 2 +-
.../sis/metadata/xml/SchemaComplianceTest.java | 2 +-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 2 +-
.../org/apache/sis/test/mock/package-info.java | 2 +-
.../test/org/apache/sis/test/sql/package-info.java | 29 ----------------------
.../apache/sis/util/iso/NameMarshallingTest.java | 2 +-
.../sis/xml/CharSequenceSubstitutionTest.java | 2 +-
.../apache/sis/xml/NilReasonMarshallingTest.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/UUIDMarshallingTest.java | 2 +-
.../org/apache/sis/xml/XLinkMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/CodeListMarshallingTest.java | 2 +-
.../sis/xml/bind/cat/EnumMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../sis/xml/bind/lan/FreeTextMarshallingTest.java | 2 +-
.../apache/sis/xml/bind/lan/LanguageCodeTest.java | 2 +-
.../metadata/replace/QualityParameterTest.java | 2 +-
.../metadata/replace/ServiceParameterTest.java | 2 +-
.../test}/AnnotationConsistencyCheck.java | 2 +-
.../{test/xml => xml/test}/DocumentComparator.java | 2 +-
.../sis/{test/xml => xml/test}/InfiniteSet.java | 2 +-
.../{test/xml => xml/test}/PackageVerifier.java | 2 +-
.../{test/xml => xml/test}/SchemaCompliance.java | 2 +-
.../sis/{test/xml => xml/test}/TestCase.java | 2 +-
.../sis/{test/xml => xml/test}/package-info.java | 8 +++---
.../sis/xml/util/DocumentComparatorTest.java | 2 +-
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 2 +-
.../sis/xml/bind/fra/DataIdentificationTest.java | 2 +-
.../xml/bind/fra/DirectReferenceSystemTest.java | 2 +-
.../sis/parameter/ParameterMarshallingTest.java | 2 +-
.../sis/referencing/ImmutableIdentifierTest.java | 2 +-
.../referencing/crs/DefaultCompoundCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 2 +-
.../referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../referencing/crs/DefaultGeodeticCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultImageCRSTest.java | 2 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 2 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 2 +-
.../referencing/datum/DefaultEllipsoidTest.java | 2 +-
.../datum/DefaultGeodeticDatumTest.java | 2 +-
.../datum/DefaultPrimeMeridianTest.java | 2 +-
.../datum/DefaultTemporalDatumTest.java | 2 +-
.../datum/DefaultVerticalDatumTest.java | 2 +-
.../sis/referencing/factory/TestFactorySource.java | 4 +--
.../referencing/factory/sql/EPSGInstallerTest.java | 2 +-
.../factory/sql/epsg/DataScriptFormatter.java | 2 +-
.../DefaultConcatenatedOperationTest.java | 2 +-
.../operation/DefaultPassThroughOperationTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 2 +-
.../apache/sis/test/integration/MetadataTest.java | 4 +--
.../sis/test/integration/MetadataVerticalTest.java | 2 +-
.../CC_GeneralOperationParameterTest.java | 2 +-
.../CC_OperationParameterGroupTest.java | 2 +-
.../referencing/SecondDefiningParameterTest.java | 2 +-
.../sis/storage/geotiff/SelfConsistencyTest.java | 2 +-
.../sis/storage/netcdf/SelfConsistencyTest.java | 2 +-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../apache/sis/storage/sql/TestOnAllDatabases.java | 2 +-
.../sql/feature/SelectionClauseWriterTest.java | 2 +-
.../sql/feature/TemporalValueGetterTest.java | 2 +-
.../sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../sis/storage/esri/BILConsistencyTest.java | 2 +-
.../sis/storage/esri/BIPConsistencyTest.java | 2 +-
.../sis/storage/esri/BSQConsistencyTest.java | 2 +-
.../sis/storage/image/SelfConsistencyTest.java | 2 +-
.../test}/CoverageReadConsistency.java | 2 +-
.../storage => storage/test}/SubsampledImage.java | 2 +-
.../storage => storage/test}/package-info.java | 4 +--
.../sis/util/collection/TableColumnTest.java | 4 +--
.../test}/SerializableTableColumn.java | 2 +-
.../foreigner => util/test}/package-info.java | 2 +-
netbeans-project/nbproject/project.properties | 7 +++---
96 files changed, 102 insertions(+), 139 deletions(-)
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index 3a545e2d08..b2616486d2 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -138,15 +138,11 @@ fun addExportForTests(args : MutableList<String>) {
addExport(args, "org.apache.sis.metadata", "org.apache.sis.test.mock",
"org.apache.sis.referencing")
- addExport(args, "org.apache.sis.metadata", "org.apache.sis.test.sql",
- "org.apache.sis.referencing," +
- "org.apache.sis.storage.sql")
-
- addExport(args, "org.apache.sis.metadata", "org.apache.sis.test.xml",
+ addExport(args, "org.apache.sis.metadata", "org.apache.sis.xml.test",
"org.apache.sis.referencing," +
"org.apache.sis.profile.france")
- addExport(args, "org.apache.sis.storage", "org.apache.sis.test.storage",
+ addExport(args, "org.apache.sis.storage", "org.apache.sis.storage.test",
"org.apache.sis.storage.geotiff," +
"org.apache.sis.storage.netcdf")
/*
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
similarity index 99%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
index b1fd35f258..ec467ac4fe 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.feature;
+package org.apache.sis.feature.test;
import java.util.Set;
import java.util.Map;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/package-info.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/package-info.java
rename to endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/package-info.java
index 72933c1d54..4ab5f082a8 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/package-info.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/package-info.java
@@ -26,4 +26,4 @@
* @version 1.1
* @since 1.1
*/
-package org.apache.sis.test.feature;
+package org.apache.sis.feature.test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
index 0abab0c821..9b5e8f464c 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/Assertions.java
@@ -30,7 +30,7 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
-import org.apache.sis.test.xml.DocumentComparator;
+import org.apache.sis.xml.test.DocumentComparator;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 41cd476bfd..f144dbf6e4 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.internal.Dependencies;
import org.junit.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.AnnotationConsistencyCheck;
+import org.apache.sis.xml.test.AnnotationConsistencyCheck;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.ControlledVocabulary;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
index 9366fa118c..029815559f 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/CustomMetadataTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.xml.XML;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
index 2aefc52e30..268c8b60f7 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.*;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index 475260a5c7..9823d91b09 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
index fd92c8e3b7..cd4a74b9f5 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.xml.bind.Context;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index 64274c355c..fb59479588 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index 4e98adcfd8..a21e4c46cd 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index ea817f5804..743e23f748 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.util.Version;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
index 7c545e8048..c1f0820422 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.xml.XML;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static java.util.logging.Logger.getLogger;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
index 46a1e7d156..03a5ce0a27 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.Version;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index e012c829c3..faa96f99f7 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -28,7 +28,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
index fb01fda0c6..b3e6301318 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
index a0af23034a..fca4d874f0 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.maintenance.ScopeCode;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
index f6675c87cc..035dd96a84 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.metadata.sql.util.SQLBuilder;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index e852484eb3..716a108546 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@ -26,7 +26,6 @@ import org.apache.sis.metadata.iso.citation.Citations;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.sql.TestDatabase;
import static org.apache.sis.util.internal.CollectionsExt.first;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
index 788b5fadd5..eb89af87c8 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
-import org.apache.sis.test.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index fea3a6377a..ea014c6588 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -32,7 +32,6 @@ import org.junit.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/TestDatabase.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/TestDatabase.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
index db870beaae..ee4574d860 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/TestDatabase.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.sql;
+package org.apache.sis.metadata.sql;
import java.util.List;
import java.util.function.Supplier;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/util/ScriptRunnerTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/util/ScriptRunnerTest.java
index d7ffe72b66..1239e6751d 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/util/ScriptRunnerTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/util/ScriptRunnerTest.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index 6e248faffb..fa547b2a52 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.system.DataDirectory;
import org.junit.Test;
import org.apache.sis.test.ProjectDirectories;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.xml.SchemaCompliance;
+import org.apache.sis.xml.test.SchemaCompliance;
import static org.junit.Assume.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
index adec9599f0..01c4f11364 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/TestUsingFile.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
import org.apache.sis.util.Version;
// Test dependencies
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
index d28e308e21..d5f9d56f26 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/package-info.java
@@ -17,7 +17,7 @@
/**
* Provides objects that simulate the behavior of complex or unavailable real objects.
- * Mocks are often used as a replacement for objects to be defined only in dependant modules.
+ * Mocks are often used as a replacement for objects to be defined only in dependent modules.
*
* <p>This package does not provide all mocks defined by SIS, but only the mocks that could not be put in
* the right package for the interface that they implement. To get a list of all mocks used in SIS tests,
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/package-info.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/package-info.java
deleted file mode 100644
index c904af5629..0000000000
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/sql/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Utility methods for testing SQL databases.
- *
- * <p>Objects defined in this package are only for SIS testing purpose any many change
- * in any future version without notice.</p>
- *
- * @author Martin Desruisseaux (Geomatys)
- * @author Alexis Manin (Geomatys)
- * @version 1.2
- * @since 1.0
- */
-package org.apache.sis.test.sql;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
index b1005a0613..fa3f385679 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/NameMarshallingTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.mock.IdentifiedObjectMock;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index 77a0e27b18..1d07d2be4a 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.util.iso.Types;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.internal.ImplementationHelper.ISO_NAMESPACE;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
index 8afb63f796..7dc5fbf160 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/NilReasonMarshallingTest.java
@@ -24,7 +24,7 @@ import org.opengis.metadata.citation.Citation;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverMock.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverMock.java
index cb53d4e5a8..bbd0598ce4 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverMock.java
@@ -50,7 +50,7 @@ public final class ReferenceResolverMock extends ReferenceResolver {
* }
*
* Alternatively, the {@code finally} block can be replaced by a call to {@code context.finish()} in a method
- * annotated by {@link org.junit.After}. This is done automatically by {@link org.apache.sis.test.xml.TestCase}.
+ * annotated by {@link org.junit.After}. This is done automatically by {@link org.apache.sis.xml.test.TestCase}.
*
* @param marshalling {@code true} for marshalling, or {@code false} for unmarshalling.
* @return the (un)marshalling context.
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
index 16d3ec0b3f..3da37465c5 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -25,7 +25,7 @@ import org.opengis.metadata.citation.Citation;
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/XLinkMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/XLinkMarshallingTest.java
index bb27be136c..ddce552a42 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/XLinkMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/XLinkMarshallingTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.util.ComparisonMode;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
index 04dfcfdcbe..3d8ae3cfc6 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/CodeListMarshallingTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/EnumMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/EnumMarshallingTest.java
index bcce11f035..8e3a006c30 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/EnumMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/cat/EnumMarshallingTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertSetEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java
index 869122f8b6..b49cf6c84c 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.xml.ReferenceResolverMock;
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
index a4b48bd901..823f134be9 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.pending.temporal.DefaultTemporalFactory;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
index 11ba00297b..0f7fe0ba74 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/FreeTextMarshallingTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.xml.util.LegacyNamespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
index 8e3bac8a6d..2bafa17b38 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
@@ -35,7 +35,7 @@ import org.junit.AfterClass;
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.mock.MetadataMock;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.util.internal.StandardDateFormat.UTC;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
index ed4f944491..8ded71b093 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/QualityParameterTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
index 470790e757..26639897ae 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/metadata/replace/ServiceParameterTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.iso.Names;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 063ce7f606..b64e0226ae 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/AnnotationConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
import java.util.Set;
import java.util.HashSet;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
index b3431ac3d0..a0925fa0cf 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/DocumentComparator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
import java.util.Map;
import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/InfiniteSet.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/InfiniteSet.java
similarity index 98%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/InfiniteSet.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/InfiniteSet.java
index 0cfbdff912..3cfbbb8d18 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/InfiniteSet.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/InfiniteSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
import java.util.Set;
import java.util.AbstractSet;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
index 62a862afde..17dab4ef74 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/PackageVerifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Map;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/SchemaCompliance.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/SchemaCompliance.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
index e59a511c3b..1e93183757 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/SchemaCompliance.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/SchemaCompliance.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.io.File;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/TestCase.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
similarity index 99%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/TestCase.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
index 2765b851bb..2b25e0cb07 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/TestCase.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
import java.util.Map;
import java.util.HashMap;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/package-info.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/package-info.java
similarity index 83%
rename from endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/package-info.java
rename to endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/package-info.java
index 2f930676fe..93de16db6d 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/package-info.java
@@ -17,9 +17,9 @@
/**
* Utility methods for testing XML files or JAXB annotations.
- * {@link org.apache.sis.test.xml.AnnotationConsistencyCheck} and
- * {@link org.apache.sis.test.xml.SchemaCompliance} verifies JAXB annotations.
- * {@link org.apache.sis.test.xml.DocumentComparator} compares an actual XML document with the expected one.
+ * {@link org.apache.sis.xml.test.AnnotationConsistencyCheck} and
+ * {@link org.apache.sis.xml.test.SchemaCompliance} verifies JAXB annotations.
+ * {@link org.apache.sis.xml.test.DocumentComparator} compares an actual XML document with the expected one.
*
* <p>Objects defined in this package are only for SIS testing purpose any many change
* in any future version without notice.</p>
@@ -28,4 +28,4 @@
* @version 1.4
* @since 1.0
*/
-package org.apache.sis.test.xml;
+package org.apache.sis.xml.test;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/DocumentComparatorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/DocumentComparatorTest.java
index e5058ede89..3bb0a35819 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/DocumentComparatorTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/DocumentComparatorTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml.util;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.xml.DocumentComparator;
+import org.apache.sis.xml.test.DocumentComparator;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/XmlUtilitiesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/XmlUtilitiesTest.java
index e59f5798d5..7456c91c5f 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/XmlUtilitiesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/util/XmlUtilitiesTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.bind.Context;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static javax.xml.datatype.DatatypeConstants.FIELD_UNDEFINED;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
index e5f0429761..d35d8dc40b 100644
--- a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
+++ b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DataIdentificationTest.java
@@ -20,7 +20,7 @@ import jakarta.xml.bind.JAXBException;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
index 66af686eda..dcbe6cc9c2 100644
--- a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
+++ b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.util.ComparisonMode;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterMarshallingTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterMarshallingTest.java
index c9752306e5..76db21f487 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParameterMarshallingTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
index 4ae569c257..a9dec9f672 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.io.wkt.Convention;
import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
index 27b78082d2..82418ee15f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index bccf11d31a..765949a64f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
index b112ca02b1..eafdcf9cde 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
index b3b8cf728d..e6f5618316 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.GeodeticObjectVerifier;
import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 376c0be73e..969b541a3d 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index a14d1eac6c..f2f57b9a3c 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -44,7 +44,7 @@ import org.opengis.test.Validators;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
index 915344b002..613b4a8c66 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
index 031ca54b51..4b2dc26e6e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertAxisEquals;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
index e16c9f0aee..45bce3cdd7 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
index d1d85c7347..eaa094c6b1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
@@ -39,7 +39,7 @@ import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestStep;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
index 2c7a91f188..30d405a511 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
@@ -34,7 +34,7 @@ import org.apache.sis.io.wkt.Convention;
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index f7e1d0167c..dbfd2a46f6 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
index 34cdb6ff28..2b087e53cc 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Version;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
index 24a9ad2cd1..5c5416a965 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -63,10 +63,10 @@ public final class TestFactorySource {
* Whether to use PostgreSQL instead of Derby for the tests. This field should be {@code false};
* the {@code true} value is used only for temporarily debugging of PostgreSQL-specific features.
* It is developer responsibility to setup a {@code "SpatialMetadata"} database on the local host.
- * This method differs from {@link org.apache.sis.test.sql.TestDatabase} by querying a permanent
+ * This method differs from {@link org.apache.sis.metadata.sql.TestDatabase} by querying a permanent
* database instead of a temporary database to be deleted after the tests.
*
- * @see org.apache.sis.test.sql.TestDatabase#createOnPostgreSQL(String, boolean)
+ * @see org.apache.sis.metadata.sql.TestDatabase#createOnPostgreSQL(String, boolean)
*/
private static final boolean TEST_ON_POSTGRESQL = false;
static {
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
index 1223103487..4fdb784876 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
index aeaa16ff43..328fd96c39 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.internal.URLs;
import org.apache.sis.metadata.sql.util.ScriptRunner;
// Test dependencies
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
/**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
index 47ba072460..5bc7a4e622 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.io.wkt.Convention;
import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index 0073140c85..06817f496f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.operation.Transformation;
import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
index 7248960024..4b3a49d772 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
@@ -46,7 +46,7 @@ import org.opengis.test.Validators;
import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroupTest;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
index ece1b8ac6e..4422060ce9 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
@@ -71,8 +71,8 @@ import org.junit.Test;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.DocumentComparator;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.DocumentComparator;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
index 80ae8b2dc8..2c3c33abf1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -46,7 +46,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
index 6a640fb91b..ea5a980d7c 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.LoggingWatcher;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
index fe83be315d..f2fa52c5e4 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
@@ -36,7 +36,7 @@ import org.apache.sis.xml.Namespaces;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
import static org.apache.sis.xml.bind.referencing.CC_GeneralOperationParameter.DEFAULT_OCCURRENCE;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java
index e7988a23cb..585ca3defb 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/SecondDefiningParameterTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.datum.DefaultEllipsoid;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.xml.TestCase;
+import org.apache.sis.xml.test.TestCase;
import static org.junit.Assert.*;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
index 4ca3349518..ba59e9c3e2 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/SelfConsistencyTest.java
@@ -30,7 +30,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.sis.test.OptionalTestData;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeNotNull;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/SelfConsistencyTest.java b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
index 19eac1235b..43f2aa0207 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/SelfConsistencyTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.storage.StorageConnector;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.apache.sis.test.OptionalTestData;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assume.assumeNotNull;
diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
index 1adca590d4..825a5ae782 100644
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.storage.sql.feature.TableReference;
// Test dependencies
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/TestOnAllDatabases.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/TestOnAllDatabases.java
index 3706ece049..da9b49c6a2 100644
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/TestOnAllDatabases.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/TestOnAllDatabases.java
@@ -19,7 +19,7 @@ package org.apache.sis.storage.sql;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
/**
diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
index 97c9ccc43f..37272ae220 100644
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
index 29ad2af938..f61369523c 100644
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.metadata.sql.util.Dialect;
import org.apache.sis.storage.sql.TestOnAllDatabases;
// Test dependencies
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
index 7194c22524..2c189e2d8b 100644
--- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
+++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
@@ -54,7 +54,7 @@ import org.apache.sis.util.Version;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.sql.TestDatabase;
+import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
index 737c7811c3..da0b9beb19 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.storage.StorageConnector;
// Test dependencies
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.assertNotNull;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
index 83277662ef..56a47fc894 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.storage.StorageConnector;
// Test dependencies
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.assertNotNull;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
index 2ce0abb515..9330754960 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.storage.StorageConnector;
// Test dependencies
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.assertNotNull;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
index 734f431a8d..5451b67c04 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.storage.StorageConnector;
// Test dependencies
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.sis.test.storage.CoverageReadConsistency;
+import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.assertNotNull;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java
similarity index 99%
rename from endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java
rename to endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java
index 1e97216367..9400b4ceff 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/CoverageReadConsistency.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.storage;
+package org.apache.sis.storage.test;
import java.util.List;
import java.util.ArrayList;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/SubsampledImage.java
similarity index 99%
rename from endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java
rename to endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/SubsampledImage.java
index 6ed8e2f4d5..9fb68c7aed 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/SubsampledImage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.storage;
+package org.apache.sis.storage.test;
import java.awt.Point;
import java.util.Arrays;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/package-info.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/package-info.java
similarity index 93%
rename from endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/package-info.java
rename to endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/package-info.java
index c28a2197d2..1ee857bad8 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/package-info.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/test/package-info.java
@@ -17,7 +17,7 @@
/**
* Helper classes for testing {@link org.apache.sis.storage.DataStore} implementations.
- * The {@link org.apache.sis.test.storage.CoverageReadConsistency} class reads a coverage fully,
+ * The {@link org.apache.sis.storage.test.CoverageReadConsistency} class reads a coverage fully,
* then requests various sub-regions. Sub-regions are than compared to the corresponding regions
* in the full image. It is not a proof that data values are correct, but it shows at least that
* read operations are consistent for the test data set.
@@ -30,4 +30,4 @@
* @version 1.1
* @since 1.1
*/
-package org.apache.sis.test.storage;
+package org.apache.sis.storage.test;
diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/TableColumnTest.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/TableColumnTest.java
index cae54b50a2..4a3c384581 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/TableColumnTest.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/TableColumnTest.java
@@ -22,10 +22,10 @@ import org.opengis.util.InternationalString;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.test.foreigner.SerializableTableColumn;
+import org.apache.sis.util.test.SerializableTableColumn;
-import static org.apache.sis.util.collection.TableColumn.*;
import static org.junit.Assert.*;
+import static org.apache.sis.util.collection.TableColumn.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/SerializableTableColumn.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/SerializableTableColumn.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/SerializableTableColumn.java
rename to endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/SerializableTableColumn.java
index 099fa5466d..0dcde621c7 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/SerializableTableColumn.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/SerializableTableColumn.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test.foreigner;
+package org.apache.sis.util.test;
import java.io.Serializable;
import java.io.ObjectStreamException;
diff --git a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/package-info.java b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/package-info.java
rename to endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/package-info.java
index 1a648adb03..201cea8e41 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/foreigner/package-info.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/test/package-info.java
@@ -25,4 +25,4 @@
* @version 0.3
* @since 0.3
*/
-package org.apache.sis.test.foreigner;
+package org.apache.sis.util.test;
diff --git a/netbeans-project/nbproject/project.properties b/netbeans-project/nbproject/project.properties
index bf7bf3c472..e95d4888b2 100644
--- a/netbeans-project/nbproject/project.properties
+++ b/netbeans-project/nbproject/project.properties
@@ -103,17 +103,16 @@ test.options = --add-modules jama,GeographicLib.Java,\
org.junit.jupiter.api,\
${modules.list} \
--add-exports org.apache.sis.util/org.apache.sis.test=${modules.list} \
- --add-exports org.apache.sis.metadata/org.apache.sis.test.xml=${modules.list} \
- --add-exports org.apache.sis.metadata/org.apache.sis.test.sql=${modules.list} \
--add-exports org.apache.sis.metadata/org.apache.sis.test.mock=${modules.list} \
--add-exports org.apache.sis.metadata/org.apache.sis.metadata.xml=org.apache.sis.storage \
+ --add-exports org.apache.sis.metadata/org.apache.sis.xml.test=${modules.list} \
--add-exports org.apache.sis.metadata/org.apache.sis.xml.util=org.apache.sis.storage.geotiff \
- --add-exports org.apache.sis.metadata/org.apache.sis.metadata.internal=org.apache.sis.referencing.gazetteer \
--add-exports org.apache.sis.metadata/org.apache.sis.xml.bind.gcx=org.apache.sis.referencing \
+ --add-exports org.apache.sis.metadata/org.apache.sis.metadata.internal=org.apache.sis.referencing.gazetteer \
--add-exports org.apache.sis.feature/org.apache.sis.feature.internal=org.apache.sis.storage.sql \
--add-exports org.apache.sis.feature/org.apache.sis.geometry.wrapper.jts=org.apache.sis.storage.sql,org.apache.sis.portrayal \
--add-exports org.apache.sis.storage/org.apache.sis.storage.base=org.apache.sis.portrayal \
- --add-exports org.apache.sis.storage/org.apache.sis.test.storage=${modules.list}
+ --add-exports org.apache.sis.storage/org.apache.sis.storage.test=${modules.list}
#
# Modulepaths for compilation, execution and tests.