This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 0de784f0e41bb369f761ebc5f0a99d080212ab95
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Oct 29 20:05:12 2023 +0100
Reorganize import statements with a better separation of test dependencies.
---
.../sis/coverage/grid/BandAggregateGridCoverageTest.java | 4 ++--
.../sis/coverage/grid/ConvertedGridCoverageTest.java | 6 +++---
.../sis/coverage/grid/DimensionalityReductionTest.java | 2 +-
.../org/apache/sis/coverage/grid/GridCoverage2DTest.java | 4 ++--
.../apache/sis/coverage/grid/GridCoverageBuilderTest.java | 2 +-
.../org/apache/sis/coverage/grid/GridDerivationTest.java | 8 ++++----
.../test/org/apache/sis/coverage/grid/GridExtentTest.java | 2 +-
.../org/apache/sis/coverage/grid/GridGeometryTest.java | 8 ++++----
.../sis/coverage/grid/ResampledGridCoverageTest.java | 8 ++++----
.../org/apache/sis/coverage/grid/ReshapedImageTest.java | 6 +++---
.../sis/coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../test/org/apache/sis/feature/EnvelopeOperationTest.java | 2 +-
.../test/org/apache/sis/feature/FeatureOperationsTest.java | 6 +++---
.../apache/sis/feature/builder/FeatureTypeBuilderTest.java | 8 ++++----
.../sis/feature/internal/AttributeConventionTest.java | 2 +-
.../org/apache/sis/filter/BinarySpatialFilterTestCase.java | 4 ++--
.../test/org/apache/sis/filter/sqlmm/RegistryTestCase.java | 4 ++--
.../test/org/apache/sis/filter/sqlmm/SQLMMTest.java | 2 +-
.../apache/sis/geometry/wrapper/GeometriesTestCase.java | 4 ++--
.../test/org/apache/sis/image/ResamplingGridTest.java | 4 ++--
.../test/org/apache/sis/metadata/MetadataCopierTest.java | 4 ++--
.../test/org/apache/sis/metadata/MetadataStandardTest.java | 6 +++---
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 14 +++++++-------
.../org/apache/sis/metadata/PropertyInformationTest.java | 2 +-
.../test/org/apache/sis/metadata/SpecialCasesTest.java | 6 +++---
.../apache/sis/metadata/sql/IdentifierGeneratorTest.java | 1 -
.../org/apache/sis/metadata/sql/MetadataWriterTest.java | 4 ++--
.../apache/sis/xml/bind/fra/DirectReferenceSystemTest.java | 4 ++--
.../test/org/apache/sis/geometry/AbstractEnvelopeTest.java | 6 +++---
.../test/org/apache/sis/geometry/ArrayEnvelopeTest.java | 4 ++--
.../test/org/apache/sis/geometry/CoordinateFormatTest.java | 6 +++---
.../test/org/apache/sis/geometry/Envelope2DTest.java | 2 +-
.../test/org/apache/sis/geometry/EnvelopesTest.java | 2 +-
.../org/apache/sis/geometry/GeneralDirectPositionTest.java | 2 +-
.../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 4 ++--
.../org/apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +-
.../test/org/apache/sis/geometry/SubEnvelopeTest.java | 2 +-
.../test/org/apache/sis/geometry/TransformTestCase.java | 8 ++++----
.../org/apache/sis/geometry/WraparoundAdjustmentTest.java | 4 ++--
.../org/apache/sis/referencing/AuthorityFactoriesTest.java | 4 ++--
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../apache/sis/referencing/GeodesicsOnEllipsoidTest.java | 2 +-
.../org/apache/sis/referencing/GeodeticCalculatorTest.java | 2 +-
.../org/apache/sis/referencing/IdentifiedObjectsTest.java | 2 +-
.../apache/sis/referencing/StandardDefinitionsTest.java | 10 +++++-----
.../org/apache/sis/referencing/crs/AbstractCRSTest.java | 4 ++--
.../apache/sis/referencing/crs/DefaultCompoundCRSTest.java | 4 ++--
.../apache/sis/referencing/crs/DefaultDerivedCRSTest.java | 4 ++--
.../sis/referencing/crs/DefaultEngineeringCRSTest.java | 2 +-
.../apache/sis/referencing/crs/DefaultImageCRSTest.java | 4 ++--
.../sis/referencing/crs/DefaultProjectedCRSTest.java | 2 +-
.../apache/sis/referencing/crs/DefaultTemporalCRSTest.java | 2 +-
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 4 +++-
.../org/apache/sis/referencing/crs/HardCodedCRSTest.java | 2 +-
.../sis/referencing/datum/DefaultTemporalDatumTest.java | 2 +-
.../org/apache/sis/referencing/datum/HardCodedDatum.java | 4 +++-
.../sis/referencing/factory/AuthorityFactoryMock.java | 2 ++
.../referencing/factory/MultiAuthoritiesFactoryTest.java | 6 +++---
.../sis/referencing/internal/ServicesForMetadataTest.java | 2 +-
.../operation/CoordinateOperationFinderTest.java | 4 ++--
.../operation/DefaultConcatenatedOperationTest.java | 4 ++--
.../sis/referencing/operation/DefaultConversionTest.java | 12 ++++++------
.../referencing/operation/DefaultTransformationTest.java | 8 ++++----
.../sis/referencing/operation/HardCodedConversions.java | 2 ++
.../operation/builder/LinearTransformBuilderTest.java | 6 +++---
.../sis/referencing/operation/builder/LinearizerTest.java | 4 ++--
.../operation/provider/GeographicOffsetsTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 4 ++--
.../operation/transform/CoordinateSystemTransformTest.java | 2 +-
.../transform/DefaultMathTransformFactoryTest.java | 8 ++++----
.../transform/InterpolatedGeocentricTransformTest.java | 2 +-
.../operation/transform/MathTransformFactoryBase.java | 2 ++
.../operation/transform/MolodenskyTransformTest.java | 4 ++--
.../operation/transform/TransformSeparatorTest.java | 6 +++---
.../operation/transform/WraparoundTransformTest.java | 2 +-
.../org/apache/sis/referencing/util/AxesMapperTest.java | 2 +-
.../apache/sis/referencing/util/AxisDirectionsTest.java | 4 ++--
.../sis/referencing/util/CoordinateOperationsTest.java | 10 +++++-----
.../sis/referencing/util/DefinitionVerifierTest.java | 10 +++++-----
.../referencing/util/EllipsoidalHeightCombinerTest.java | 8 ++++----
.../test/org/apache/sis/referencing/util/FormulasTest.java | 2 +-
.../sis/referencing/util/ReferencingUtilitiesTest.java | 4 ++--
.../org/apache/sis/referencing/util/WKTUtilitiesTest.java | 4 ++--
.../sis/referencing/util/WraparoundApplicatorTest.java | 3 +--
.../test/org/apache/sis/storage/geotiff/WriterTest.java | 13 ++++++-------
.../apache/sis/storage/sql/feature/GeometryGetterTest.java | 2 +-
.../sis/storage/sql/feature/SelectionClauseWriterTest.java | 2 +-
.../sis/storage/sql/feature/TemporalValueGetterTest.java | 4 ++--
.../org/apache/sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../test/org/apache/sis/storage/CoverageQueryTest.java | 2 +-
.../test/org/apache/sis/storage/CoverageSubsetTest.java | 2 +-
.../storage/aggregate/BandAggregateGridResourceTest.java | 2 +-
.../apache/sis/storage/base/MemoryGridResourceTest.java | 2 +-
.../org/apache/sis/storage/esri/BSQConsistencyTest.java | 2 +-
.../org/apache/sis/storage/esri/WritableStoreTest.java | 2 +-
.../org/apache/sis/gui/coverage/CoverageCanvasApp.java | 4 +++-
.../test/org/apache/sis/gui/coverage/GridViewApp.java | 4 +++-
97 files changed, 207 insertions(+), 196 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/BandAggregateGridCoverageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/BandAggregateGridCoverageTest.java
index 85b0148e11..8ace4996bd 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/BandAggregateGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/BandAggregateGridCoverageTest.java
@@ -21,12 +21,12 @@ import java.awt.image.Raster;
import java.awt.image.DataBufferInt;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
index cc4e8015d3..6bdf6815e4 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ConvertedGridCoverageTest.java
@@ -27,17 +27,17 @@ import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
-import static org.apache.sis.image.PlanarImage.SAMPLE_DIMENSIONS_KEY;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
-import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.test.TestUtilities.getSingleton;
+import static org.apache.sis.feature.Assertions.assertValuesEqual;
+import static org.apache.sis.image.PlanarImage.SAMPLE_DIMENSIONS_KEY;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
index eae54d9dfd..8f793cd342 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DimensionalityReductionTest.java
@@ -26,13 +26,13 @@ import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
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 24b8711c4a..a6bfd3d018 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
@@ -34,14 +34,14 @@ import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.coverage.grid.j2d.RasterFactory;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
index 8011331577..a2d43d1c01 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverageBuilderTest.java
@@ -28,12 +28,12 @@ import org.opengis.referencing.operation.Matrix;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
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 575348fb00..2da59a8dd0 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
@@ -35,8 +35,6 @@ import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.crs.DefaultCompoundCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
@@ -44,9 +42,11 @@ import
org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertBetween;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
index 73bb856b28..b242a4dd9f 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -32,13 +32,13 @@ import
org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.Matrix3;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.internal.Numerics;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertMapEquals;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
index 7f5d995972..d0e3d4d072 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridGeometryTest.java
@@ -24,21 +24,21 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.apache.sis.referencing.operation.HardCodedConversions;
+import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
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 0e5b7dfca7..ed1d34cbe1 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
@@ -36,14 +36,11 @@ import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.image.Interpolation;
-import org.apache.sis.image.TiledImageMock;
import org.apache.sis.coverage.grid.j2d.TiledImage;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
@@ -51,10 +48,13 @@ import
org.apache.sis.referencing.operation.transform.TransformSeparator;
// Test dependencies
import org.junit.Test;
+import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.TestCase;
+import org.apache.sis.image.TiledImageMock;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.opengis.referencing.datum.PixelInCell.CELL_CENTER;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ReshapedImageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ReshapedImageTest.java
index ac10068950..774da3f64f 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ReshapedImageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/ReshapedImageTest.java
@@ -19,13 +19,13 @@ package org.apache.sis.coverage.grid;
import java.util.Random;
import java.awt.image.DataBuffer;
import java.awt.image.BufferedImage;
-import org.apache.sis.image.TiledImageMock;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.image.TiledImageMock;
import static org.junit.Assert.*;
import static org.apache.sis.feature.Assertions.assertValuesEqual;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
index 99770b7994..75681bba1b 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/TranslatedGridCoverageTest.java
@@ -22,12 +22,12 @@ import java.awt.image.WritableRaster;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.coverage.grid.j2d.RasterFactory;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.geometry.DirectPosition2D;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
index 462e49ed1e..5e48417930 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/EnvelopeOperationTest.java
@@ -22,7 +22,6 @@ import com.esri.core.geometry.Geometry;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.feature.internal.AttributeConvention;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.feature.builder.AttributeRole;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
@@ -33,6 +32,7 @@ import org.apache.sis.geometry.wrapper.GeometryWrapper;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
index 35ad8431ba..8fcd072481 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureOperationsTest.java
@@ -24,14 +24,14 @@ import org.opengis.geometry.Envelope;
import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.feature.internal.AttributeConvention;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.geometry.GeneralEnvelope;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
index feb123cd64..42c41dfc0a 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/builder/FeatureTypeBuilderTest.java
@@ -25,14 +25,14 @@ import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.FeatureOperations;
import org.apache.sis.feature.DefaultFeatureTypeTest;
import org.apache.sis.feature.internal.AttributeConvention;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
index 507fd05b3e..2329584004 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/AttributeConventionTest.java
@@ -19,7 +19,6 @@ package org.apache.sis.feature.internal;
import java.util.Map;
import com.esri.core.geometry.Point;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.FeatureOperations;
@@ -28,6 +27,7 @@ import org.apache.sis.util.iso.Names;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
index e6728c6573..3decf77b3f 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/BinarySpatialFilterTestCase.java
@@ -31,12 +31,12 @@ import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.math.Vector;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.operation.HardCodedConversions;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
index 8f52cfbb3e..e97dc2100d 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/RegistryTestCase.java
@@ -31,14 +31,14 @@ import org.apache.sis.filter.internal.Node;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.math.Vector;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.junit.Rule;
import org.junit.After;
-import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.LoggingWatcher;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
index 086485b048..70903a66b5 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/sqlmm/SQLMMTest.java
@@ -23,12 +23,12 @@ import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometry.wrapper.jts.JTS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.filter.DefaultFilterFactory;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/GeometriesTestCase.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/GeometriesTestCase.java
index 28c9f87ace..b97183c29f 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/GeometriesTestCase.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/GeometriesTestCase.java
@@ -24,13 +24,13 @@ import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.WraparoundMethod;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.math.Vector;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static java.lang.Double.NaN;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
index 1ed44c1360..64fb5def67 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
@@ -25,7 +25,6 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransform2D;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometry.Shapes2D;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
import org.apache.sis.util.internal.Numerics;
@@ -34,8 +33,9 @@ import org.apache.sis.math.StatisticsFormat;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
index a8b4c3b739..20206987e3 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataCopierTest.java
@@ -25,13 +25,13 @@ import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.extent.GeographicExtent;
import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.extent.DefaultGeographicDescription;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
index 763014634d..bb4ae04b5c 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/MetadataStandardTest.java
@@ -25,7 +25,6 @@ import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.crs.GeographicCRS;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.acquisition.DefaultPlatform;
import org.apache.sis.metadata.iso.acquisition.DefaultInstrument;
import org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation;
@@ -36,9 +35,10 @@ import org.apache.sis.util.ComparisonMode;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 0b0d1e26ec..673573e6df 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -47,23 +47,23 @@ import org.opengis.util.GenericName;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.content.DefaultCoverageDescription;
import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-import static org.apache.sis.metadata.PropertyAccessor.APPEND;
-import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
-import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
-import static org.apache.sis.metadata.Assertions.assertTitleEquals;
import static org.apache.sis.test.TestUtilities.getSingleton;
+import static org.apache.sis.metadata.Assertions.assertTitleEquals;
+import static org.apache.sis.metadata.PropertyAccessor.APPEND;
+import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
+import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
index 1b28503963..5ff3fe554a 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyInformationTest.java
@@ -25,7 +25,6 @@ import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.citation.PresentationForm;
import org.opengis.metadata.acquisition.EnvironmentalRecord;
import org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.measure.ValueRange;
import org.apache.sis.measure.Range;
@@ -34,6 +33,7 @@ import org.apache.sis.measure.Range;
import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/SpecialCasesTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/SpecialCasesTest.java
index b682f1ebc6..f38dde7712 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/SpecialCasesTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/SpecialCasesTest.java
@@ -22,14 +22,14 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.NumberRange;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
index 80d4c366a1..7df66fbebf 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/IdentifierGeneratorTest.java
@@ -24,7 +24,6 @@ import org.apache.sis.metadata.sql.util.SQLBuilder;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
-import org.apache.sis.metadata.sql.TestDatabase;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 2ec6e55817..d919909ab5 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -24,14 +24,14 @@ import org.opengis.metadata.citation.OnlineResource;
import org.opengis.metadata.citation.Role;
import org.opengis.metadata.citation.Telephone;
import org.apache.sis.metadata.MetadataStandard;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.metadata.iso.citation.DefaultTelephone;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
index 2896465bb3..56b45ca633 100644
---
a/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.profile.france/test/org/apache/sis/xml/bind/fra/DirectReferenceSystemTest.java
@@ -23,13 +23,13 @@ import jakarta.xml.bind.JAXBException;
import org.apache.sis.metadata.iso.DefaultMetadata;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.util.ComparisonMode;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.test.TestUtilities;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
index 00bd5f705f..4b14655648 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/AbstractEnvelopeTest.java
@@ -22,16 +22,16 @@ import org.opengis.geometry.DirectPosition;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
import static java.lang.Double.NaN;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.referencing.Assertions.assertContains;
import static org.apache.sis.referencing.Assertions.assertDisjoint;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ArrayEnvelopeTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ArrayEnvelopeTest.java
index a56182872d..77202b97df 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ArrayEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ArrayEnvelopeTest.java
@@ -20,12 +20,12 @@ import org.apache.sis.io.wkt.Formatter;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/CoordinateFormatTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/CoordinateFormatTest.java
index ca7a94cefc..6ffa4a9c1f 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/CoordinateFormatTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/CoordinateFormatTest.java
@@ -26,14 +26,14 @@ import org.opengis.geometry.DirectPosition;
import org.apache.sis.measure.Angle;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.operation.HardCodedConversions;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.mock.VerticalCRSMock;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/Envelope2DTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/Envelope2DTest.java
index 689fb69516..6e7d6d47c6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/Envelope2DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/Envelope2DTest.java
@@ -24,10 +24,10 @@ import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/EnvelopesTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/EnvelopesTest.java
index 9590c61f92..8152074258 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/EnvelopesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/EnvelopesTest.java
@@ -33,7 +33,6 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.measure.Range;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.crs.DefaultCompoundCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.transform.MathTransforms;
@@ -45,6 +44,7 @@ import org.apache.sis.referencing.util.j2d.AffineTransform2D;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralDirectPositionTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralDirectPositionTest.java
index 298e146745..c931097058 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralDirectPositionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/GeneralDirectPositionTest.java
@@ -24,10 +24,10 @@ import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/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 9d9fcf0575..ea8cd7136d 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
@@ -22,13 +22,13 @@ import org.opengis.geometry.DirectPosition;
import org.apache.sis.measure.Range;
import org.apache.sis.metadata.internal.AxisNames;
import org.apache.sis.math.MathFunctions;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static java.lang.Double.NaN;
import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ImmutableEnvelopeTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ImmutableEnvelopeTest.java
index acb622d65f..1105dc8256 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ImmutableEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/ImmutableEnvelopeTest.java
@@ -21,10 +21,10 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/SubEnvelopeTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/SubEnvelopeTest.java
index 026dcdd5a0..254756cdc0 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/SubEnvelopeTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/SubEnvelopeTest.java
@@ -21,9 +21,9 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import static java.lang.Double.NaN;
-import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
import static org.junit.Assert.*;
import static org.opengis.test.Validators.validate;
+import static org.apache.sis.referencing.crs.HardCodedCRS.WGS84;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/TransformTestCase.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/TransformTestCase.java
index 1b2df3eaf8..96917fac38 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/TransformTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/TransformTestCase.java
@@ -30,14 +30,14 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.referencing.operation.DefaultConversion;
-import org.apache.sis.referencing.operation.HardCodedConversions;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.apache.sis.referencing.util.Formulas.ANGULAR_TOLERANCE;
import static org.apache.sis.referencing.util.Formulas.LINEAR_TOLERANCE;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/WraparoundAdjustmentTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/WraparoundAdjustmentTest.java
index 188bcf3df4..ece9492490 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/WraparoundAdjustmentTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/WraparoundAdjustmentTest.java
@@ -21,13 +21,13 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.util.Formulas;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
index a9d06c246f..c4edf2f43c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
@@ -28,7 +28,6 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.system.Loggers;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.referencing.internal.EPSGFactoryProxy;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.factory.CommonAuthorityFactory;
import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
@@ -37,9 +36,10 @@ import
org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.LoggingWatcher;
-import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertNotDeepEquals;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
index 05c2908afb..ac1d4a4bfc 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
@@ -31,14 +31,11 @@ import org.opengis.referencing.crs.SingleCRS;
import org.opengis.referencing.cs.CartesianCS;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
import org.apache.sis.system.Loggers;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
-import org.apache.sis.referencing.operation.HardCodedConversions;
-import org.apache.sis.referencing.cs.HardCodedCS;
// Test dependencies
import org.junit.After;
@@ -48,6 +45,9 @@ import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
index 5b6a400610..87c3356342 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodesicsOnEllipsoidTest.java
@@ -23,7 +23,6 @@ import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.GeographicCRS;
import org.apache.sis.referencing.util.ReferencingUtilities;
import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.measure.Units;
@@ -31,6 +30,7 @@ import org.apache.sis.measure.Units;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static java.lang.StrictMath.*;
import static
org.apache.sis.metadata.internal.ReferencingServices.NAUTICAL_MILE;
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 b2818f21f8..305ff0d842 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
@@ -32,7 +32,6 @@ import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.referencing.util.j2d.ShapeUtilitiesExt;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.geometry.DirectPosition2D;
import org.apache.sis.util.CharSequences;
import org.apache.sis.math.StatisticsFormat;
@@ -46,6 +45,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.widget.VisualCheck;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static java.lang.StrictMath.*;
import static
org.apache.sis.metadata.internal.ReferencingServices.AUTHALIC_RADIUS;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/IdentifiedObjectsTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/IdentifiedObjectsTest.java
index 991893ad34..06ab2e1ae0 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/IdentifiedObjectsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/IdentifiedObjectsTest.java
@@ -22,12 +22,12 @@ import org.opengis.util.FactoryException;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.IdentifiedObject;
import org.apache.sis.util.iso.DefaultNameFactory;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.mock.IdentifiedObjectMock;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.referencing.IdentifiedObjects.*;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
index 32ae71397a..3c16e0977c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
@@ -32,11 +32,6 @@ import org.opengis.referencing.datum.VerticalDatum;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.datum.GeodeticDatumMock;
-import org.apache.sis.referencing.datum.HardCodedDatum;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.cs.HardCodedAxes;
-import org.apache.sis.referencing.cs.HardCodedCS;
// Test dependencies
import org.junit.Test;
@@ -44,6 +39,11 @@ import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.datum.GeodeticDatumMock;
+import org.apache.sis.referencing.datum.HardCodedDatum;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.cs.HardCodedAxes;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/AbstractCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/AbstractCRSTest.java
index 742af4749d..d21a9758a1 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/AbstractCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/AbstractCRSTest.java
@@ -18,10 +18,10 @@ package org.apache.sis.referencing.crs;
import java.util.Map;
import org.apache.sis.referencing.cs.AbstractCS;
-import org.apache.sis.referencing.cs.HardCodedAxes;
-import org.apache.sis.referencing.cs.AxesConvention;
// Test dependencies
+import org.apache.sis.referencing.cs.HardCodedAxes;
+import org.apache.sis.referencing.cs.AxesConvention;
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
index ce3dd40e8e..419431f5e6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultCompoundCRSTest.java
@@ -28,7 +28,6 @@ import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.cs.DefaultCompoundCS;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.io.wkt.Convention;
// Test dependencies
@@ -37,10 +36,11 @@ import org.opengis.test.Validators;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedAxes;
-import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
+import static org.opengis.referencing.crs.CompoundCRS.NAME_KEY;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
index d5726cf514..0f006258a6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultDerivedCRSTest.java
@@ -30,15 +30,15 @@ import
org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.operation.DefaultConversionTest;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
import org.opengis.test.Validators;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
index ea569a7d3e..07adcb9d6d 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultEngineeringCRSTest.java
@@ -22,7 +22,6 @@ import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.SphericalCS;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.AxisDirection;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.DefaultEngineeringDatum;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.xml.Namespaces;
@@ -30,6 +29,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
index 961fda233d..c1107a81f0 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultImageCRSTest.java
@@ -23,9 +23,7 @@ import org.opengis.referencing.cs.AffineCS;
import org.opengis.referencing.cs.CartesianCS;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.datum.PixelInCell;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.cs.DefaultAffineCS;
-import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.referencing.datum.DefaultImageDatum;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.xml.Namespaces;
@@ -33,6 +31,8 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.cs.HardCodedAxes;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index 91d3a74064..9b5a772914 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -26,7 +26,6 @@ import org.opengis.referencing.operation.Projection;
import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
import org.apache.sis.referencing.util.GeodeticObjectBuilder;
import org.apache.sis.util.ComparisonMode;
@@ -45,6 +44,7 @@ import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
index 909c8c6c8f..ce514d1e33 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
@@ -21,12 +21,12 @@ import java.time.Instant;
import java.util.Date;
import java.util.Map;
import org.apache.sis.referencing.datum.DefaultTemporalDatum;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.io.wkt.Convention;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
import static
org.apache.sis.util.internal.StandardDateFormat.NANOS_PER_MILLISECOND;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index 7d3d297d89..86078a23a0 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@ -20,10 +20,12 @@ import java.util.Map;
import java.util.HashMap;
import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.referencing.NamedIdentifier;
+import org.apache.sis.metadata.iso.extent.Extents;
+
+// Test dependencies
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.datum.GeodeticDatumMock;
-import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.opengis.referencing.IdentifiedObject.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRSTest.java
index 2099a9d61a..42755f1c3b 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRSTest.java
@@ -22,9 +22,9 @@ import org.opengis.test.ValidatorContainer;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
-import static org.apache.sis.referencing.crs.HardCodedCRS.*;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+import static org.apache.sis.referencing.crs.HardCodedCRS.*;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index 9f0f5ed643..6416df785c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -23,11 +23,11 @@ import java.io.InputStream;
import jakarta.xml.bind.JAXBException;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.referencing.ImmutableIdentifier;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
// Test dependencies
import org.junit.Test;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index 051476ae08..ef785ad6ab 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
@@ -23,9 +23,11 @@ import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.datum.VerticalDatumType;
import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.referencing.internal.VerticalDatumTypes;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import org.apache.sis.measure.Units;
+// Test dependencies
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+
import static org.opengis.referencing.datum.Datum.*;
import static
org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
index dd2b4cf389..c0b810d998 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/AuthorityFactoryMock.java
@@ -39,6 +39,8 @@ import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.metadata.simple.SimpleCitation;
import org.apache.sis.measure.Units;
import org.apache.sis.metadata.iso.extent.Extents;
+
+// Test dependencies
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.cs.HardCodedCS;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
index 019ab6b3dc..7af0fc5780 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
@@ -36,9 +36,6 @@ import org.opengis.referencing.datum.VerticalDatum;
import org.opengis.util.FactoryException;
import org.apache.sis.system.Loggers;
import org.apache.sis.metadata.iso.extent.Extents;
-import org.apache.sis.referencing.cs.HardCodedCS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.measure.Units;
// Test dependencies
@@ -49,6 +46,9 @@ import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/ServicesForMetadataTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/ServicesForMetadataTest.java
index e3ec786e0d..bbe098da17 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/ServicesForMetadataTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/internal/ServicesForMetadataTest.java
@@ -28,7 +28,6 @@ import
org.apache.sis.metadata.iso.extent.DefaultTemporalExtent;
import org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
@@ -36,6 +35,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
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 b09c8f838e..5ab38ef994 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
@@ -47,12 +47,10 @@ 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;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.DefaultEngineeringDatum;
import org.apache.sis.referencing.crs.DefaultEngineeringCRS;
import org.apache.sis.referencing.crs.DefaultCompoundCRS;
import org.apache.sis.referencing.crs.DefaultDerivedCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.measure.Units;
@@ -63,6 +61,8 @@ import org.junit.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.referencing.util.Formulas.LINEAR_TOLERANCE;
import static org.apache.sis.referencing.util.Formulas.ANGULAR_TOLERANCE;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
index 91b86a8554..c5cd0b005c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConcatenatedOperationTest.java
@@ -27,8 +27,6 @@ import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.NoninvertibleTransformException;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import
org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransform;
-import org.apache.sis.referencing.datum.HardCodedDatum;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.io.wkt.Convention;
// Test dependencies
@@ -36,6 +34,8 @@ import org.junit.Test;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
+import org.apache.sis.referencing.datum.HardCodedDatum;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 743993c682..386a3d8c21 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@ -32,10 +32,7 @@ import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.util.CoordinateOperations;
import org.apache.sis.referencing.util.ReferencingUtilities;
-import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
-import org.apache.sis.referencing.cs.HardCodedCS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
@@ -44,10 +41,13 @@ import
org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.parameter.DefaultParameterDescriptorTest;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.datum.HardCodedDatum;
+import org.apache.sis.parameter.DefaultParameterDescriptorTest;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultTransformationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultTransformationTest.java
index 6cc94df502..2654547e21 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultTransformationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultTransformationTest.java
@@ -25,7 +25,6 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.util.CoordinateOperations;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.crs.DefaultGeocentricCRS;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.operation.matrix.Matrix4;
@@ -34,10 +33,11 @@ import org.apache.sis.io.wkt.Convention;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.parameter.DefaultParameterDescriptorTest;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.parameter.DefaultParameterDescriptorTest;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/HardCodedConversions.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/HardCodedConversions.java
index c7beb837d9..f7720d31a2 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/HardCodedConversions.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/HardCodedConversions.java
@@ -29,6 +29,8 @@ import
org.apache.sis.referencing.operation.provider.LambertConformal2SP;
import org.apache.sis.referencing.operation.provider.PolarStereographicB;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
+
+// Test dependencies
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.cs.HardCodedCS;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
index 7564538262..1ea35993f5 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/builder/LinearTransformBuilderTest.java
@@ -24,7 +24,6 @@ import org.opengis.util.FactoryException;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.geometry.DirectPosition1D;
@@ -32,9 +31,10 @@ import org.apache.sis.geometry.DirectPosition2D;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.TestUtilities;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertMapEquals;
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 9aed1bfdf2..23cd0fe6db 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
@@ -19,15 +19,15 @@ package org.apache.sis.referencing.operation.builder;
import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.operation.HardCodedConversions;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.geometry.Envelope2D;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
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 0ea2de95cd..97880fe07d 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
@@ -22,12 +22,12 @@ import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.util.Formulas;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.cs.HardCodedCS;
// Test dependencies
import org.junit.Test;
import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.cs.HardCodedCS;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
index fb28608514..b2582d42b9 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/AbridgedMolodenskyTransformTest.java
@@ -19,13 +19,13 @@ package org.apache.sis.referencing.operation.transform;
import org.opengis.util.FactoryException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.util.Formulas;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static java.lang.StrictMath.toRadians;
import static org.junit.Assert.*;
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 00288da0ad..fae46522d8 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
@@ -26,7 +26,6 @@ import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.crs.DefaultGeocentricCRS;
import org.apache.sis.referencing.cs.CoordinateSystems;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.measure.Units;
import org.apache.sis.util.ArraysExt;
@@ -36,6 +35,7 @@ import org.junit.AfterClass;
import org.junit.Test;
import org.opengis.test.referencing.TransformTestCase;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index 946dec07a2..cd3b783fce 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@ -35,19 +35,19 @@ import
org.apache.sis.referencing.operation.DefaultConversion;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.crs.DefaultProjectedCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
import org.apache.sis.referencing.operation.provider.Affine;
import org.apache.sis.referencing.operation.provider.Mercator1SP;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.cs.HardCodedCS;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
index 6b2300e704..afd5572cb6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransformTest.java
@@ -25,12 +25,12 @@ import org.apache.sis.referencing.CommonCRS;
import
org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolation;
import
org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolationTest;
import org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
-import org.apache.sis.referencing.datum.HardCodedDatum;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.datum.HardCodedDatum;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
index 2fdc5fcdaf..e1375f00ba 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
@@ -28,6 +28,8 @@ import org.opengis.referencing.operation.OperationMethod;
import org.opengis.referencing.operation.SingleOperation;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransformFactory;
+
+// Test dependencies
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index 2df618572a..9debc27ed3 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@ -28,13 +28,13 @@ import
org.apache.sis.referencing.operation.provider.Molodensky;
import
org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolationTest;
import org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.referencing.datum.HardCodedDatum;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestUtilities;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static java.lang.StrictMath.*;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
index 745548c04e..b624d12e89 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformSeparatorTest.java
@@ -24,7 +24,6 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.referencing.operation.matrix.Matrix2;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
@@ -33,10 +32,11 @@ import org.apache.sis.geometry.GeneralDirectPosition;
// Test dependencies
import org.junit.Test;
+import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
-import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static java.lang.Double.NaN;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
index 029e118e6a..04636c556b 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java
@@ -26,11 +26,11 @@ import
org.apache.sis.referencing.operation.AbstractCoordinateOperation;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxesMapperTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxesMapperTest.java
index 06a20889ea..8edef03d9e 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxesMapperTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxesMapperTest.java
@@ -17,11 +17,11 @@
package org.apache.sis.referencing.util;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.cs.HardCodedCS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxisDirectionsTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxisDirectionsTest.java
index 9a62146af3..d890d74157 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxisDirectionsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/AxisDirectionsTest.java
@@ -21,11 +21,11 @@ import javax.measure.Unit;
import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
+
+// Test dependencies
import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.measure.Units;
-
-// Test dependencies
import org.junit.Test;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/CoordinateOperationsTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/CoordinateOperationsTest.java
index f00be0e41d..0df324d780 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/CoordinateOperationsTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/CoordinateOperationsTest.java
@@ -21,15 +21,15 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.cs.CoordinateSystem;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.referencing.cs.HardCodedAxes;
-import org.apache.sis.referencing.cs.HardCodedCS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.operation.HardCodedConversions;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.cs.HardCodedAxes;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.operation.HardCodedConversions;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/DefinitionVerifierTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/DefinitionVerifierTest.java
index 17c6f6b886..e30fba5191 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/DefinitionVerifierTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/DefinitionVerifierTest.java
@@ -23,15 +23,15 @@ import java.util.logging.SimpleFormatter;
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.NamedIdentifier;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.referencing.crs.DefaultGeographicCRS;
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.crs.DefaultGeographicCRS;
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/EllipsoidalHeightCombinerTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/EllipsoidalHeightCombinerTest.java
index aa6d64e6c0..a47a7f8ccc 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/EllipsoidalHeightCombinerTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/EllipsoidalHeightCombinerTest.java
@@ -26,8 +26,6 @@ import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.referencing.crs.TemporalCRS;
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.referencing.cs.HardCodedCS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import org.apache.sis.referencing.operation.HardCodedConversions;
@@ -35,9 +33,11 @@ import org.apache.sis.metadata.iso.extent.Extents;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.test.DependsOnMethod;
+import org.apache.sis.referencing.cs.HardCodedCS;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/FormulasTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/FormulasTest.java
index 1dc6bec566..2872598b79 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/FormulasTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/FormulasTest.java
@@ -22,11 +22,11 @@ import org.apache.sis.metadata.internal.ReferencingServices;
import org.apache.sis.measure.Longitude;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.datum.DefaultEllipsoid;
-import org.apache.sis.referencing.datum.HardCodedDatum;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/ReferencingUtilitiesTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/ReferencingUtilitiesTest.java
index 00f8f89277..2682caadd0 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/ReferencingUtilitiesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/ReferencingUtilitiesTest.java
@@ -23,14 +23,14 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.crs.GeographicCRS;
import org.opengis.referencing.datum.PrimeMeridian;
import org.opengis.referencing.datum.VerticalDatum;
-import org.apache.sis.referencing.datum.HardCodedDatum;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.Utilities;
import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
+import org.apache.sis.referencing.datum.HardCodedDatum;
import static org.apache.sis.referencing.util.ReferencingUtilities.*;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WKTUtilitiesTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WKTUtilitiesTest.java
index 0e445b8a65..c3c303496c 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WKTUtilitiesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WKTUtilitiesTest.java
@@ -18,13 +18,13 @@ package org.apache.sis.referencing.util;
import java.util.function.Function;
import org.opengis.referencing.cs.*;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.math.Vector;
// Test dependencies
import org.junit.Test;
-import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
+import org.apache.sis.test.DependsOn;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.referencing.util.WKTUtilities.*;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WraparoundApplicatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WraparoundApplicatorTest.java
index 009ad7783d..d7f8ffbe30 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WraparoundApplicatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/util/WraparoundApplicatorTest.java
@@ -16,11 +16,10 @@
*/
package org.apache.sis.referencing.util;
-import org.apache.sis.referencing.cs.HardCodedCS;
-
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.cs.HardCodedCS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
index 8e1622fa13..6995521cc0 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java
@@ -44,16 +44,15 @@ import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.image.DataType;
-import static javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
-
// Test dependencies
-import org.apache.sis.referencing.operation.HardCodedConversions;
-import org.apache.sis.referencing.crs.HardCodedCRS;
-import org.apache.sis.image.TiledImageMock;
-import org.apache.sis.test.TestUtilities;
-import org.apache.sis.test.TestCase;
import org.junit.Test;
+import org.apache.sis.test.TestCase;
+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 javax.imageio.plugins.tiff.BaselineTIFFTagSet.*;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
index 7822805742..3f0c64e97d 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
@@ -29,12 +29,12 @@ import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.geometry.wrapper.GeometryWithCRS;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.setup.GeometryLibrary;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
index d6a2a1738a..1c9aea3527 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
@@ -25,12 +25,12 @@ import org.apache.sis.feature.builder.AttributeTypeBuilder;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.filter.Optimization;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
import org.apache.sis.metadata.sql.TestDatabase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
index 157931f3f8..5f0865d766 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
@@ -26,11 +26,11 @@ import java.time.OffsetDateTime;
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 org.apache.sis.metadata.sql.TestDatabase;
+import org.apache.sis.metadata.sql.util.Dialect;
+import org.apache.sis.storage.sql.TestOnAllDatabases;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
index 980f661eeb..280b58573a 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
@@ -47,7 +47,6 @@ import org.apache.sis.storage.sql.feature.BinaryEncoding;
import org.apache.sis.storage.sql.feature.GeometryGetterTest;
import org.apache.sis.geometry.wrapper.jts.JTS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.util.Version;
// Test dependencies
@@ -55,6 +54,7 @@ import org.junit.Test;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.metadata.sql.TestDatabase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageQueryTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageQueryTest.java
index de33b57e81..eb86a46439 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageQueryTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageQueryTest.java
@@ -23,11 +23,11 @@ import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageSubsetTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageSubsetTest.java
index 76667a2e9e..cb4b7b15c9 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageSubsetTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/CoverageSubsetTest.java
@@ -30,11 +30,11 @@ import org.apache.sis.coverage.grid.GridOrientation;
import org.apache.sis.geometry.ImmutableEnvelope;
import org.apache.sis.storage.base.MemoryGridResource;
import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/BandAggregateGridResourceTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/BandAggregateGridResourceTest.java
index 35f59a0335..c43cddff14 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/BandAggregateGridResourceTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/aggregate/BandAggregateGridResourceTest.java
@@ -34,11 +34,11 @@ import org.apache.sis.coverage.grid.GridCoverageProcessor;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.GridCoverageResource;
import org.apache.sis.storage.base.MemoryGridResource;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MemoryGridResourceTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MemoryGridResourceTest.java
index 61a9a207b4..a51ec6d436 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MemoryGridResourceTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MemoryGridResourceTest.java
@@ -24,11 +24,11 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridCoverage2D;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.opengis.test.Assert.assertInstanceOf;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
index b23a4969cc..0cede8b568 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
@@ -22,9 +22,9 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
// Test dependencies
+import org.apache.sis.storage.test.CoverageReadConsistency;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.apache.sis.storage.test.CoverageReadConsistency;
import static org.junit.Assert.assertNotNull;
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
index 7dac34e7ce..8c2a0c58ef 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
@@ -33,11 +33,11 @@ import
org.apache.sis.storage.ResourceAlreadyExistsException;
import org.apache.sis.geometry.Envelope2D;
import org.apache.sis.setup.OptionKey;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.referencing.crs.HardCodedCRS;
// Test dependencies
import org.junit.Test;
import org.apache.sis.test.TestCase;
+import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.junit.Assert.*;
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
index daa7221ecd..87012d0fe2 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/CoverageCanvasApp.java
@@ -27,12 +27,14 @@ import org.opengis.referencing.datum.PixelInCell;
import org.apache.sis.coverage.grid.GridCoverage2D;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.gui.map.StatusBar;
-import org.apache.sis.image.TiledImageMock;
import org.apache.sis.image.WritablePixelIterator;
import org.apache.sis.gui.internal.BackgroundThreads;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
+// Test dependencies
+import org.apache.sis.image.TiledImageMock;
+
/**
* Shows {@link CoverageCanvas} with random data. The image will have small
tiles of size
diff --git
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
index fe826421bf..f7495c58ea 100644
---
a/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
+++
b/optional/src/org.apache.sis.gui/test/org/apache/sis/gui/coverage/GridViewApp.java
@@ -22,9 +22,11 @@ import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.layout.BorderPane;
import javafx.stage.Stage;
-import org.apache.sis.image.TiledImageMock;
import org.apache.sis.gui.internal.BackgroundThreads;
+// Test dependencies
+import org.apache.sis.image.TiledImageMock;
+
/**
* Shows {@link GridView} with random data. The image will have small tiles of
size
