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/05/08 11:39:43 UTC
[sis] 02/02: Do not extend `org.junit.Assert` anymore, make the `Assertions` class independent instead. This change makes easier to see which assertions are used and on which module they depend. https://issues.apache.org/jira/browse/SIS-579
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 0277839ccb7f2960a2853cca8ace86dd178b5225
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon May 8 12:49:03 2023 +0200
Do not extend `org.junit.Assert` anymore, make the `Assertions` class independent instead.
This change makes easier to see which assertions are used and on which module they depend.
https://issues.apache.org/jira/browse/SIS-579
---
.../org/apache/sis/coverage/SampleRangeFormatTest.java | 2 +-
.../sis/coverage/grid/BufferedGridCoverageTest.java | 2 +-
.../sis/coverage/grid/ConvertedGridCoverageTest.java | 4 +++-
.../apache/sis/coverage/grid/GridCoverage2DTest.java | 4 +++-
.../apache/sis/coverage/grid/GridDerivationTest.java | 5 ++++-
.../org/apache/sis/coverage/grid/GridExtentTest.java | 7 ++++++-
.../org/apache/sis/coverage/grid/GridGeometryTest.java | 4 +++-
.../sis/coverage/grid/ResampledGridCoverageTest.java | 7 ++++++-
.../org/apache/sis/coverage/grid/ReshapedImageTest.java | 2 +-
.../org/apache/sis/feature/AbstractFeatureTest.java | 2 +-
.../org/apache/sis/feature/AbstractOperationTest.java | 3 ++-
.../FeatureAssert.java => feature/Assertions.java} | 9 +++++----
.../org/apache/sis/feature/CharacteristicMapTest.java | 3 ++-
.../apache/sis/feature/CharacteristicTypeMapTest.java | 3 ++-
.../apache/sis/feature/DefaultAssociationRoleTest.java | 3 ++-
.../apache/sis/feature/DefaultAttributeTypeTest.java | 4 +++-
.../org/apache/sis/feature/DefaultFeatureTypeTest.java | 3 ++-
.../org/apache/sis/feature/EnvelopeOperationTest.java | 4 +++-
.../java/org/apache/sis/feature/FeatureFormatTest.java | 2 +-
.../org/apache/sis/feature/FeatureOperationsTest.java | 5 ++++-
.../java/org/apache/sis/feature/FeatureTestCase.java | 4 +++-
.../apache/sis/feature/MultiValuedAttributeTest.java | 3 ++-
.../apache/sis/feature/SingletonAssociationTest.java | 3 ++-
.../org/apache/sis/feature/SingletonAttributeTest.java | 3 ++-
.../sis/feature/builder/AttributeTypeBuilderTest.java | 4 +++-
.../feature/builder/CharacteristicTypeBuilderTest.java | 3 ++-
.../org/apache/sis/filter/ArithmeticFunctionTest.java | 3 ++-
.../apache/sis/filter/BinarySpatialFilterTestCase.java | 2 +-
.../org/apache/sis/filter/ComparisonFilterTest.java | 4 +++-
.../org/apache/sis/filter/IdentifierFilterTest.java | 3 ++-
.../java/org/apache/sis/filter/LeafExpressionTest.java | 3 ++-
.../java/org/apache/sis/filter/LogicalFilterTest.java | 4 +++-
.../java/org/apache/sis/filter/TemporalFilterTest.java | 4 +++-
.../java/org/apache/sis/image/BandSelectImageTest.java | 4 +++-
.../org/apache/sis/image/BandedSampleConverterTest.java | 2 +-
.../java/org/apache/sis/image/ComputedImageTest.java | 2 +-
.../java/org/apache/sis/image/ImageCombinerTest.java | 3 ++-
.../test/java/org/apache/sis/image/MaskedImageTest.java | 3 ++-
.../test/java/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../java/org/apache/sis/index/tree/PointTreeTest.java | 2 +-
.../apache/sis/internal/feature/j2d/FlatShapeTest.java | 2 +-
.../sis/internal/filter/sqlmm/RegistryTestCase.java | 3 ++-
.../src/test/java/org/apache/sis/test/package-info.txt | 3 ---
.../sis/internal/jaxb/IdentifierMapAdapterTest.java | 3 ++-
.../sis/internal/jaxb/ModifiableIdentifierMapTest.java | 2 +-
.../sis/internal/jaxb/cat/CodeListMarshallingTest.java | 3 ++-
.../apache/sis/internal/jaxb/cat/EnumAdapterTest.java | 2 +-
.../sis/internal/jaxb/cat/EnumMarshallingTest.java | 4 +++-
.../apache/sis/internal/jaxb/gml/TimePeriodTest.java | 3 ++-
.../sis/internal/jaxb/lan/FreeTextMarshallingTest.java | 3 ++-
.../apache/sis/internal/jaxb/lan/LanguageCodeTest.java | 3 ++-
.../org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java | 2 +-
.../jaxb/metadata/replace/QualityParameterTest.java | 3 ++-
.../jaxb/metadata/replace/ServiceParameterTest.java | 3 ++-
.../org/apache/sis/internal/metadata/MergerTest.java | 3 ++-
.../MetadataAssert.java => metadata/Assertions.java} | 17 +++++++++--------
.../org/apache/sis/metadata/MetadataStandardTest.java | 3 ++-
.../org/apache/sis/metadata/ModifiableMetadataTest.java | 4 +++-
.../org/apache/sis/metadata/PropertyAccessorTest.java | 4 +++-
.../apache/sis/metadata/PropertyInformationTest.java | 5 ++++-
.../java/org/apache/sis/metadata/SpecialCasesTest.java | 3 ++-
.../test/java/org/apache/sis/metadata/TreeNodeTest.java | 3 ++-
.../org/apache/sis/metadata/TreeTableFormatTest.java | 2 +-
.../java/org/apache/sis/metadata/TreeTableViewTest.java | 3 ++-
.../apache/sis/metadata/iso/DefaultIdentifierTest.java | 4 +++-
.../apache/sis/metadata/iso/DefaultMetadataTest.java | 3 ++-
.../apache/sis/metadata/iso/citation/CitationsTest.java | 4 +++-
.../sis/metadata/iso/citation/DefaultCitationTest.java | 3 ++-
.../iso/citation/DefaultResponsibilityTest.java | 2 +-
.../iso/constraint/DefaultLegalConstraintsTest.java | 3 ++-
.../sis/metadata/iso/content/DefaultBandTest.java | 3 ++-
.../sis/metadata/iso/extent/DefaultExtentTest.java | 3 ++-
.../iso/extent/DefaultGeographicBoundingBoxTest.java | 3 ++-
.../iso/identification/DefaultBrowseGraphicTest.java | 3 ++-
.../identification/DefaultDataIdentificationTest.java | 4 +++-
.../DefaultRepresentativeFractionTest.java | 3 ++-
.../iso/identification/DefaultResolutionTest.java | 3 ++-
.../DefaultServiceIdentificationTest.java | 3 ++-
.../sis/metadata/iso/lineage/DefaultLineageTest.java | 3 ++-
.../iso/maintenance/DefaultScopeDescriptionTest.java | 2 +-
.../iso/quality/DefaultEvaluationMethodTest.java | 3 ++-
.../apache/sis/metadata/iso/quality/ScopeCodeTest.java | 3 ++-
.../metadata/iso/spatial/DefaultGeorectifiedTest.java | 2 +-
.../src/test/java/org/apache/sis/test/package-info.txt | 3 ---
.../src/test/java/org/apache/sis/test/xml/TestCase.java | 4 +++-
.../org/apache/sis/util/iso/DefaultLocalNameTest.java | 5 +++--
.../java/org/apache/sis/util/iso/DefaultRecordTest.java | 4 +++-
.../org/apache/sis/util/iso/DefaultRecordTypeTest.java | 3 ++-
.../org/apache/sis/util/iso/DefaultScopedNameTest.java | 5 +++--
.../org/apache/sis/util/iso/NameMarshallingTest.java | 3 ++-
.../apache/sis/xml/CharSequenceSubstitutionTest.java | 4 +++-
.../org/apache/sis/xml/NilReasonMarshallingTest.java | 5 ++++-
.../src/test/java/org/apache/sis/xml/NilReasonTest.java | 3 ++-
.../org/apache/sis/xml/TransformingNamespacesTest.java | 3 ++-
.../java/org/apache/sis/xml/UUIDMarshallingTest.java | 5 ++++-
.../java/org/apache/sis/xml/XLinkMarshallingTest.java | 4 +++-
.../sis/referencing/gazetteer/GazetteerFactoryTest.java | 3 ++-
.../sis/referencing/gazetteer/LocationFormatTest.java | 2 +-
.../sis/referencing/gazetteer/LocationTypeTest.java | 4 +++-
.../gazetteer/ReferencingByIdentifiersTest.java | 3 ++-
.../apache/sis/geometry/AbstractDirectPositionTest.java | 2 +-
.../org/apache/sis/geometry/AbstractEnvelopeTest.java | 6 ++++--
.../java/org/apache/sis/geometry/ArrayEnvelopeTest.java | 3 ++-
.../org/apache/sis/geometry/DirectPosition1DTest.java | 5 +++--
.../org/apache/sis/geometry/DirectPosition2DTest.java | 5 +++--
.../java/org/apache/sis/geometry/Envelope2DTest.java | 5 +++--
.../org/apache/sis/geometry/EnvelopeReducerTest.java | 2 +-
.../java/org/apache/sis/geometry/EnvelopesTest.java | 4 +++-
.../apache/sis/geometry/GeneralDirectPositionTest.java | 5 +++--
.../org/apache/sis/geometry/GeneralEnvelopeTest.java | 6 ++++--
.../org/apache/sis/geometry/ImmutableEnvelopeTest.java | 5 +++--
.../test/java/org/apache/sis/geometry/Shapes2DTest.java | 2 +-
.../java/org/apache/sis/geometry/TransformTestCase.java | 2 +-
.../apache/sis/geometry/WraparoundAdjustmentTest.java | 3 ++-
.../jaxb/referencing/SecondDefiningParameterTest.java | 3 ++-
.../referencing/EllipsoidalHeightCombinerTest.java | 6 +++++-
.../internal/referencing/ServicesForMetadataTest.java | 3 ++-
.../internal/referencing/WraparoundApplicatorTest.java | 2 +-
.../sis/internal/referencing/provider/AffineTest.java | 3 ++-
.../referencing/provider/LongitudeRotationTest.java | 4 +++-
.../referencing/provider/MapProjectionTest.java | 4 +++-
.../src/test/java/org/apache/sis/io/wkt/ColorsTest.java | 3 ++-
.../java/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../test/java/org/apache/sis/io/wkt/FormatterTest.java | 3 ++-
.../org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 6 +++++-
.../test/java/org/apache/sis/io/wkt/SymbolsTest.java | 3 ++-
.../java/org/apache/sis/io/wkt/WKTDictionaryTest.java | 4 +++-
.../test/java/org/apache/sis/io/wkt/WKTFormatTest.java | 4 +++-
.../test/java/org/apache/sis/io/wkt/package-info.txt | 7 -------
.../parameter/DefaultParameterDescriptorGroupTest.java | 6 ++++--
.../sis/parameter/DefaultParameterDescriptorTest.java | 5 +++--
.../sis/parameter/DefaultParameterValueGroupTest.java | 6 ++++--
.../apache/sis/parameter/DefaultParameterValueTest.java | 6 ++++--
.../sis/parameter/MatrixParametersAlphaNumTest.java | 2 +-
.../org/apache/sis/parameter/MatrixParametersTest.java | 3 ++-
.../org/apache/sis/parameter/ParameterFormatTest.java | 3 ++-
.../apache/sis/parameter/ParameterMarshallingTest.java | 6 +++++-
.../org/apache/sis/parameter/TensorParametersTest.java | 5 ++++-
.../java/org/apache/sis/parameter/TensorValuesTest.java | 4 +++-
.../sis/referencing/AbstractIdentifiedObjectTest.java | 3 ++-
.../sis/referencing/AbstractReferenceSystemTest.java | 5 +++--
.../Assertions.java} | 17 ++++++++++-------
.../apache/sis/referencing/AuthorityFactoriesTest.java | 3 ++-
.../test/java/org/apache/sis/referencing/CRSTest.java | 4 +++-
.../java/org/apache/sis/referencing/CommonCRSTest.java | 4 +++-
.../apache/sis/referencing/EPSGFactoryFallbackTest.java | 4 +++-
.../apache/sis/referencing/GeodeticObjectVerifier.java | 3 ++-
.../apache/sis/referencing/ImmutableIdentifierTest.java | 5 ++++-
.../org/apache/sis/referencing/NamedIdentifierTest.java | 3 ++-
.../org/apache/sis/referencing/crs/AbstractCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultCompoundCRSTest.java | 7 ++++++-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 6 +++++-
.../sis/referencing/crs/DefaultEngineeringCRSTest.java | 6 +++++-
.../sis/referencing/crs/DefaultGeocentricCRSTest.java | 3 ++-
.../sis/referencing/crs/DefaultGeodeticCRSTest.java | 2 +-
.../sis/referencing/crs/DefaultGeographicCRSTest.java | 4 +++-
.../apache/sis/referencing/crs/DefaultImageCRSTest.java | 6 +++++-
.../sis/referencing/crs/DefaultProjectedCRSTest.java | 5 ++++-
.../sis/referencing/crs/DefaultTemporalCRSTest.java | 3 ++-
.../sis/referencing/crs/DefaultVerticalCRSTest.java | 2 +-
.../apache/sis/referencing/crs/HardCodedCRSTest.java | 3 ++-
.../org/apache/sis/referencing/cs/AbstractCSTest.java | 3 ++-
.../sis/referencing/cs/CoordinateSystemsTest.java | 4 +++-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 5 ++++-
.../referencing/cs/DefaultCoordinateSystemAxisTest.java | 4 +++-
.../sis/referencing/cs/DefaultEllipsoidalCSTest.java | 4 +++-
.../sis/referencing/cs/DirectionAlongMeridianTest.java | 3 ++-
.../org/apache/sis/referencing/cs/HardCodedCSTest.java | 3 ++-
.../org/apache/sis/referencing/cs/NormalizerTest.java | 4 +++-
.../sis/referencing/datum/BursaWolfParametersTest.java | 4 +++-
.../sis/referencing/datum/DefaultEllipsoidTest.java | 4 +++-
.../sis/referencing/datum/DefaultGeodeticDatumTest.java | 7 ++++++-
.../sis/referencing/datum/DefaultPrimeMeridianTest.java | 4 +++-
.../sis/referencing/datum/DefaultTemporalDatumTest.java | 4 +++-
.../sis/referencing/datum/DefaultVerticalDatumTest.java | 4 +++-
.../sis/referencing/datum/TimeDependentBWPTest.java | 3 ++-
.../referencing/factory/CommonAuthorityFactoryTest.java | 7 ++++++-
.../referencing/factory/GeodeticObjectFactoryTest.java | 3 ++-
.../referencing/factory/IdentifiedObjectFinderTest.java | 3 ++-
.../factory/MultiAuthoritiesFactoryTest.java | 4 +++-
.../sis/referencing/factory/sql/EPSGFactoryTest.java | 7 ++++++-
.../operation/CoordinateOperationFinderTest.java | 4 +++-
.../operation/CoordinateOperationRegistryTest.java | 4 +++-
.../operation/DefaultConcatenatedOperationTest.java | 5 ++++-
.../referencing/operation/DefaultConversionTest.java | 4 +++-
.../DefaultCoordinateOperationFactoryTest.java | 4 +++-
.../sis/referencing/operation/DefaultFormulaTest.java | 2 +-
.../operation/DefaultOperationMethodTest.java | 5 ++++-
.../operation/DefaultTransformationTest.java | 4 +++-
.../operation/SingleOperationMarshallingTest.java | 6 +++++-
.../operation/builder/LinearTransformBuilderTest.java | 4 +++-
.../operation/builder/LocalizationGridBuilderTest.java | 3 ++-
.../sis/referencing/operation/matrix/MatricesTest.java | 4 +++-
.../referencing/operation/matrix/MatrixTestCase.java | 4 +++-
.../operation/projection/EquirectangularTest.java | 8 ++++----
.../operation/projection/LambertConicConformalTest.java | 3 ++-
.../operation/projection/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 4 +++-
.../operation/transform/CopyTransformTest.java | 5 ++++-
.../operation/transform/DomainDefinitionTest.java | 2 +-
.../transform/EllipsoidToCentricTransformTest.java | 4 +++-
.../operation/transform/ExponentialTransform1DTest.java | 4 +++-
.../operation/transform/LogarithmicTransform1DTest.java | 3 ++-
.../operation/transform/MathTransformTestCase.java | 12 ++++++------
.../operation/transform/MolodenskyTransformTest.java | 3 ++-
.../sis/test/integration/CoordinateOperationTest.java | 3 ++-
.../org/apache/sis/test/integration/MetadataTest.java | 2 +-
.../sis/test/integration/MetadataVerticalTest.java | 4 +++-
.../src/test/java/org/apache/sis/test/package-info.txt | 3 ---
.../sis/internal/converter/AngleConverterTest.java | 3 ++-
.../sis/internal/converter/ArrayConverterTest.java | 4 ++--
.../sis/internal/converter/ConverterRegistryTest.java | 4 +++-
.../sis/internal/converter/FallbackConverterTest.java | 3 ++-
.../sis/internal/converter/NumberConverterTest.java | 4 +++-
.../sis/internal/converter/PathConverterTest.java | 3 ++-
.../sis/internal/converter/StringConverterTest.java | 3 ++-
.../sis/internal/converter/SystemRegistryTest.java | 4 +++-
.../java/org/apache/sis/internal/test/AssertTest.java | 10 ++++++----
.../apache/sis/internal/util/CheckedArrayListTest.java | 2 +-
.../apache/sis/internal/util/CollectionsExtTest.java | 4 +++-
.../test/java/org/apache/sis/io/AppenderTestCase.java | 3 ++-
.../src/test/java/org/apache/sis/math/FractionTest.java | 3 ++-
.../src/test/java/org/apache/sis/math/LineTest.java | 3 ++-
.../src/test/java/org/apache/sis/math/PlaneTest.java | 3 ++-
.../java/org/apache/sis/math/StatisticsFormatTest.java | 2 +-
.../test/java/org/apache/sis/math/StatisticsTest.java | 3 ++-
.../org/apache/sis/measure/ConventionalUnitTest.java | 3 ++-
.../org/apache/sis/measure/LinearConverterTest.java | 4 +++-
.../org/apache/sis/measure/MeasurementRangeTest.java | 3 ++-
.../src/test/java/org/apache/sis/measure/RangeTest.java | 3 ++-
.../test/java/org/apache/sis/measure/ScalarTest.java | 4 +++-
.../java/org/apache/sis/measure/SystemUnitTest.java | 5 ++++-
.../java/org/apache/sis/measure/UnitDimensionTest.java | 4 +++-
.../java/org/apache/sis/measure/UnitServicesTest.java | 3 ++-
.../src/test/java/org/apache/sis/measure/UnitsTest.java | 3 ++-
.../test/java/org/apache/sis/setup/OptionKeyTest.java | 3 ++-
.../apache/sis/test/{Assert.java => Assertions.java} | 11 +++++++----
.../apache/sis/util/DefaultInternationalStringTest.java | 3 ++-
.../apache/sis/util/SimpleInternationalStringTest.java | 3 ++-
.../src/test/java/org/apache/sis/util/VersionTest.java | 3 ++-
.../java/org/apache/sis/util/collection/CacheTest.java | 3 ++-
.../sis/util/collection/DefaultTreeTableTest.java | 4 +++-
.../org/apache/sis/util/collection/IntegerListTest.java | 5 ++++-
.../org/apache/sis/util/collection/RangeSetTest.java | 3 ++-
.../org/apache/sis/util/collection/TableColumnTest.java | 5 +++--
.../apache/sis/util/collection/TreeTableFormatTest.java | 3 ++-
.../org/apache/sis/util/collection/TreeTablesTest.java | 4 +++-
.../org/apache/sis/util/collection/WeakHashSetTest.java | 3 ++-
.../sis/util/collection/WeakValueHashMapTest.java | 3 ++-
.../apache/sis/util/logging/MonolineFormatterTest.java | 3 ++-
.../sis/util/resources/IndexedResourceBundleTest.java | 3 ++-
.../java/org/apache/sis/util/resources/LoaderTest.java | 2 +-
.../internal/profile/fra/DataIdentificationTest.java | 3 ++-
.../internal/profile/fra/DirectReferenceSystemTest.java | 2 +-
.../org/apache/sis/storage/geotiff/XMLMetadataTest.java | 3 ++-
.../org/apache/sis/internal/netcdf/FeatureSetTest.java | 3 ++-
.../apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +-
.../java/org/apache/sis/storage/sql/SQLStoreTest.java | 4 +++-
.../sis/internal/storage/MemoryGridResourceTest.java | 3 ++-
.../sis/internal/storage/MetadataBuilderTest.java | 5 ++++-
.../java/org/apache/sis/storage/CoverageSubsetTest.java | 3 ++-
.../java/org/apache/sis/storage/DataStoresTest.java | 3 ++-
.../java/org/apache/sis/storage/ProbeResultTest.java | 4 +++-
.../storage/aggregate/ConcatenatedFeatureSetTest.java | 4 +++-
.../apache/sis/internal/storage/gpx/UpdaterTest.java | 3 ++-
.../org/apache/sis/internal/storage/gpx/WriterTest.java | 3 ++-
266 files changed, 680 insertions(+), 324 deletions(-)
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
index 5e4e879450..34c2315ca0 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleRangeFormatTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
index ac252f2af5..99b726032a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/BufferedGridCoverageTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.util.iso.Names;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
index 962168a6c1..18f6759bbe 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
@@ -31,7 +31,9 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.image.PlanarImage.SAMPLE_DIMENSIONS_KEY;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index 552598e8c7..93ef4256a1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -42,7 +42,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.feature.Assertions.assertPixelsEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
index 407836eca7..ea96a6f231 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -46,7 +46,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertBetween;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
index e0ed90d131..075e5a3959 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -39,7 +39,12 @@ import org.apache.sis.internal.util.Numerics;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertMapEquals;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
index ea7759a1f0..dcfeb81409 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -38,7 +38,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index ab6cbf0cef..42bf113f47 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -54,8 +54,13 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
+import static org.apache.sis.feature.Assertions.assertPixelsEqual;
import static org.opengis.referencing.datum.PixelInCell.CELL_CENTER;
-import static org.apache.sis.test.FeatureAssert.*;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
index 584c000e4c..bdffb3eff9 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/ReshapedImageTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.junit.Assert.*;
-import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
index f9e33015d5..40f97ce4c4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractFeatureTest.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
// Branch-dependent imports
import org.opengis.feature.AttributeType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
index 694429808e..274227155b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/AbstractOperationTest.java
@@ -23,7 +23,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java b/core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java
similarity index 97%
rename from core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
rename to core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java
index fdbb19f102..302ce8fc53 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/FeatureAssert.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/Assertions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test;
+package org.apache.sis.feature;
import java.awt.Point;
import java.awt.Rectangle;
@@ -23,6 +23,7 @@ import java.awt.image.RenderedImage;
import java.awt.geom.PathIterator;
import org.opengis.coverage.grid.SequenceType;
import org.apache.sis.image.PixelIterator;
+import org.apache.sis.util.Static;
import static org.junit.Assert.*;
@@ -35,11 +36,11 @@ import static org.junit.Assert.*;
* @version 1.1
* @since 1.1
*/
-public class FeatureAssert extends ReferencingAssert {
+public final class Assertions extends Static {
/**
- * For subclass constructor only.
+ * Do not allow instantiation of this class.
*/
- protected FeatureAssert() {
+ private Assertions() {
}
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
index 65a10adb56..98ba0eeafc 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Attribute;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
index 7b8d399a45..95fef37914 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
@@ -22,8 +22,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
-import static org.apache.sis.test.Assert.*;
// Branch-dependent imports
import org.opengis.feature.AttributeType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
index f95b24c45b..605b884091 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
@@ -26,9 +26,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.feature.DefaultAssociationRole.NAME_KEY;
import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.test.Assert.*;
// Branch-dependent imports
import org.opengis.feature.FeatureType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
index 8a62a92c5c..e9582485c4 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
index 96d8da7900..11fa2d4b2c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
// Branch-dependent imports
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
index da3daae016..47a40c9172 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -34,7 +34,9 @@ import org.apache.sis.internal.feature.GeometryWrapper;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
// Branch-dependent imports
import org.opengis.feature.Attribute;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
index 3216f6b9a2..ba9aa52800 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureFormatTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
// Branch-dependent import
import org.opengis.feature.PropertyType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
index 876556afc9..f2273c086a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureOperationsTest.java
@@ -33,7 +33,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
// Branch-dependent imports
import org.opengis.feature.PropertyType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
index fba65a47c4..36d2ab7904 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
@@ -30,7 +30,9 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Attribute;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
index 61b21065e6..000a10dc8e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
@@ -23,7 +23,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
index c6c032ad37..db53f97ab3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAssociationTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
index 297a3a6543..b6ce21cb71 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
index 5a29b6ef7f..03477d38a2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/AttributeTypeBuilderTest.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
// Branch-dependent imports
import org.opengis.feature.Attribute;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index e319ab6fed..6327d7a107 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@ -20,7 +20,8 @@ import java.util.Set;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
// Branch-dependent imports
import org.opengis.feature.AttributeType;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
index 7d71a79681..4f5d9d0e24 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
@@ -19,7 +19,8 @@ package org.apache.sis.filter;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
index 9256708be1..457fd64ae7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/BinarySpatialFilterTestCase.java
@@ -38,7 +38,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
-import static org.apache.sis.test.Assert.assertSerializedEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
index 7621a4259f..13e19acc4c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
@@ -20,7 +20,9 @@ import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.internal.filter.FunctionNames;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
index d005888119..6dac5425f0 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/IdentifierFilterTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
index c1b80108a7..0235703bc7 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
@@ -20,7 +20,8 @@ import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
index 8555b04741..81639abf22 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFilterTest.java
@@ -27,7 +27,9 @@ import org.apache.sis.math.FunctionProperty;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
index ead5d8fd3e..931d01fbd2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/TemporalFilterTest.java
@@ -21,7 +21,9 @@ import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
// Branch-dependent imports
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
index 60db8f4b7d..dd91baad78 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandSelectImageTest.java
@@ -32,7 +32,9 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
index 7877fbedd8..f09e7ddc02 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/BandedSampleConverterTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.internal.coverage.j2d.ImageLayout;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
index a228ee2406..817673b44e 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ComputedImageTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
-import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
index bf4275d9d2..18873ac0e6 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ImageCombinerTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
index 005d4e5cb5..933d8732ce 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/MaskedImageTest.java
@@ -35,7 +35,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.util.Debug;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.feature.Assertions.assertPixelsEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
index 323fac7c4f..bc771f727b 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/PlanarImageTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.assertValuesEqual;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
index 27835bafda..e0296e2c02 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/index/tree/PointTreeTest.java
@@ -32,7 +32,7 @@ import org.apache.sis.test.TestUtilities;
import org.junit.Test;
import static org.junit.Assert.*;
-import static org.apache.sis.test.Assert.assertSetEquals;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
index 2df180d944..2f59b23054 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FlatShapeTest.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.FeatureAssert.*;
+import static org.apache.sis.feature.Assertions.assertPathEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
index 2d5e60e320..43b5570f2d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/RegistryTestCase.java
@@ -40,7 +40,8 @@ import org.junit.Test;
import org.junit.Rule;
import org.junit.After;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/package-info.txt b/core/sis-feature/src/test/java/org/apache/sis/test/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
--- a/core/sis-feature/src/test/java/org/apache/sis/test/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about collisions.
-This package is initially defined by the sis-utility module, which also provides
-the package-info.java file.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
index b8e9795402..c32e75eceb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/IdentifierMapAdapterTest.java
@@ -24,7 +24,8 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.xml.IdentifierSpace.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
index 04ddf39b62..d98de71f22 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.xml.XLink;
import org.junit.Test;
import static java.util.UUID.fromString;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.xml.IdentifierSpace.*;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
index a686a62d0e..1d039e5f23 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/CodeListMarshallingTest.java
@@ -35,7 +35,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
index b258564301..369fc39de4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumAdapterTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cat;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
index 29225057de..a680ae5acd 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/cat/EnumMarshallingTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
index 91bde13844..579b16a246 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
@@ -34,7 +34,8 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.test.TestUtilities.format;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
index 0483303fa1..5052bb7d88 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/FreeTextMarshallingTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
index c8d9edf960..efc1d4d33f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/LanguageCodeTest.java
@@ -35,7 +35,8 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.internal.util.StandardDateFormat.UTC;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
index 8cb3210927..ed796404af 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/PT_LocaleTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.xml.TestUsingFile;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
index 6f98c4074a..a63f84363f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/QualityParameterTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
index b059c6efb5..2418c6255a 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.util.iso.Names;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
index 508a3af152..3912efa8a5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MergerTest.java
@@ -37,7 +37,8 @@ import org.apache.sis.metadata.iso.content.DefaultImageDescription;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java
similarity index 96%
rename from core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
rename to core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java
index 399796cb07..ba020777f9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/MetadataAssert.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/Assertions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test;
+package org.apache.sis.metadata;
import java.util.Locale;
import java.io.IOException;
@@ -27,10 +27,12 @@ import org.opengis.metadata.maintenance.Scope;
import org.opengis.metadata.maintenance.ScopeCode;
import org.opengis.metadata.content.FeatureTypeInfo;
import org.opengis.metadata.content.FeatureCatalogueDescription;
+import org.apache.sis.util.Static;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.xml.DocumentComparator;
import org.apache.sis.internal.xml.LegacyNamespaces;
+import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
// Branch-specific imports
@@ -38,18 +40,17 @@ import org.opengis.metadata.citation.Responsibility;
/**
- * Assertion methods used by the {@code sis-metadata} module in addition of the ones inherited
- * from other modules and libraries.
+ * Assertion methods used by the {@code sis-metadata} module.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.4
* @since 0.4
*/
-public class MetadataAssert extends Assert {
+public final class Assertions extends Static {
/**
- * For subclass constructor only.
+ * Do not allow instantiation of this class.
*/
- protected MetadataAssert() {
+ private Assertions() {
}
/**
@@ -175,7 +176,7 @@ public class MetadataAssert extends Assert {
* @see DocumentComparator
*/
public static void assertXmlEquals(final Object expected, final Object actual, final String... ignoredAttributes) {
- assertXmlEquals(expected, actual, TestCase.STRICT, null, ignoredAttributes);
+ assertXmlEquals(expected, actual, 0, null, ignoredAttributes);
}
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
index 3b764d7eae..3df788621b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
@@ -40,7 +40,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
index 26381700c9..32a0520ec5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ModifiableMetadataTest.java
@@ -27,7 +27,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
index f4dc5fc9f5..c61e516c65 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -61,7 +61,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.PropertyAccessor.APPEND;
import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
index 88a6c5fce4..c2dd8bdbb1 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyInformationTest.java
@@ -34,7 +34,10 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
index 38e6384997..3af346770f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/SpecialCasesTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
index 81f5beecd9..80119f16cb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
@@ -41,7 +41,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
index ae045d94e8..c44c4e54d5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
@@ -36,7 +36,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
index cb2357741d..70c92a0edf 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.test.TestUtilities.toTreeStructure;
import static org.apache.sis.test.TestUtilities.formatMetadata;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
index be558e4f30..0a8f19de6c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
@@ -23,7 +23,9 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.*;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index a899c58116..a525253197 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -36,9 +36,10 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.test.TestUtilities.getSingleton;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
index ff10ed037c..374f196d7c 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -35,9 +35,11 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.metadata.iso.citation.Citations.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.test.MetadataAssert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index a62519dd7d..59024b89d5 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -50,7 +50,8 @@ import org.apache.sis.test.TestUtilities;
import org.junit.Test;
import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
index 97b8e27f8b..5efa61eca2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
index c551544209..129f03e02d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPACE;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index 303a2239c5..c35d899519 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@ -22,7 +22,8 @@ import org.apache.sis.util.Version;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPACE;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index 968cfd271b..b919141a4b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
index 9b4ad945ea..f23f8c0511 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBoxTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
index 18f5477d72..d6ff05db02 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
@@ -34,7 +34,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
import static java.util.logging.Logger.getLogger;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
index 7fc1a1b194..1c4b111a95 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
@@ -35,7 +35,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
index 58056b0ce8..0dd0b6948f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
index 6af779594f..4d719da323 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
@@ -28,7 +28,8 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.internal.jaxb.gml.MeasureTest.UOM_URL;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
index d09b0196c3..5fd5749f9b 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
@@ -34,7 +34,8 @@ import org.apache.sis.xml.NilReason;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
index 298dd684d2..44d6bcfb2f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
index a5bf671948..e4cac48fda 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescriptionTest.java
@@ -24,7 +24,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
index d320509c1c..95fcfaf5a4 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethodTest.java
@@ -22,7 +22,8 @@ import java.time.temporal.Temporal;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
index 60432b634a..41de6b7d93 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/ScopeCodeTest.java
@@ -22,7 +22,8 @@ import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
index 69d597b6f6..441478f5d9 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectifiedTest.java
@@ -25,7 +25,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/package-info.txt b/core/sis-metadata/src/test/java/org/apache/sis/test/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about collisions.
-This package is initially defined by the sis-utility module, which also provides
-the package-info.java file.
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
index d0d774a323..a07bb44cb7 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/TestCase.java
@@ -40,7 +40,9 @@ import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.XML;
import org.junit.After;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
index 32af7d4193..7100461b16 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultLocalNameTest.java
@@ -19,8 +19,9 @@ package org.apache.sis.util.iso;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.internal.util.Constants.EPSG;
import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR_STRING;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
index 27e5fc7d89..50cba65534 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
index fc5834206b..0ddfdd2fb2 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultRecordTypeTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
index 4d414387f9..3ca5cfd0a8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/DefaultScopedNameTest.java
@@ -24,8 +24,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
index ac16b9b502..20794d88e3 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
@@ -38,7 +38,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
index d5d7cdddef..3bf2c040a6 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
@@ -30,7 +30,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.internal.metadata.ImplementationHelper.ISO_NAMESPACE;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
index cf5977ba60..bd79d631e8 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
@@ -26,7 +26,10 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
index be542da2ea..9761bda728 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
index bc94d84956..51cc23c923 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
index a1818b7354..5586fdae7f 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
@@ -25,7 +25,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
index ab8257a8d1..d28da06dcf 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
index a9732ab9d5..836cfd9d64 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/GazetteerFactoryTest.java
@@ -19,7 +19,8 @@ package org.apache.sis.referencing.gazetteer;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
index 75d0ba7725..1205587c08 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationFormatTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
index 6af0a147c2..4d8244e5cf 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/LocationTypeTest.java
@@ -22,7 +22,9 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Branch-dependent imports
import org.opengis.referencing.gazetteer.LocationType;
diff --git a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 1b65e3cac0..d0a2371858 100644
--- a/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++ b/core/sis-referencing-by-identifiers/src/test/java/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
index 088ac3b31b..d6f3612cf7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractDirectPositionTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.geometry;
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
index a2a237d157..23486e0087 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@ -25,8 +25,10 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.referencing.Assertions.assertContains;
+import static org.apache.sis.referencing.Assertions.assertDisjoint;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
index 0218d0d703..f374565cc9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ArrayEnvelopeTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
index c1af39e47c..7d3cad46be 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition1DTest.java
@@ -21,8 +21,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
-import static org.opengis.test.Validators.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
index 38f604577b..7d2170b802 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/DirectPosition2DTest.java
@@ -21,8 +21,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
-import static org.opengis.test.Validators.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
index 2be8befe13..02786a0384 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Envelope2DTest.java
@@ -22,8 +22,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
index 556274fe7c..2a836e34be 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopeReducerTest.java
@@ -22,7 +22,7 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
index 757cef25a1..1dc7adadb7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java
@@ -44,7 +44,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.opengis.test.Validators.validate;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
index 4a1b9ba0f1..ab130194e1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java
@@ -22,8 +22,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
-import static org.opengis.test.Validators.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
index 282a0b589e..458f9574f6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@ -29,8 +29,10 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84_LATITUDE_FIRST;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
index 91fd5f1542..29026c3e2c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/ImmutableEnvelopeTest.java
@@ -20,8 +20,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
index 8b3f22179d..bf36594e4c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/Shapes2DTest.java
@@ -24,7 +24,7 @@ import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.referencing.Assertions.assertRectangleEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
index b8f1b898a5..9dd4d905b8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java
@@ -37,9 +37,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.apache.sis.internal.referencing.Formulas.ANGULAR_TOLERANCE;
import static org.apache.sis.internal.referencing.Formulas.LINEAR_TOLERANCE;
-import static org.apache.sis.test.ReferencingAssert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
index 169ab6a2dd..37e8296eca 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/geometry/WraparoundAdjustmentTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
index 9559a06bb9..dc626a5b55 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/SecondDefiningParameterTest.java
@@ -23,7 +23,8 @@ import org.apache.sis.referencing.datum.DefaultEllipsoid;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
index dbdaff85ad..d643d63596 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/EllipsoidalHeightCombinerTest.java
@@ -37,7 +37,11 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.test.Assertions.assertArrayEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
index 2cb1822d6e..d5c48d3cd3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
@@ -35,7 +35,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
index ecc6f80f4b..b0bf186b08 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/WraparoundApplicatorTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
index 07a1926bcf..6dc06d0dd6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/AffineTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
index 2d8baf887a..9ef0659215 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/LongitudeRotationTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
index 39b274dacf..7e36c298ef 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/MapProjectionTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertOgcIdentifierEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
import static org.apache.sis.internal.util.Constants.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
index a012ea27ca..a07803c04a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ColorsTest.java
@@ -20,7 +20,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
index 1b8bd84bae..569bc6b3de 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/ComparisonWithEPSG.java
@@ -29,8 +29,8 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
import static org.junit.Assume.assumeNotNull;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
index 12bec31ee4..eb61ad5836 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index c2d49a8522..eeae972a2a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -48,7 +48,11 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.referencing.Assertions.assertAxisEquals;
+import static org.apache.sis.referencing.Assertions.assertDiagonalEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
index 7e96dc0559..ffa28b1453 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/SymbolsTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.util.StringBuilders;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
index 0278c858d3..9161c874dd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTDictionaryTest.java
@@ -42,7 +42,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
index a73fe0e5b3..a69c5b2b40 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/WKTFormatTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/package-info.txt b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/package-info.txt
deleted file mode 100644
index 9db1fb322e..0000000000
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/package-info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The "org.apache.sis.io.wkt" package is defined in the "sis-metadata" module,
-but some of their classes cannot be tested there because they depend on the
-"sis-referencing" module. Those classes are tested here.
-
-The reason for this split is that formatting does not need to know classes
-in advance since we just invoke an overrideable method. But parsing needs
-to know all classes, which is why we can test it only in this module.
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
index 994ea80195..6170113383 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
@@ -29,8 +29,10 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.opengis.referencing.IdentifiedObject.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
index 60cd70c566..76e6001379 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
@@ -34,8 +34,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
index 9f0a6e87c4..5af5241d2f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueGroupTest.java
@@ -34,8 +34,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
-import static org.opengis.test.Validators.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSetEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
index 51914f8e3c..cb8970bd5f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java
@@ -31,8 +31,10 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.opengis.test.Validators.*;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Validators.validate;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
index 582ca87fae..e3702e6536 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersAlphaNumTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.parameter;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
index 64679029ee..1eb1073063 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java
@@ -19,7 +19,8 @@ package org.apache.sis.parameter;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
index ae389e2fd0..1a2e3a9358 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterFormatTest.java
@@ -32,7 +32,8 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.metadata.iso.citation.Citations.OGC;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
index 43eeb96daa..07d44d80e9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java
@@ -39,7 +39,11 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.XML;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
index d57a0624ba..992b16ebf7 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorParametersTest.java
@@ -29,8 +29,11 @@ import org.apache.sis.test.TestCase;
import org.junit.AfterClass;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
+import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
import static org.apache.sis.internal.util.Constants.NUM_ROW;
import static org.apache.sis.internal.util.Constants.NUM_COL;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
index 2906cac633..e85ac3e6c6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/parameter/TensorValuesTest.java
@@ -34,8 +34,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.internal.util.Constants.NUM_ROW;
import static org.apache.sis.internal.util.Constants.NUM_COL;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
index c2791534fe..8fcb16ce04 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
@@ -31,7 +31,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
index 88080445bf..97c3fdbbab 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractReferenceSystemTest.java
@@ -33,8 +33,9 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.opengis.referencing.ReferenceSystem.*;
-import static org.apache.sis.test.Assert.*;
-import static org.apache.sis.test.ReferencingAssert.assertWktEquals;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assertions.java
similarity index 98%
rename from core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
rename to core/sis-referencing/src/test/java/org/apache/sis/referencing/Assertions.java
index f6c3ff1c7a..e9552fdc23 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/ReferencingAssert.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assertions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.test;
+package org.apache.sis.referencing;
import java.util.Collection;
import java.awt.geom.Rectangle2D;
@@ -35,6 +35,7 @@ import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.cs.RangeMeaning;
import org.opengis.util.GenericName;
+import org.apache.sis.util.Static;
import org.apache.sis.io.wkt.Symbols;
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Convention;
@@ -42,11 +43,13 @@ import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.internal.util.Constants;
+import org.apache.sis.test.TestUtilities;
import static java.lang.StrictMath.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
@@ -57,7 +60,7 @@ import static java.lang.StrictMath.*;
* @version 1.0
* @since 0.3
*/
-public class ReferencingAssert extends MetadataAssert {
+public final class Assertions extends Static {
/**
* The formatter to be used by {@link #assertWktEquals(String, Object)}.
* This formatter uses the {@code “…”} quotation marks instead of {@code "…"}
@@ -71,9 +74,9 @@ public class ReferencingAssert extends MetadataAssert {
}
/**
- * For subclass constructor only.
+ * Do not allow instantiation of this class.
*/
- protected ReferencingAssert() {
+ private Assertions() {
}
/**
@@ -165,8 +168,8 @@ public class ReferencingAssert extends MetadataAssert {
assertEquals("name", name, axis.getName().getCode());
assertEquals("abbreviation", abbreviation, axis.getAbbreviation());
assertEquals("direction", direction, axis.getDirection());
- assertEquals("minimumValue", minimumValue, axis.getMinimumValue(), TestCase.STRICT);
- assertEquals("maximumValue", maximumValue, axis.getMaximumValue(), TestCase.STRICT);
+ assertEquals("minimumValue", minimumValue, axis.getMinimumValue(), 0); // STRICT
+ assertEquals("maximumValue", maximumValue, axis.getMaximumValue(), 0); // STRICT
assertEquals("unit", unit, axis.getUnit());
assertEquals("rangeMeaning", rangeMeaning, axis.getRangeMeaning());
}
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
index 97942ae382..996461d410 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/AuthorityFactoriesTest.java
@@ -41,7 +41,8 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertNotDeepEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
index 365189043c..870f1de732 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CRSTest.java
@@ -49,7 +49,9 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
index ce328af450..0ec26a7467 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/CommonCRSTest.java
@@ -46,7 +46,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.TestUtilities.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
index 20987936a4..9b9ac1b157 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/EPSGFactoryFallbackTest.java
@@ -45,7 +45,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
index b6169c2538..1dbc7f4a14 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticObjectVerifier.java
@@ -34,7 +34,8 @@ import org.opengis.referencing.crs.GeodeticCRS;
import org.apache.sis.internal.metadata.AxisNames;
import org.apache.sis.measure.Units;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
index adf9a29914..413ad578d9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/ImmutableIdentifierTest.java
@@ -32,7 +32,10 @@ import org.apache.sis.test.xml.TestCase;
import org.opengis.test.Validators;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.opengis.metadata.Identifier.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
index 1c8ea237b9..5aa659dbc3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
index bdaed11f46..f4c4b4726c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/AbstractCRSTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
index 99e5b16523..0ab4485623 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
@@ -36,7 +36,12 @@ import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index 2c38f5cc0e..3f2dc5017b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -37,7 +37,11 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
index 1b367b0e12..80578dbb28 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
@@ -29,7 +29,11 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
index d06aad4082..e31fb45f03 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.test.TestCase;
import org.opengis.test.Validators;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
index f24f171855..17066bf2d4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
index 4b0693b1d0..16cde5b93b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 25e09065af..730e216edc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@ -32,7 +32,11 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.xml.Namespaces;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index 2d5ebced85..1d9e70bf68 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -45,7 +45,10 @@ import org.junit.After;
import org.junit.Test;
import org.junit.Rule;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
index 16cc6d6b03..776abb403b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_MILLISECOND;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
index 35f1e52c10..2d5e5b3e90 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultVerticalCRSTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
index f5b9d08863..095ae2811a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/HardCodedCRSTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.crs.HardCodedCRS.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
index 6ecc3aa4e9..40c8d88b61 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/AbstractCSTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
index 16006fc411..e88ffc857d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/CoordinateSystemsTest.java
@@ -40,7 +40,9 @@ import static java.lang.Double.NaN;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
import static org.apache.sis.referencing.cs.CoordinateSystems.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
index 9274767d04..1dabc43769 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCartesianCSTest.java
@@ -30,7 +30,10 @@ import org.junit.Test;
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.referencing.Assertions.assertAxisEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
index cb2c09ea66..8147904fc8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxisTest.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.cs.HardCodedAxes.*;
import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
index 78583bc615..17ab06430a 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCSTest.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.GeodeticObjectVerifier;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertAxisEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
index 805575321c..1605216327 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DirectionAlongMeridianTest.java
@@ -22,7 +22,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
index 51b8245d24..5098eb1a38 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/HardCodedCSTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.cs.HardCodedCS.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
index 465bf74d72..e70e10e865 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/NormalizerTest.java
@@ -30,7 +30,9 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.opengis.referencing.cs.CoordinateSystem.NAME_KEY;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
+import static org.apache.sis.referencing.Assertions.assertAxisEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
index 31b8e6dbd9..bdc2e483a0 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/BursaWolfParametersTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
index 52e183fdde..cc4a7dad39 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
@@ -22,7 +22,9 @@ import org.apache.sis.test.xml.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
index 99bec7d994..4ff39ba260 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultGeodeticDatumTest.java
@@ -38,7 +38,12 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestStep;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
index d5ef03edf7..3aba5cb76d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
@@ -33,7 +33,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index 78c8ceafe3..9b9bd50a42 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertIdentifierEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
index 426b99d113..8ed6ac00d9 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultVerticalDatumTest.java
@@ -31,7 +31,9 @@ import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.referencing.GeodeticObjectVerifier.*;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
index a532ee0cee..1e15a867cf 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/TimeDependentBWPTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.internal.referencing.Formulas.JULIAN_YEAR_LENGTH;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
index 9af0eaf882..9effce9a2b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
@@ -49,7 +49,12 @@ import org.apache.sis.test.TestCase;
import org.junit.Ignore;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertSetEquals;
+import static org.apache.sis.test.Assertions.assertNotDeepEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEqualsRegex;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
index 7474475b5c..c51e500c4d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
@@ -53,7 +53,8 @@ import org.junit.runner.RunWith;
import org.junit.Ignore;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
index 9474a5dbbf..a2f05c26dc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/IdentifiedObjectFinderTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
index c8da7fc4d9..05f6503c49 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
@@ -48,7 +48,9 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
index 25452e825c..240198e084 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
@@ -69,7 +69,12 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.referencing.factory.TestFactorySource;
import static org.junit.Assume.assumeNotNull;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+import static org.apache.sis.test.Assertions.assertNotDeepEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
+import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index e897d9feab..c9b99b5379 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -69,7 +69,9 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index acacc2bead..67ae7c2152 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -44,8 +44,10 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
index 8984ac7d42..945f8f64dc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
@@ -35,7 +35,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertIdentifierEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 7c68c52a47..77c8ea27b2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@ -49,7 +49,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index 63b72be6d3..7931848593 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -43,7 +43,9 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
index cae495bd25..e5e5a1d2df 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultFormulaTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.io.wkt.Convention;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
index 80654d7334..6e59b5d441 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultOperationMethodTest.java
@@ -33,7 +33,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
index 17af37cbb2..5dd434a0a5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultTransformationTest.java
@@ -37,7 +37,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
index 6e7ed46adb..6a1fee7dbd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/SingleOperationMarshallingTest.java
@@ -47,7 +47,11 @@ import org.junit.Test;
import static org.apache.sis.metadata.iso.citation.Citations.EPSG;
import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertIdentifierEquals;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
index e3ff1daae5..4160e55548 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
@@ -34,7 +34,9 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertMapEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
index fa142b3734..8634e3d64b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
index cb65552699..aa8f6e0375 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatricesTest.java
@@ -32,8 +32,10 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.apache.sis.test.Assert.*;
import static org.opengis.referencing.cs.AxisDirection.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index 7376c5c599..eae9da3a9f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
index da284fb308..ddd6be5ffb 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/EquirectangularTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.internal.referencing.provider.Equirectangular;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
-import org.apache.sis.test.ReferencingAssert;
+import org.apache.sis.referencing.Assertions;
import org.junit.Test;
import static java.lang.Double.NaN;
@@ -76,17 +76,17 @@ public final class EquirectangularTest extends MapProjectionTestCase {
* below show whatever identifier come first for each parameter (currently GeoTIFF identifiers,
* but the authority may change in any future SIS version).
*/
- ReferencingAssert.assertWktEquals(Convention.WKT2,
+ Assertions.assertWktEquals(Convention.WKT2,
"PARAM_MT[“Equidistant Cylindrical (Spherical)”,\n" +
" PARAMETER[“semi_major”, 6371007.0, LENGTHUNIT[“metre”, 1], ID[“GeoTIFF”, 2057]],\n" +
" PARAMETER[“semi_minor”, 6371007.0, LENGTHUNIT[“metre”, 1], ID[“GeoTIFF”, 2058]]]", transform);
- ReferencingAssert.assertWktEquals(Convention.WKT2_SIMPLIFIED,
+ Assertions.assertWktEquals(Convention.WKT2_SIMPLIFIED,
"Param_MT[“Equidistant Cylindrical (Spherical)”,\n" +
" Parameter[“semi_major”, 6371007.0, Unit[“metre”, 1]],\n" +
" Parameter[“semi_minor”, 6371007.0, Unit[“metre”, 1]]]", transform);
- ReferencingAssert.assertWktEquals(Convention.INTERNAL,
+ Assertions.assertWktEquals(Convention.INTERNAL,
"Param_MT[“Affine parametric transformation”,\n" +
" Parameter[“A0”, 111195.04881760638, Id[“EPSG”, 8623]],\n" +
" Parameter[“B1”, 111195.04881760638, Id[“EPSG”, 8640]]]", transform);
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
index ebaccd232b..fe39216e2b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/LambertConicConformalTest.java
@@ -36,7 +36,8 @@ import org.junit.Test;
import static java.lang.StrictMath.*;
import static java.lang.Double.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 08beb8fea3..5029b34d4f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import static java.lang.Double.NaN;
import static java.lang.StrictMath.abs;
import static java.lang.StrictMath.toRadians;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.internal.referencing.provider.TransverseMercator.LATITUDE_OF_ORIGIN;
import org.opengis.test.CalculationType;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index 44e909bec2..d808b1e225 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static java.lang.StrictMath.toRadians;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
index 41ddefb000..3c361aaa85 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/CopyTransformTest.java
@@ -25,7 +25,10 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertIsIdentity;
+import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
index e33e81abcb..2be66d7b64 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DomainDefinitionTest.java
@@ -23,7 +23,7 @@ import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
index 321c14abed..1ad4f2c9d1 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransformTest.java
@@ -39,7 +39,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
index 1690c2aa9f..742d64a97b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1DTest.java
@@ -25,7 +25,9 @@ import static java.lang.StrictMath.*;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
// Branch-dependent imports
import org.opengis.test.CalculationType;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
index faa25aeafa..90b600de81 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1DTest.java
@@ -24,7 +24,8 @@ import static java.lang.StrictMath.*;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.ReferencingAssert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.referencing.Assertions.assertIsNotIdentity;
// Branch-dependent imports
import org.opengis.test.ToleranceModifier;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index 395a6e7211..69ceb99a1c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@ -42,7 +42,7 @@ import static java.lang.StrictMath.*;
import org.opengis.test.Validators;
import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.ReferencingAssert;
+import org.apache.sis.referencing.Assertions;
import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
import static org.opengis.test.Assert.*;
@@ -348,7 +348,7 @@ public abstract class MathTransformTestCase extends TransformTestCase {
}
if (values != null) {
assertSame(descriptor, values.getDescriptor());
- ReferencingAssert.assertParameterEquals(values,
+ Assertions.assertParameterEquals(values,
((Parameterized) transform).getParameterValues(), tolerance);
}
}
@@ -363,7 +363,7 @@ public abstract class MathTransformTestCase extends TransformTestCase {
*/
protected final void assertWktEquals(final String expected) {
assertNotNull("The 'transform' field shall be assigned a value.", transform);
- ReferencingAssert.assertWktEquals(Convention.WKT1, expected, transform);
+ Assertions.assertWktEquals(Convention.WKT1, expected, transform);
}
/**
@@ -378,7 +378,7 @@ public abstract class MathTransformTestCase extends TransformTestCase {
*/
protected final void assertWktEqualsRegex(final String expected) {
assertNotNull("The 'transform' field shall be assigned a value.", transform);
- ReferencingAssert.assertWktEqualsRegex(Convention.WKT1, expected, transform);
+ Assertions.assertWktEqualsRegex(Convention.WKT1, expected, transform);
}
/**
@@ -390,7 +390,7 @@ public abstract class MathTransformTestCase extends TransformTestCase {
*/
protected final void assertInternalWktEquals(final String expected) {
assertNotNull("The 'transform' field shall be assigned a value.", transform);
- ReferencingAssert.assertWktEquals(Convention.INTERNAL, expected, transform);
+ Assertions.assertWktEquals(Convention.INTERNAL, expected, transform);
}
/**
@@ -403,7 +403,7 @@ public abstract class MathTransformTestCase extends TransformTestCase {
*/
protected final void assertInternalWktEqualsRegex(final String expected) {
assertNotNull("The 'transform' field shall be assigned a value.", transform);
- ReferencingAssert.assertWktEqualsRegex(Convention.INTERNAL, expected, transform);
+ Assertions.assertWktEqualsRegex(Convention.INTERNAL, expected, transform);
}
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index a16ae09fa7..6a902bf2b3 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -50,7 +50,8 @@ import org.opengis.test.ToleranceModifiers;
import org.opengis.test.referencing.ParameterizedTransformTest;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
index d9c2a3fd8c..2670bb3f02 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateOperationTest.java
@@ -41,7 +41,8 @@ import org.apache.sis.test.DependsOn;
import org.junit.Test;
import static org.junit.Assume.assumeTrue;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index f320d125ca..e17354554b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@ -76,7 +76,7 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
index ecf5f55c4d..6e0c6b748b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -50,7 +50,9 @@ import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertIdentifierEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/package-info.txt b/core/sis-referencing/src/test/java/org/apache/sis/test/package-info.txt
deleted file mode 100644
index ac895b551f..0000000000
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/package-info.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Different modules provide classes in this package - be careful about collisions.
-This package is initially defined by the sis-utility module, which also provides
-the package-info.java file.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
index 2cf6132c15..9a6b26edac 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.util.ObjectConverter;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
index 1d7800962e..738bd24766 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ArrayConverterTest.java
@@ -18,10 +18,10 @@ package org.apache.sis.internal.converter;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-
-import static org.apache.sis.test.Assert.*;
import org.apache.sis.test.DependsOnMethod;
+import static org.junit.Assert.*;
+
/**
* Tests the {@link ArrayConverter} implementations.
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
index b599392b70..37a533b825 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
@@ -27,7 +27,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
index f25091048c..02fc77be63 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
index 8f74f66af7..9fb09fb6f8 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
@@ -25,7 +25,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
index 523b9a6701..0588b795cc 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
@@ -31,7 +31,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.junit.Assume.assumeTrue;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
index f11046b35f..50f285df82 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
@@ -41,7 +41,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
index 698f0e33e5..213597b79e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/converter/SystemRegistryTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.internal.converter.SystemRegistry.INSTANCE;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
index 2bef46ff1a..3dd7771264 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
@@ -19,11 +19,13 @@ package org.apache.sis.internal.test;
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
- * Tests the {@link org.apache.sis.test.Assert} class.
+ * Tests the {@link org.apache.sis.test.Assertions} class.
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.6
@@ -31,7 +33,7 @@ import static org.apache.sis.test.Assert.*;
*/
public final class AssertTest extends TestCase {
/**
- * Tests the {@link org.apache.sis.test.Assert#assertMultilinesEquals(CharSequence, CharSequence)} method.
+ * Tests the {@link org.apache.sis.test.Assertions#assertMultilinesEquals(CharSequence, CharSequence)} method.
*/
@Test
public void testAssertEqualsMultilines() {
@@ -54,7 +56,7 @@ public final class AssertTest extends TestCase {
}
/**
- * Tests the {@link org.apache.sis.test.Assert#assertSerializedEquals(Object)} method.
+ * Tests the {@link org.apache.sis.test.Assertions#assertSerializedEquals(Object)} method.
*/
@Test
public void testAssertSerializedEquals() {
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
index 0cda1b81fe..08474ec58b 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
index 6111d32cc0..de61f8ae22 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/CollectionsExtTest.java
@@ -33,7 +33,9 @@ import org.apache.sis.util.collection.CodeListSet;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertMapEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
index f0c60d839d..1d150aa986 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
index dff0354609..7d45be6b9e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/FractionTest.java
@@ -19,7 +19,8 @@ package org.apache.sis.math;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
index 4fe4bcbb8a..7c33a820ef 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/LineTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
index 146cd9e741..cb5c21e579 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
@@ -22,7 +22,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
index 563e637cd0..3a13335ba9 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsFormatTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
index ec4f997641..4a39714356 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.TestCase;
import static java.lang.StrictMath.*;
import static java.lang.Double.NaN;
import static java.lang.Double.isNaN;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
index 0c04750a68..3a33d875b0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ConventionalUnitTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
index 5c8fce4e25..3da073eb3f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/LinearConverterTest.java
@@ -23,7 +23,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
index 7ab1f9458d..96460dac98 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/MeasurementRangeTest.java
@@ -21,7 +21,8 @@ import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
index ea65820987..c631c04a6d 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
@@ -22,7 +22,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.junit.Assume.assumeTrue;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
index 4863d99b2b..7e11a22711 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/ScalarTest.java
@@ -27,7 +27,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
index 028caebccf..8cdc0494de 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/SystemUnitTest.java
@@ -32,7 +32,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertMapEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
index a1ac5da7c6..022eb8e05e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitDimensionTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.util.UnconvertibleObjectException;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMapEquals;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
index 8a18e90d57..b4301d2598 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitServicesTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
index 9bcf8fe68f..184b207ac3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java
@@ -25,9 +25,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.apache.sis.measure.SexagesimalConverter.*;
import static org.apache.sis.measure.Units.*;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
index e5ba44b2a7..b543d5e71f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/setup/OptionKeyTest.java
@@ -21,9 +21,10 @@ import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
import static org.apache.sis.setup.OptionKey.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java b/core/sis-utility/src/test/java/org/apache/sis/test/Assertions.java
similarity index 98%
rename from core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
rename to core/sis-utility/src/test/java/org/apache/sis/test/Assertions.java
index ea3e8ed759..dfa6ca5e52 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/test/Assert.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/test/Assertions.java
@@ -37,6 +37,9 @@ import org.apache.sis.util.CharSequences;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.Classes;
+import org.apache.sis.util.Static;
+
+import static org.junit.Assert.*;
/**
@@ -44,14 +47,14 @@ import org.apache.sis.util.Classes;
*
* @author Martin Desruisseaux (Geomatys)
* @author Alexis Manin (Geomatys)
- * @version 1.0
+ * @version 1.4
* @since 0.3
*/
-public class Assert extends org.opengis.test.Assert {
+public final class Assertions extends Static {
/**
- * For subclass constructor only.
+ * Do not allow instantiation of this class.
*/
- protected Assert() {
+ private Assertions() {
}
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
index 8fbda3567e..86e3e76fa0 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/DefaultInternationalStringTest.java
@@ -22,8 +22,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
index 1e5c6556e4..142385fce1 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/SimpleInternationalStringTest.java
@@ -20,8 +20,9 @@ import java.util.Locale;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
-import static org.apache.sis.test.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.util.DefaultInternationalStringTest.MESSAGE;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
index 0994526abd..41bacad9b2 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/VersionTest.java
@@ -20,7 +20,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
index efd33b9062..c0b35903e3 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
@@ -37,7 +37,8 @@ import org.apache.sis.test.Performance;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMapEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
index 09520ebef2..f2a4798e7e 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/DefaultTreeTableTest.java
@@ -23,7 +23,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.util.collection.TableColumn.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
index 9b3d919ade..3da5a7fcf8 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
@@ -31,7 +31,10 @@ import org.apache.sis.test.TestUtilities;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.test.Assertions.assertParallelStreamEquals;
+import static org.apache.sis.test.Assertions.assertSequentialStreamEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
index 3a0955298f..73044610e8 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/RangeSetTest.java
@@ -33,7 +33,8 @@ import org.apache.sis.test.Performance;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_SECOND;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
index bd018439b0..639a96fb09 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TableColumnTest.java
@@ -20,9 +20,10 @@ import java.util.Locale;
import org.opengis.util.InternationalString;
import org.junit.Test;
import org.apache.sis.test.TestCase;
-
-import static org.apache.sis.test.Assert.*;
import org.apache.sis.test.foreigner.SerializableTableColumn;
+
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.util.collection.TableColumn.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
index ad64acf4aa..f99fdee0cf 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTableFormatTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.util.collection.TableColumn.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
index a8f5045f4b..a8ef787922 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
@@ -26,7 +26,9 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.apache.sis.util.SimpleInternationalString;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.util.collection.TreeTables.*;
import static org.apache.sis.util.collection.TableColumn.*;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
index b1706822a2..a18e4fc050 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestConfiguration;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
index 9e922860a3..701f4bed09 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.TestConfiguration;
import org.apache.sis.test.TestUtilities;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMapEquals;
import static org.apache.sis.test.TestUtilities.waitForGarbageCollection;
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
index de22e52b94..fcc9e246e8 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/logging/MonolineFormatterTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
index 9b35dfc517..c1f1c34312 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import org.junit.After;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
index 3847d3a97d..28b681dfb4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/util/resources/LoaderTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
index e6cbe47d21..f0ccb73332 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
@@ -20,7 +20,8 @@ import javax.xml.bind.JAXBException;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
index 3e8f3366b4..5851721b39 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
index cbed0dfe69..525030badf 100644
--- a/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
+++ b/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/XMLMetadataTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.xml.Namespaces;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertMultilinesEquals;
/**
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
index 30ef93b14c..618f89a9d1 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/FeatureSetTest.java
@@ -31,7 +31,8 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index df2b33fbbb..5ddf1a736c 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.storage.DataStoreMock;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.date;
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
index 927979c27f..53bb6abf66 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/storage/sql/SQLStoreTest.java
@@ -34,7 +34,9 @@ import org.apache.sis.internal.sql.feature.TableReference;
import org.apache.sis.test.sql.TestDatabase;
import org.apache.sis.test.TestUtilities;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertSetEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
index e51b7d8e09..f208b2c0d2 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MemoryGridResourceTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
index 08ceaadaf1..10bd9f9079 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
@@ -29,7 +29,10 @@ import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.Assertions.assertPartyNameEquals;
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageSubsetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageSubsetTest.java
index ec20872938..4c11d7142b 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageSubsetTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/CoverageSubsetTest.java
@@ -34,7 +34,8 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
/**
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
index 80b44e2aa2..237a0de900 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/DataStoresTest.java
@@ -32,7 +32,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSetEquals;
/**
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
index a354a4162c..57c1d1d0a3 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/ProbeResultTest.java
@@ -19,9 +19,11 @@ package org.apache.sis.storage;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
import static org.apache.sis.storage.ProbeResult.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
+
/**
* Tests {@link ProbeResult}.
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java
index 30d04092dd..bab82de767 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java
@@ -29,7 +29,9 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertContentInfoEquals;
+import static org.apache.sis.metadata.Assertions.assertFeatureSourceEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
// Branch-dependent imports
diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java
index 929117d441..9f5fef014a 100644
--- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java
+++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/UpdaterTest.java
@@ -37,7 +37,8 @@ import org.junit.Before;
import org.junit.After;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;
diff --git a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
index 7ffc59e22d..454dfc236d 100644
--- a/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
+++ b/storage/sis-xmlstore/src/test/java/org/apache/sis/internal/storage/gpx/WriterTest.java
@@ -37,7 +37,8 @@ import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.Test;
-import static org.apache.sis.test.MetadataAssert.*;
+import static org.junit.Assert.*;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
// Branch-dependent imports
import org.opengis.feature.Feature;