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 3ac45c141f Automatic post-merge reorganization of import statements.
3ac45c141f is described below
commit 3ac45c141f0a9347deaa62f2a16d16f82049785b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 21 16:52:26 2024 +0100
Automatic post-merge reorganization of import statements.
---
.../test/org/apache/sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../test/org/apache/sis/coverage/grid/GridDerivationTest.java | 2 +-
.../org/apache/sis/coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java | 2 +-
.../test/org/apache/sis/feature/FeatureTestCase.java | 2 +-
.../apache/sis/feature/builder/CharacteristicTypeBuilderTest.java | 2 +-
.../test/org/apache/sis/feature/test/FeatureComparator.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java | 2 +-
.../test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java | 2 ++
.../test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java | 2 +-
.../test/org/apache/sis/image/MaskedImageTest.java | 4 +++-
.../test/org/apache/sis/metadata/iso/MarshallingTest.java | 2 +-
.../org/apache/sis/metadata/iso/citation/DefaultCitationTest.java | 2 +-
.../test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
.../iso/identification/DefaultServiceIdentificationTest.java | 2 +-
.../org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java | 2 +-
.../sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java | 2 +-
.../test/org/apache/sis/util/iso/DefaultNameFactoryTest.java | 2 +-
.../test/org/apache/sis/util/iso/SerializableRecordSchema.java | 2 ++
.../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../test/org/apache/sis/xml/bind/gco/MultiplicityTest.java | 2 +-
.../test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java | 2 +-
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 4 ++--
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ComparisonWithEPSG.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 2 +-
.../test/org/apache/sis/referencing/GeodeticCalculatorTest.java | 4 ++--
.../apache/sis/referencing/factory/GeodeticObjectFactoryTest.java | 2 +-
.../test/org/apache/sis/referencing/factory/TestFactorySource.java | 2 ++
.../sis/referencing/operation/CoordinateOperationFinderTest.java | 2 +-
.../sis/referencing/operation/CoordinateOperationRegistryTest.java | 2 +-
.../operation/DefaultCoordinateOperationFactoryTest.java | 2 +-
.../apache/sis/referencing/operation/builder/LinearizerTest.java | 4 +++-
.../referencing/operation/builder/LocalizationGridBuilderTest.java | 2 +-
.../referencing/operation/projection/ConformalProjectionTest.java | 2 +-
.../sis/referencing/operation/projection/MapProjectionTestCase.java | 2 +-
.../apache/sis/referencing/operation/projection/MercatorTest.java | 2 +-
.../referencing/operation/provider/CoordinateFrameRotationTest.java | 2 +-
.../referencing/operation/provider/GeocentricTranslationTest.java | 2 +-
.../sis/referencing/operation/provider/GeographicOffsetsTest.java | 2 +-
.../referencing/operation/provider/PositionVector7ParamTest.java | 2 +-
.../operation/transform/CoordinateSystemTransformTest.java | 2 +-
.../sis/referencing/operation/transform/MathTransformTestCase.java | 6 +++---
.../referencing/operation/transform/ProjectiveTransformTest.java | 6 +++---
.../org/apache/sis/test/integration/CoordinateOperationTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +-
.../org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java | 2 +-
.../main/org/apache/sis/storage/base/LegalSymbols.java | 2 +-
.../test/org/apache/sis/storage/image/WorldFileStoreTest.java | 2 +-
.../test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java | 2 +-
.../test/org/apache/sis/test/FailureDetailsReporter.java | 2 ++
.../test/org/apache/sis/test/TestCaseWithLogs.java | 2 ++
.../test/org/apache/sis/util/collection/CacheTest.java | 2 +-
.../test/org/apache/sis/util/collection/RangeSetTest.java | 2 +-
.../test/org/apache/sis/map/SEPortrayerTest.java | 2 +-
58 files changed, 73 insertions(+), 59 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index 606f467146..8bdf082dca 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
@@ -42,12 +42,12 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
-import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.coverage.PointOutsideCoverageException;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
index ff776e3060..4de6abf53f 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridDerivationTest.java
@@ -44,13 +44,13 @@ import static
org.apache.sis.coverage.grid.GridGeometryTest.assertExtentEquals;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertBetween;
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import static org.opengis.test.Assertions.assertBetween;
import static org.opengis.test.Assertions.assertMatrixEquals;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
index fedfedd5a4..95fca0ec19 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ResampledGridCoverageTest.java
@@ -55,12 +55,12 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.image.TiledImageMock;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
-import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java
index 9a3efce370..10fccf5c38 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ScaledColorSpaceTest.java
@@ -24,11 +24,11 @@ import java.awt.image.ComponentColorModel;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;
import static java.lang.StrictMath.*;
-import org.apache.sis.image.ImageTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.image.ImageTestCase;
import org.apache.sis.test.TestUtilities;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
index a0e939392d..9cba286bda 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureTestCase.java
@@ -31,9 +31,9 @@ import org.apache.sis.util.SimpleInternationalString;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.test.Assertions.assertSerializedEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Attribute;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
index 2f5520220f..d9dd845dfa 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/CharacteristicTypeBuilderTest.java
@@ -22,8 +22,8 @@ import java.util.Set;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
-import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSetEquals;
+import org.apache.sis.test.TestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
index 31a2c18b25..1d22510ae4 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/test/FeatureComparator.java
@@ -28,7 +28,6 @@ import java.util.Iterator;
import java.util.Objects;
import java.util.stream.Collectors;
import org.opengis.util.GenericName;
-import org.apache.sis.util.Deprecable;
import org.apache.sis.util.internal.CollectionsExt;
// Test dependencies
@@ -42,6 +41,7 @@ import org.opengis.feature.PropertyType;
import org.opengis.feature.AttributeType;
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.Operation;
+import org.apache.sis.util.Deprecable;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java
index 22f810bc71..e46ee1b9b7 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/esri/FactoryTest.java
@@ -19,12 +19,12 @@ package org.apache.sis.geometry.wrapper.esri;
import com.esri.core.geometry.Polyline;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.geometry.wrapper.GeometriesTestCase;
import org.apache.sis.util.StringBuilders;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.geometry.wrapper.GeometriesTestCase;
import static org.apache.sis.test.Assertions.assertMessageContains;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java
index 9da6acb841..3bff93db25 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FactoryTest.java
@@ -17,11 +17,11 @@
package org.apache.sis.geometry.wrapper.j2d;
import java.awt.geom.Path2D;
-import org.apache.sis.geometry.wrapper.GeometriesTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import org.apache.sis.geometry.wrapper.GeometriesTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
index 3dded7cc3e..4eb9c4ef79 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
@@ -22,6 +22,8 @@ import org.opengis.referencing.operation.TransformException;
// Test dependencies
import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestCase;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import static org.opengis.test.Assertions.assertPathEquals;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java
index a6676e3581..0783facc60 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/FactoryTest.java
@@ -18,11 +18,11 @@ package org.apache.sis.geometry.wrapper.jts;
import org.locationtech.jts.geom.CoordinateXY;
import org.locationtech.jts.geom.MultiLineString;
-import org.apache.sis.geometry.wrapper.GeometriesTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.geometry.wrapper.GeometriesTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
index e09fc2028a..50d4cca2a8 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
@@ -36,10 +36,12 @@ import org.apache.sis.util.Debug;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
import org.apache.sis.test.TestCase;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
+
/**
* Tests {@link MaskedImage}.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
index a6ff402722..2dc96be785 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/MarshallingTest.java
@@ -63,11 +63,11 @@ import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.bind.gcx.Anchor;
import org.apache.sis.xml.bind.metadata.replace.ReferenceSystemMetadata;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 74da63aea8..e81d5b2a6d 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -43,11 +43,11 @@ import org.apache.sis.metadata.MetadataStandard;
import org.apache.sis.metadata.UnmodifiableMetadataException;
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.iso.extent.Extents;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.TestUtilities;
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index 65d74e3b9e..9f0bcae64f 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -25,11 +25,11 @@ import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.xml.IdentifierSpace;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.NilObject;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import static org.apache.sis.test.TestUtilities.date;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
index ae59697bfb..b460cedd47 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
@@ -24,11 +24,11 @@ import org.opengis.metadata.citation.Citation;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.xml.NilReason;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
index 591cb52956..71a9cb669e 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
@@ -21,11 +21,11 @@ import jakarta.xml.bind.JAXBException;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.xml.bind.gmi.LE_ProcessStep;
import org.apache.sis.metadata.iso.DefaultIdentifier;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
index 8e529a5184..c18b927c37 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
@@ -22,11 +22,11 @@ import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.quality.Result;
import org.opengis.metadata.quality.ConformanceResult;
import org.opengis.util.InternationalString;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.xml.bind.lan.FreeTextMarshallingTest;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultNameFactoryTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultNameFactoryTest.java
index 9c69ef4fa7..5cbd8b2559 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultNameFactoryTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultNameFactoryTest.java
@@ -23,8 +23,8 @@ import org.apache.sis.util.SimpleInternationalString;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.apache.sis.test.FailureDetailsReporter;
import org.opengis.test.util.NameTest;
+import org.apache.sis.test.FailureDetailsReporter;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/SerializableRecordSchema.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/SerializableRecordSchema.java
index c02cf2a7b3..2d005ea8a1 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/SerializableRecordSchema.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/SerializableRecordSchema.java
@@ -18,6 +18,8 @@ package org.apache.sis.util.iso;
import java.io.Serializable;
import java.io.ObjectStreamException;
+
+// Test dependencies
import static org.apache.sis.test.Assertions.assertSerializedEquals;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
index 646ef7e4f6..8fa5713aa9 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
@@ -20,11 +20,11 @@ import java.io.IOException;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.identification.DataIdentification;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.metadata.iso.citation.DefaultCitationTest;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/MultiplicityTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/MultiplicityTest.java
index 695bead899..7dbdbd8116 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/MultiplicityTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/MultiplicityTest.java
@@ -24,12 +24,12 @@ import org.apache.sis.util.iso.Names;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.XML;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.test.mock.FeatureAttributeMock;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java
index 9189849044..16f969bc7e 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/PT_LocaleTest.java
@@ -22,11 +22,11 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import jakarta.xml.bind.JAXBException;
import org.apache.sis.metadata.iso.DefaultMetadata;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 3d1fc5d222..cb304bfba1 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -30,6 +30,7 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
+import org.opentest4j.AssertionFailedError;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
import org.opengis.annotation.Specification;
@@ -37,12 +38,11 @@ import org.opengis.util.CodeList;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.xml.bind.cat.CodeListUID;
import org.apache.sis.xml.bind.Context;
+import org.apache.sis.xml.bind.cat.CodeListUID;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.opentest4j.AssertionFailedError;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCaseWithLogs;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
index 10f1546c27..970c0c51a9 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
@@ -43,12 +43,12 @@ import org.apache.sis.util.Version;
// Test dependencies
import org.junit.jupiter.api.AfterEach;
import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.api.parallel.ResourceAccessMode;
import org.junit.jupiter.api.parallel.ResourceLock;
+import static org.apache.sis.metadata.Assertions.assertXmlEquals;
import org.apache.sis.test.LoggingWatcher;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
index 2ffe2efe00..22fbae2d82 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralEnvelopeTest.java
@@ -33,8 +33,8 @@ import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84_LATITUDE_FIRST;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.Assertions.assertMessageContains;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
index 736925ca7c..82ab3a4824 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/ComparisonWithEPSG.java
@@ -21,7 +21,6 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.CoordinateOperation;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.factory.TestFactorySource;
import org.apache.sis.referencing.factory.sql.EPSGFactory;
// Test dependencies
@@ -30,6 +29,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.apache.sis.referencing.factory.TestFactorySource;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
index e3712318bd..84e00b0ce9 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
@@ -28,8 +28,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Disabled;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.apache.sis.test.FailureDetailsReporter;
import org.opengis.test.wkt.CRSParserTest;
+import org.apache.sis.test.FailureDetailsReporter;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
index fbfae3d861..d61c0203aa 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticCalculatorTest.java
@@ -31,6 +31,7 @@ import net.sf.geographiclib.GeodesicData;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.util.j2d.ShapeUtilitiesExt;
import org.apache.sis.geometry.DirectPosition2D;
@@ -43,7 +44,6 @@ import static
org.apache.sis.metadata.internal.ReferencingServices.AUTHALIC_RADI
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertBetween;
import org.apache.sis.test.OptionalTestData;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
@@ -51,7 +51,7 @@ import org.apache.sis.test.widget.VisualCheck;
import org.apache.sis.referencing.crs.HardCodedCRS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.cs.AxisDirection;
+import static org.opengis.test.Assertions.assertBetween;
import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
index cefae8aae2..9df81f3fa9 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/GeodeticObjectFactoryTest.java
@@ -45,8 +45,8 @@ import org.apache.sis.measure.Units;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.apache.sis.test.FailureDetailsReporter;
import org.opengis.test.referencing.ObjectFactoryTest;
+import org.apache.sis.test.FailureDetailsReporter;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.Assertions.assertMessageContains;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
index c5769d1176..6643b163e8 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -28,6 +28,8 @@ import org.apache.sis.referencing.factory.sql.EPSGFactory;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.*;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import static org.opengis.test.Assertions.assertBetween;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
index 45cbf87e62..cace2ed9c7 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationFinderTest.java
@@ -44,7 +44,6 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.util.PositionalAccuracyConstant;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.cs.DefaultCartesianCS;
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
@@ -65,6 +64,7 @@ import org.junit.jupiter.api.TestInstance;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.crs.HardCodedCRS;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index d1351677a0..d0a02b4035 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -34,7 +34,6 @@ import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.io.wkt.WKTFormat;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Test dependencies
import org.junit.jupiter.api.BeforeEach;
@@ -44,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index ed1dbf765e..92af2212c3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -34,7 +34,6 @@ import
org.apache.sis.referencing.util.PositionalAccuracyConstant;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.io.wkt.WKTFormat;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Test dependencies
import org.junit.jupiter.api.BeforeEach;
@@ -43,6 +42,7 @@ import org.junit.jupiter.api.TestInstance;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
index 39575c0d70..71698d24cb 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearizerTest.java
@@ -26,10 +26,12 @@ import org.apache.sis.geometry.Envelope2D;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.opengis.test.Assertions;
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.operation.HardCodedConversions;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.test.Assertions;
+
/**
* Tests {@link Linearizer}.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
index 87ddb8b66f..731924249b 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LocalizationGridBuilderTest.java
@@ -26,8 +26,8 @@ import org.apache.sis.geometry.Envelope2D;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.apache.sis.test.FailureDetailsReporter;
import org.opengis.test.referencing.TransformTestCase;
+import org.apache.sis.test.FailureDetailsReporter;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.test.TestCase.STRICT;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
index bfb388c4c4..7dd011f13f 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
@@ -28,9 +28,9 @@ import static
org.apache.sis.referencing.operation.projection.NormalizedProjecti
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.FailureDetailsReporter;
import org.apache.sis.test.TestUtilities;
-import org.opengis.test.referencing.TransformTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
index 6661e00b60..d6f10f15e9 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
@@ -30,11 +30,11 @@ import
org.apache.sis.referencing.operation.provider.MapProjection;
import org.apache.sis.referencing.operation.transform.CoordinateDomain;
import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.referencing.datum.GeodeticDatumMock;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.test.TestUtilities;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index b209235f3e..31fafbc4d3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -36,11 +36,11 @@ import static
org.apache.sis.referencing.operation.projection.ConformalProjectio
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.opengis.test.Assertions.assertBetween;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.apache.sis.referencing.operation.provider.MercatorSpherical;
import org.apache.sis.referencing.operation.provider.RegionalMercator;
+import static org.opengis.test.Assertions.assertBetween;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
index 3cf939180b..afb7898c97 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/CoordinateFrameRotationTest.java
@@ -21,11 +21,11 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.operation.transform.LinearTransform;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index dc78da3bf8..f647c473a6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@ -32,11 +32,11 @@ import
org.apache.sis.referencing.operation.transform.CoordinateDomain;
import
org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransform;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Arrays;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
index 98c6c0ad3c..c5c6e79bb6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeographicOffsetsTest.java
@@ -26,9 +26,9 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.FailureDetailsReporter;
import org.apache.sis.referencing.cs.HardCodedCS;
-import org.opengis.test.referencing.TransformTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
index adb4439b14..65a0dd7e4a 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/PositionVector7ParamTest.java
@@ -25,11 +25,11 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
index e0d6c5e211..a94e76cdf3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateSystemTransformTest.java
@@ -37,9 +37,9 @@ import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.FailureDetailsReporter;
import org.apache.sis.referencing.cs.HardCodedCS;
-import org.opengis.test.referencing.TransformTestCase;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
index 5bba742206..4c5fec2831 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
@@ -34,15 +34,15 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.io.TableAppender;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.FormattableObject;
-import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.opengis.test.Validators;
+import org.apache.sis.referencing.Assertions;
+import org.apache.sis.referencing.operation.matrix.MatrixTestCase;
import org.apache.sis.test.FailureDetailsReporter;
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.referencing.Assertions;
-import org.opengis.test.Validators;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.geometry.DirectPosition;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index 167f12ade6..c2c8bc7596 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@ -36,12 +36,12 @@ import org.apache.sis.math.Fraction;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.apache.sis.test.FailureDetailsReporter;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
+import org.apache.sis.test.FailureDetailsReporter;
+import static org.apache.sis.test.TestCase.STRICT;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.sis.test.TestCase.STRICT;
import org.opengis.test.Assertions;
import org.opengis.test.referencing.AffineTransformTest;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
index d57eff799c..3a6dce0731 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/CoordinateOperationTest.java
@@ -35,13 +35,13 @@ import org.apache.sis.referencing.crs.AbstractCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import org.apache.sis.geometry.DirectPosition2D;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
index 5efd013397..001d70f590 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java
@@ -30,11 +30,11 @@ import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreMock;
import org.apache.sis.storage.netcdf.base.Decoder;
-import org.apache.sis.storage.netcdf.base.TestCase;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.storage.netcdf.base.TestCase;
import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest;
import static org.apache.sis.test.TestUtilities.date;
diff --git
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index 3a396c4ffb..5bf3b2ffa8 100644
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@ -23,7 +23,6 @@ import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreMock;
import org.apache.sis.storage.netcdf.base.Decoder;
-import org.apache.sis.storage.netcdf.base.TestCase;
import org.apache.sis.storage.netcdf.ucar.DecoderWrapper;
import org.apache.sis.storage.netcdf.classic.ChannelDecoder;
import org.apache.sis.util.Version;
@@ -31,6 +30,7 @@ import org.apache.sis.util.Version;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.storage.netcdf.base.TestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.test.dataset.TestData;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
index ce849dbd0f..a317186d72 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
@@ -27,10 +27,10 @@ import java.time.OffsetTime;
import java.time.ZoneOffset;
import java.util.function.BiPredicate;
import org.apache.sis.metadata.sql.util.Dialect;
-import org.apache.sis.storage.sql.TestOnAllDatabases;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.storage.sql.TestOnAllDatabases;
import org.apache.sis.metadata.sql.TestDatabase;
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
index 6ce4819765..53632953da 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java
@@ -29,7 +29,7 @@ import
org.apache.sis.metadata.iso.citation.DefaultCitationDate;
import org.apache.sis.metadata.iso.constraint.DefaultLegalConstraints;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+// Specific to the geoapi-4.0 branch:
import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
index a146fc4eac..9027bd7ec4 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
@@ -32,8 +32,8 @@ import org.apache.sis.setup.OptionKey;
import org.apache.sis.util.ArraysExt;
// Test dependencies
-import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertMessageContains;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
index 1b59cb9ad2..ca085ed4d9 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
@@ -22,11 +22,11 @@ import java.io.InputStream;
import java.io.StringReader;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.metadata.iso.extent.DefaultExtentTest;
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
index 12b15e7f2b..87477edf7b 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
@@ -17,6 +17,8 @@
package org.apache.sis.test;
import java.io.PrintStream;
+
+// Test dependencies
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestCaseWithLogs.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestCaseWithLogs.java
index abe5ad37e9..8eda6d9ff0 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestCaseWithLogs.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestCaseWithLogs.java
@@ -17,6 +17,8 @@
package org.apache.sis.test;
import java.util.logging.Logger;
+
+// Test dependencies
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.api.parallel.ResourceLock;
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CacheTest.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CacheTest.java
index 6c8d631772..000701b72b 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CacheTest.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/CacheTest.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestUtilities;
-import static org.apache.sis.test.Assertions.assertMapEquals;
import org.apache.sis.test.Benchmark;
+import static org.apache.sis.test.Assertions.assertMapEquals;
/**
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/RangeSetTest.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/RangeSetTest.java
index 69e7c2b88c..02b45bd799 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/RangeSetTest.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/util/collection/RangeSetTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import static org.apache.sis.test.Assertions.assertSerializedEquals;
import org.apache.sis.test.Benchmark;
+import static org.apache.sis.test.Assertions.assertSerializedEquals;
/**
diff --git
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
index b9558b8796..4383bd3dbe 100644
---
a/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
+++
b/incubator/src/org.apache.sis.portrayal.map/test/org/apache/sis/map/SEPortrayerTest.java
@@ -66,8 +66,8 @@ import org.apache.sis.util.iso.Names;
// Test dependencies
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.TestInstance;
+import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
