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 20:39:48 UTC
[sis] branch geoapi-4.0 updated: Avoid start imports of `org.opengis.test.Assert` static methods. This is in anticipation for a fix equivalent to SIS-579 in GeoAPI.
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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 756a5e0ea3 Avoid start imports of `org.opengis.test.Assert` static methods. This is in anticipation for a fix equivalent to SIS-579 in GeoAPI.
756a5e0ea3 is described below
commit 756a5e0ea32d1a7fbf17a47690e374073695ab1d
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon May 8 19:39:57 2023 +0200
Avoid start imports of `org.opengis.test.Assert` static methods.
This is in anticipation for a fix equivalent to SIS-579 in GeoAPI.
---
.../src/test/java/org/apache/sis/coverage/CategoryTest.java | 3 ++-
.../src/test/java/org/apache/sis/coverage/SampleDimensionTest.java | 3 ++-
.../org/apache/sis/coverage/grid/DimensionalityReductionTest.java | 3 ++-
.../test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java | 3 ++-
.../src/test/java/org/apache/sis/image/ResamplingGridTest.java | 3 ++-
.../test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java | 2 +-
.../java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java | 3 ++-
.../test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java | 3 ++-
.../src/test/java/org/apache/sis/test/feature/FeatureComparator.java | 3 ++-
.../src/test/java/org/apache/sis/metadata/ValueMapTest.java | 3 ++-
.../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java | 3 ++-
.../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java | 3 ++-
.../src/test/java/org/apache/sis/test/xml/DocumentComparator.java | 3 ++-
.../src/test/java/org/apache/sis/util/iso/TypesTest.java | 3 ++-
.../org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java | 2 +-
.../org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java | 3 ++-
.../internal/referencing/provider/DatumShiftGridCompressedTest.java | 2 +-
.../referencing/provider/FranceGeocentricInterpolationTest.java | 3 ++-
.../sis/internal/referencing/provider/GeocentricTranslationTest.java | 3 ++-
.../sis/internal/referencing/provider/Geographic3Dto2DTest.java | 4 +++-
.../org/apache/sis/internal/referencing/provider/NADCONTest.java | 4 +++-
.../java/org/apache/sis/internal/referencing/provider/NTv2Test.java | 4 +++-
.../src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java | 3 ++-
.../test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java | 5 ++++-
.../java/org/apache/sis/referencing/StandardDefinitionsTest.java | 3 ++-
.../java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java | 3 ++-
.../test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java | 3 ++-
.../java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java | 3 ++-
.../java/org/apache/sis/referencing/factory/TestFactorySource.java | 3 ++-
.../apache/sis/referencing/geoapi/ParameterizedTransformTest.java | 2 +-
.../sis/referencing/operation/DefaultPassThroughOperationTest.java | 4 +++-
.../apache/sis/referencing/operation/builder/ResidualGridTest.java | 3 ++-
.../org/apache/sis/referencing/operation/matrix/Matrix4Test.java | 3 ++-
.../apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java | 3 ++-
.../apache/sis/referencing/operation/projection/InitializerTest.java | 2 +-
.../apache/sis/referencing/operation/projection/MercatorTest.java | 3 ++-
.../referencing/operation/transform/ConcatenatedTransformTest.java | 3 ++-
.../referencing/operation/transform/ContextualParametersTest.java | 3 ++-
.../operation/transform/DefaultMathTransformFactoryTest.java | 4 +++-
.../referencing/operation/transform/LinearInterpolator1DTest.java | 3 ++-
.../sis/referencing/operation/transform/LinearTransformTest.java | 2 +-
.../sis/referencing/operation/transform/MathTransformTestCase.java | 3 ++-
.../sis/referencing/operation/transform/MathTransformsTest.java | 4 +++-
.../sis/referencing/operation/transform/ProjectiveTransformTest.java | 3 ++-
.../sis/referencing/operation/transform/ScaleTransformTest.java | 3 ++-
.../sis/referencing/operation/transform/TransferFunctionTest.java | 4 +++-
.../referencing/operation/transform/TransformResultComparator.java | 3 ++-
.../sis/referencing/operation/transform/TransformSeparatorTest.java | 4 +++-
.../referencing/operation/transform/TranslationTransformTest.java | 2 +-
.../sis/referencing/operation/transform/WraparoundTransformTest.java | 3 ++-
.../apache/sis/test/integration/CoordinateReferenceSystemTest.java | 3 ++-
core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java | 3 ++-
.../src/test/java/org/apache/sis/measure/QuantitiesTest.java | 3 ++-
.../test/java/org/apache/sis/profile/france/FrenchProfileTest.java | 3 ++-
.../src/test/java/org/apache/sis/internal/netcdf/GridTest.java | 3 ++-
.../src/test/java/org/apache/sis/internal/netcdf/VariableTest.java | 2 +-
.../java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 3 ++-
.../src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java | 2 +-
.../test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java | 3 ++-
.../src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java | 3 ++-
.../src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java | 3 ++-
.../src/test/java/org/apache/sis/storage/StorageConnectorTest.java | 3 ++-
62 files changed, 125 insertions(+), 62 deletions(-)
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
index 0c4a21a9b2..880c4ea7c1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/CategoryTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
index 3e67ec0dbf..c4db484fe1 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/SampleDimensionTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.measure.Units;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
index 565bc0af2d..881e1df5c3 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
@@ -32,7 +32,8 @@ import org.apache.sis.util.Utilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
index 87175dfff4..28f7649fd2 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/coverage/grid/PixelTranslationTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
index 0191bec70c..c05f3cc213 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/image/ResamplingGridTest.java
@@ -35,7 +35,8 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
index 8a040b5c07..001cae115a 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/j2d/FactoryTest.java
@@ -20,7 +20,7 @@ import org.apache.sis.internal.feature.GeometriesTestCase;
import java.awt.geom.Path2D;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
index d1250ffbd1..6482080131 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/feature/jts/ShapeConverterTest.java
@@ -38,7 +38,8 @@ import org.locationtech.jts.geom.Point;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
index 4f779b60ae..91d36f196c 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/internal/filter/sqlmm/SQLMMTest.java
@@ -28,7 +28,8 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
// Branch-dependent imports
import org.opengis.filter.Literal;
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
index 04fead7b0c..e5c5151828 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/feature/FeatureComparator.java
@@ -31,7 +31,8 @@ import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Deprecable;
-import static org.opengis.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-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
index 1bfff4f3f0..bbf3e5513e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
@@ -32,7 +32,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static java.util.AbstractMap.SimpleEntry;
import static org.opengis.metadata.citation.PresentationForm.DOCUMENT_HARDCOPY;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
index 0eec1f9e9b..410115cb8d 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.util.Version;
import org.junit.Test;
-import static org.opengis.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/iso/quality/AbstractPositionalAccuracyTest.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
index 08e31125bb..a9a4171255 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
@@ -26,7 +26,8 @@ import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
index 6cc0d63d74..af91b44bdb 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/test/xml/DocumentComparator.java
@@ -48,7 +48,8 @@ import org.apache.sis.internal.util.Strings;
import org.apache.sis.internal.xml.LegacyNamespaces;
import static java.lang.StrictMath.*;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.util.Characters.NO_BREAK_SPACE;
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
index 85531669ce..da06d0ef0e 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/util/iso/TypesTest.java
@@ -37,7 +37,8 @@ import org.apache.sis.util.DefaultInternationalString;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.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/internal/referencing/j2d/AbstractShapeTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
index 07a1dbe3e7..2115ef0a1e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/AbstractShapeTest.java
@@ -21,7 +21,7 @@ import java.awt.geom.Line2D;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
index 39c8818900..719f508aea 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesTest.java
@@ -25,7 +25,8 @@ import java.awt.geom.CubicCurve2D;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.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/internal/referencing/provider/DatumShiftGridCompressedTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
index 821f6fff58..876b937d07 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressedTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.internal.referencing.provider;
import javax.measure.quantity.Dimensionless;
import org.opengis.referencing.operation.NoninvertibleTransformException;
-import static org.opengis.test.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
index fdd0206c95..707095be3b 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestStep;
import org.junit.Test;
-import static org.opengis.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/internal/referencing/provider/GeocentricTranslationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
index 88646c6bbd..236a1be912 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java
@@ -40,7 +40,8 @@ import org.apache.sis.test.DependsOn;
import org.junit.Test;
import static java.lang.StrictMath.toRadians;
-import static org.opengis.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/internal/referencing/provider/Geographic3Dto2DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
index eb5d6e8b79..74ce3641b6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java
@@ -27,7 +27,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
index 8f87a35bf8..cb0b266e12 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java
@@ -31,7 +31,9 @@ import org.apache.sis.geometry.Envelopes;
import org.apache.sis.measure.Units;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
index d40f0202fb..cc73c447cc 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java
@@ -38,7 +38,9 @@ import org.apache.sis.test.DependsOn;
import org.junit.Test;
import static org.junit.Assume.assumeTrue;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
import static org.apache.sis.internal.referencing.provider.DatumShiftGridLoader.DEGREES_TO_SECONDS;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
index 800f8fb45d..83a3813980 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/MathTransformParserTest.java
@@ -31,7 +31,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
index 079bf3fa0a..b7e81bbe91 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@ -47,7 +47,10 @@ import net.sf.geographiclib.GeodesicData;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertBetween;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
import static org.apache.sis.internal.metadata.ReferencingServices.AUTHALIC_RADIUS;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
index 9b27903c4d..2752d9f048 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
@@ -45,7 +45,8 @@ import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.junit.Test;
-import static org.opengis.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/cs/DefaultCylindricalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
index 8315d6b445..7a5e4d5989 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultCylindricalCSTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
index 2e18249628..a38d310b22 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultPolarCSTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
index 289ff2441d..d0e2a6ffd2 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/cs/DefaultSphericalCSTest.java
@@ -23,7 +23,8 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
index 2351761331..2f97ed1c85 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -27,7 +27,8 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.factory.sql.EPSGFactory;
import static org.junit.Assume.*;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertBetween;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
index 528188ab1f..068599e8ff 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/geoapi/ParameterizedTransformTest.java
@@ -27,7 +27,7 @@ import org.junit.runners.JUnit4;
import org.junit.After;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index c91cfa8616..780754030d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@ -27,8 +27,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.xml.TestCase;
import org.junit.Test;
+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;
-import static org.opengis.test.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
index 7fe0f9502d..49babf3ed4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/builder/ResidualGridTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
index cbb5ca03f2..3fd1c7da7c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/Matrix4Test.java
@@ -20,7 +20,8 @@ import org.apache.sis.test.DependsOn;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
import static org.apache.sis.referencing.operation.matrix.Matrix4.SIZE;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
index 57d200330a..4afc82eaa4 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
@@ -23,7 +23,8 @@ import org.junit.AfterClass;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
index 9b4d2b7176..ab0e420510 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/InitializerTest.java
@@ -27,7 +27,7 @@ import org.opengis.test.TestCase;
import org.junit.Test;
import static java.lang.StrictMath.*;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 76998ee776..6b54409d30 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -37,7 +37,8 @@ import org.junit.Test;
import static java.lang.Double.*;
import static java.lang.StrictMath.*;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertBetween;
import static org.apache.sis.referencing.operation.projection.ConformalProjectionTest.LN_INFINITY;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
index fd7b92a5da..1ecd8f1c70 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOn;
import org.junit.Test;
import org.opengis.test.Assert;
-import static org.opengis.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/operation/transform/ContextualParametersTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
index f2a4486753..3fe47db2fd 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ContextualParametersTest.java
@@ -31,7 +31,8 @@ import org.junit.Test;
import static java.lang.StrictMath.PI;
import static java.lang.StrictMath.toRadians;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index a9c0b9731f..976264571d 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@ -48,7 +48,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
index ac0eb03ad6..4277232a5c 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1DTest.java
@@ -24,7 +24,8 @@ import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.DependsOnMethod;
import org.junit.Test;
-import static org.opengis.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/operation/transform/LinearTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
index d468e1f5f8..c458838d25 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/LinearTransformTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestRunner;
-import static org.opengis.test.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
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 69ceb99a1c..e49512b43e 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
@@ -44,7 +44,8 @@ import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.referencing.Assertions;
import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
// Branch-dependent imports
import org.opengis.test.CalculationType;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
index 974071affb..63ffac21af 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformsTest.java
@@ -33,7 +33,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index db8f374a07..bb36cfbc6f 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@ -41,7 +41,8 @@ import org.junit.runner.RunWith;
import org.junit.After;
import org.junit.Test;
import org.opengis.test.Assert;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
// Branch-dependent imports
import org.opengis.test.referencing.AffineTransformTest;
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 5193743c32..afa9d5c7f6 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -27,7 +27,8 @@ import org.apache.sis.test.DependsOn;
import org.opengis.test.Assert;
import org.junit.Test;
-import static org.opengis.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/operation/transform/TransferFunctionTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
index e25c506bab..ecfd058952 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransferFunctionTest.java
@@ -28,7 +28,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
index 72818dfe63..7d7099b8ea 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformResultComparator.java
@@ -26,7 +26,8 @@ import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.NoninvertibleTransformException;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
index 0fd25c1d37..5633c6dbd8 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
@@ -38,7 +38,9 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static java.lang.Double.NaN;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 204693baf0..5a6ef3c919 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.DependsOn;
import org.opengis.test.Assert;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
index 8c2991602b..0b9d73e9b5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertMatrixEquals;
/**
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
index 2ce00f3bb0..54207156f5 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/CoordinateReferenceSystemTest.java
@@ -29,8 +29,9 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
index af7ba317df..bc4d95f0db 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
@@ -21,7 +21,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
index 08865a62a2..bcdb6c922f 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/QuantitiesTest.java
@@ -24,7 +24,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
index c73f717d94..e96f9da0d5 100644
--- a/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
+++ b/profiles/sis-french-profile/src/test/java/org/apache/sis/profile/france/FrenchProfileTest.java
@@ -30,7 +30,8 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
index 9d39b4bcb7..08d087d2f9 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridTest.java
@@ -25,7 +25,8 @@ import org.apache.sis.test.DependsOnMethod;
import org.opengis.test.dataset.TestData;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
index 3241c658b8..6c25c83c9a 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.test.DependsOn;
import org.opengis.test.dataset.TestData;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index c31b9ae8c8..ab496dd799 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@ -32,7 +32,8 @@ import org.apache.sis.test.DependsOn;
import org.opengis.test.dataset.TestData;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
index 7028f239bc..e2c6a78c75 100644
--- a/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
+++ b/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.util.Version;
import org.opengis.test.dataset.TestData;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
/**
diff --git a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
index b49a9e0b07..de621ddf2e 100644
--- a/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
+++ b/storage/sis-sqlstore/src/test/java/org/apache/sis/internal/sql/postgis/PostgresTest.java
@@ -56,7 +56,8 @@ import org.opengis.feature.Feature;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Geometry;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
index a452dcbebf..7a16891ca0 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/wkt/StoreTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertAxisDirectionsEqual;
/**
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
index 332632af1c..931383cefa 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
@@ -29,7 +29,8 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
index 136b658535..4980470d1b 100644
--- a/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
+++ b/storage/sis-storage/src/test/java/org/apache/sis/storage/StorageConnectorTest.java
@@ -39,7 +39,8 @@ import org.apache.sis.test.TestCase;
import org.junit.Test;
import static org.junit.Assume.assumeTrue;
-import static org.opengis.test.Assert.*;
+import static org.junit.Assert.*;
+import static org.opengis.test.Assert.assertInstanceOf;
/**