This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new e2028b13c9 Post-merge automatic reorganization of imports order.
e2028b13c9 is described below
commit e2028b13c92a8e32c4892a3affd3b7f291fbfb8e
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Oct 11 17:01:26 2025 +0200
Post-merge automatic reorganization of imports order.
---
.../apache/sis/coverage/grid/DimensionalityReductionTest.java | 2 --
.../test/org/apache/sis/metadata/iso/DefaultMetadataTest.java | 2 +-
.../test/org/apache/sis/metadata/sql/MetadataSourceTest.java | 2 +-
.../test/org/apache/sis/metadata/sql/MetadataWriterTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 2 +-
.../org/apache/sis/referencing/crs/DefaultEngineeringCRS.java | 2 +-
.../org/apache/sis/referencing/legacy/DefaultImageDatum.java | 8 +++++---
.../apache/sis/referencing/legacy/DefaultUserDefinedCS.java | 2 +-
.../test/org/apache/sis/geometry/AbstractEnvelopeTest.java | 2 +-
.../test/org/apache/sis/geometry/CoordinateFormatTest.java | 2 +-
.../org/apache/sis/geometry/GeneralDirectPositionTest.java | 2 +-
.../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 2 +-
.../test/org/apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +-
.../test/org/apache/sis/geometry/TransformTestCase.java | 2 +-
.../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 6 +++---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +-
.../org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java | 2 +-
.../apache/sis/referencing/crs/DefaultGeographicCRSTest.java | 2 +-
.../referencing/operation/CoordinateOperationFinderTest.java | 2 +-
.../referencing/operation/DefaultPassThroughOperationTest.java | 4 +++-
.../referencing/operation/transform/ScaleTransformTest.java | 2 +-
.../operation/transform/TranslationTransformTest.java | 2 ++
.../org/apache/sis/test/integration/MetadataVerticalTest.java | 2 +-
.../test/org/apache/sis/storage/esri/AsciiGridStoreTest.java | 2 +-
.../test/org/apache/sis/storage/image/WorldFileStoreTest.java | 2 +-
.../test/org/apache/sis/test/Assertions.java | 10 +++++-----
.../test/org/apache/sis/test/OptionalTestData.java | 2 --
28 files changed, 39 insertions(+), 37 deletions(-)
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 ea3f46d23c..9c009909c7 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
@@ -35,8 +35,6 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.feature.Assertions.assertGridToCornerEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-
/**
* Tests {@link DimensionalityReduction}.
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
index 73cc17f5fd..9a95ded9fc 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/DefaultMetadataTest.java
@@ -38,11 +38,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.xml.test.TestCase;
import static org.apache.sis.test.Assertions.assertSingleton;
-import static org.apache.sis.test.Assertions.assertSingletonCitation;
import static org.apache.sis.test.Assertions.assertTitleEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.MetadataScope;
+import static org.apache.sis.test.Assertions.assertSingletonCitation;
/**
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
index 69a8ced9bb..6fb2e59dbb 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataSourceTest.java
@@ -18,7 +18,6 @@ package org.apache.sis.metadata.sql;
import java.util.Set;
import java.util.Collection;
-import java.util.Collections;
import org.opengis.util.InternationalString;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.distribution.Format;
@@ -35,6 +34,7 @@ import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestStep;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Collections;
import static org.apache.sis.test.Assertions.assertSingleton;
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 c753ccb625..baaaf055aa 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
@@ -29,8 +29,8 @@ import org.apache.sis.metadata.iso.citation.DefaultTelephone;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.sis.test.Assertions.assertSingleton;
import org.junit.jupiter.api.parallel.ResourceLock;
+import static org.apache.sis.test.Assertions.assertSingleton;
import org.apache.sis.test.TestCase;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
index 25da015416..ff51f48cee 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestCase.java
@@ -26,10 +26,10 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.io.IOException;
import javax.xml.parsers.ParserConfigurationException;
-import org.xml.sax.SAXException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.JAXBException;
+import org.xml.sax.SAXException;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.xml.XML;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
index 0f2da2d0e8..22cd8e51e9 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
@@ -28,13 +28,13 @@ import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.cs.*;
import org.apache.sis.referencing.datum.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultEngineeringDatum;
-import org.apache.sis.referencing.legacy.DefaultUserDefinedCS;
import org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.xml.bind.referencing.CS_CoordinateSystem;
import org.apache.sis.io.wkt.Formatter;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.datum.DatumEnsemble;
+import org.apache.sis.referencing.legacy.DefaultUserDefinedCS;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java
index 37ff74fb2c..5a742311d5 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java
@@ -21,8 +21,6 @@ import java.util.Objects;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
import org.apache.sis.referencing.datum.AbstractDatum;
@@ -30,12 +28,16 @@ import
org.apache.sis.referencing.internal.shared.WKTKeywords;
import org.apache.sis.referencing.internal.shared.NilReferencingObject;
import org.apache.sis.metadata.internal.shared.ImplementationHelper;
import org.apache.sis.io.wkt.Formatter;
-import org.apache.sis.io.wkt.ElementKind;
import org.apache.sis.util.ComparisonMode;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
+// Specific to the geoapi-4.0 branch:
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import org.apache.sis.io.wkt.ElementKind;
+
/**
* Defines the origin of an image coordinate reference system. An image datum
is used in a local
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java
index 5dfab47009..771156d8b2 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java
@@ -19,9 +19,9 @@ package org.apache.sis.referencing.legacy;
import java.util.Map;
import jakarta.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlRootElement;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.apache.sis.referencing.cs.AbstractCS;
import org.apache.sis.referencing.internal.shared.NilReferencingObject;
-import org.opengis.referencing.cs.CoordinateSystemAxis;
/**
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 62bc399cac..0840bc1cc2 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
@@ -23,9 +23,9 @@ import org.opengis.geometry.DirectPosition;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
import static org.opengis.test.Validators.validate;
+import org.apache.sis.test.TestCase;
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/CoordinateFormatTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/geometry/CoordinateFormatTest.java
index 8dde2bc6dc..b11b25ebc8 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
@@ -29,8 +29,8 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.test.TestCase;
import org.apache.sis.test.mock.VerticalCRSMock;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
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 a660b0d189..60f6c4b7a0 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
@@ -20,9 +20,9 @@ import org.apache.sis.io.wkt.Formatter;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
import static org.opengis.test.Validators.validate;
+import org.apache.sis.test.TestCase;
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 5e65663add..1f0a947e72 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
@@ -27,9 +27,9 @@ import org.apache.sis.io.wkt.Convention;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
import static org.opengis.test.Validators.validate;
+import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.test.Assertions.assertMessageContains;
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 bde26057c2..09d5370e1b 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
@@ -18,9 +18,9 @@ package org.apache.sis.geometry;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
import static org.opengis.test.Validators.validate;
+import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import org.apache.sis.referencing.crs.HardCodedCRS;
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 ce28be5317..81291890c4 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
@@ -36,8 +36,8 @@ import static
org.apache.sis.referencing.internal.shared.Formulas.LINEAR_TOLERAN
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index 58fc045756..037ff9060a 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -52,15 +52,15 @@ import static
org.apache.sis.util.internal.shared.Constants.SECONDS_PER_DAY;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.Assertions.assertMultilinesEquals;
-import static org.apache.sis.referencing.Assertions.assertAxisEquals;
-import static org.apache.sis.referencing.Assertions.assertDiagonalEquals;
import static org.apache.sis.test.Assertions.assertSingleton;
import static org.apache.sis.test.Assertions.assertSingletonAuthorityCode;
import static org.apache.sis.test.Assertions.assertSingletonScope;
+import static org.apache.sis.referencing.Assertions.assertAxisEquals;
+import static org.apache.sis.referencing.Assertions.assertDiagonalEquals;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
index a39656690c..1e9140068f 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java
@@ -33,8 +33,8 @@ import org.apache.sis.parameter.Parameterized;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.Assertions.assertMessageContains;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
index f8f7bccfb3..acf655e18d 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
@@ -44,8 +44,8 @@ import static
org.apache.sis.util.internal.shared.Constants.UTC;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.test.TestCase;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.Assertions.assertSingleton;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
index 8e969461f9..4219a826d1 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java
@@ -23,8 +23,8 @@ import org.apache.sis.referencing.GeodeticObjectVerifier;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.sis.test.Assertions.assertSingletonScope;
import org.opengis.test.Validators;
+import static org.apache.sis.test.Assertions.assertSingletonScope;
import org.apache.sis.xml.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
index d614bf7202..4b5556e845 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java
@@ -29,8 +29,8 @@ import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
-import static org.apache.sis.referencing.Assertions.assertWktEquals;
import static org.apache.sis.test.Assertions.assertSingleton;
+import static org.apache.sis.referencing.Assertions.assertWktEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
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 ecdf6089bb..0b2b539e2b 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
@@ -59,6 +59,7 @@ import static
org.apache.sis.util.internal.shared.Constants.SECONDS_PER_DAY;
import static
org.apache.sis.referencing.internal.shared.Formulas.LINEAR_TOLERANCE;
import static
org.apache.sis.referencing.internal.shared.Formulas.ANGULAR_TOLERANCE;
import static
org.apache.sis.referencing.internal.PositionalAccuracyConstant.DATUM_SHIFT_APPLIED;
+import org.apache.sis.referencing.internal.shared.CoordinateOperations;
// Test dependencies
import org.junit.jupiter.api.BeforeEach;
@@ -79,7 +80,6 @@ import org.opengis.test.Assertions;
// Specific to the geoapi-4.0 branch:
import java.time.temporal.ChronoField;
-import org.apache.sis.referencing.internal.shared.CoordinateOperations;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
index dd4d45662c..1114372ace 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java
@@ -28,9 +28,11 @@ import org.opengis.referencing.operation.Transformation;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import static org.apache.sis.test.Assertions.assertSingleton;
import org.opengis.test.Validators;
+import static org.apache.sis.test.Assertions.assertSingleton;
import org.apache.sis.xml.test.TestCase;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import static org.opengis.test.Assertions.assertIdentifierEquals;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index e987483825..83b9799201 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -24,8 +24,8 @@ import org.apache.sis.util.internal.shared.DoubleDouble;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.referencing.Assertions;
import static org.junit.jupiter.api.Assertions.*;
+import org.apache.sis.referencing.Assertions;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index 054a91a845..1ed02ad449 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@ -26,6 +26,8 @@ import org.apache.sis.util.internal.shared.DoubleDouble;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.apache.sis.referencing.Assertions;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
index 77e142cc98..e1c28de621 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -45,13 +45,13 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertSingleton;
import static org.apache.sis.test.Assertions.assertSingletonBBox;
-import static org.apache.sis.test.Assertions.assertSingletonReferenceSystem;
import static org.apache.sis.test.Assertions.assertSingletonScope;
import org.apache.sis.xml.test.TestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.nio.charset.StandardCharsets;
import static org.opengis.test.Assertions.assertIdentifierEquals;
+import static org.apache.sis.test.Assertions.assertSingletonReferenceSystem;
/**
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
index c95bbb2b7e..01d750aa53 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
@@ -36,11 +36,11 @@ import static
org.apache.sis.test.Assertions.assertMultilinesEquals;
import static org.apache.sis.test.Assertions.assertSingleton;
import static org.apache.sis.test.Assertions.assertSingletonBBox;
import static org.apache.sis.test.Assertions.assertSingletonReferenceSystem;
-import static org.apache.sis.test.Assertions.assertSingletonResourceFormat;
import org.apache.sis.test.TestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.identification.Identification;
+import static org.apache.sis.test.Assertions.assertSingletonResourceFormat;
/**
diff --git
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
index a89b710e45..fa78396518 100644
---
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
@@ -39,11 +39,11 @@ import static
org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.Assertions.assertSingleton;
import static org.apache.sis.test.Assertions.assertSingletonBBox;
import static org.apache.sis.test.Assertions.assertSingletonReferenceSystem;
-import static org.apache.sis.test.Assertions.assertSingletonResourceFormat;
import org.apache.sis.test.TestCase;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.identification.Identification;
+import static org.apache.sis.test.Assertions.assertSingletonResourceFormat;
/**
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
index c564037de9..a9ae0e1e85 100644
--- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
+++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java
@@ -35,13 +35,12 @@ import java.io.ByteArrayOutputStream;
import org.opengis.metadata.Metadata;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.extent.Extent;
-import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.metadata.identification.Identification;
import org.opengis.metadata.content.FeatureCatalogueDescription;
import org.opengis.metadata.citation.Citation;
-import org.opengis.metadata.maintenance.Scope;
import org.opengis.metadata.maintenance.ScopeCode;
+import org.opengis.metadata.lineage.Source;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.util.InternationalString;
import org.apache.sis.util.Utilities;
@@ -51,12 +50,13 @@ import org.apache.sis.util.Classes;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
-import org.opengis.referencing.ObjectDomain;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.content.FeatureTypeInfo;
-import org.opengis.metadata.lineage.Source;
+import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.maintenance.Scope;
+import org.opengis.referencing.ObjectDomain;
/**
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/OptionalTestData.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/OptionalTestData.java
index b3e9838fc8..c8a49eaa78 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/OptionalTestData.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/OptionalTestData.java
@@ -24,8 +24,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.sis.system.DataDirectory;
-// Test dependencies
-
/**
* All optional test data used by Apache SIS. Those data are not present on
the source code repository.
