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 3d3d3b7251 Upgraded JUnit 5 dependency to 5.10.2 and ported a few more
tests.
3d3d3b7251 is described below
commit 3d3d3b72515a1c47f19e4952a5f3ae5bed3228e9
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sun Feb 11 22:47:21 2024 +0100
Upgraded JUnit 5 dependency to 5.10.2 and ported a few more tests.
---
.../sis/referencing/crs/AbstractCRSTest.java | 4 +-
.../referencing/crs/DefaultCompoundCRSTest.java | 64 ++++++++++------------
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 56 +++++++++++--------
.../referencing/crs/DefaultEngineeringCRSTest.java | 39 +++++++------
.../referencing/crs/DefaultGeocentricCRSTest.java | 22 ++++----
.../referencing/crs/DefaultGeodeticCRSTest.java | 4 +-
.../referencing/crs/DefaultGeographicCRSTest.java | 46 ++++++++--------
.../sis/referencing/crs/DefaultImageCRSTest.java | 23 ++++----
.../referencing/crs/DefaultProjectedCRSTest.java | 38 ++++++-------
.../referencing/crs/DefaultTemporalCRSTest.java | 20 +++----
.../sis/referencing/crs/HardCodedCRSTest.java | 22 ++++----
.../apache/sis/referencing/crs/SubTypesTest.java | 2 +-
netbeans-project/ivy.xml | 6 +-
settings.gradle.kts | 8 +--
14 files changed, 177 insertions(+), 177 deletions(-)
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 157ea8e824..12fdaaa2dd 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
@@ -23,7 +23,7 @@ import org.apache.sis.referencing.cs.AxesConvention;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.referencing.cs.HardCodedAxes;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
@@ -56,7 +56,7 @@ public final class AbstractCRSTest extends TestCase {
HardCodedAxes.GEODETIC_LONGITUDE,
HardCodedAxes.GEODETIC_LATITUDE, HardCodedAxes.ALTITUDE, HardCodedAxes.TIME));
actual = toTest.forConvention(AxesConvention.RIGHT_HANDED);
- assertEquals("forConvention(RIGHT_HANDED)", expected, actual);
+ assertEquals(expected, actual, "forConvention(RIGHT_HANDED)");
assertSame(actual, toTest
.forConvention(AxesConvention.RIGHT_HANDED));
assertSame(actual, toTest
.forConvention(AxesConvention.DISPLAY_ORIENTED));
assertSame(actual, toTest
.forConvention(AxesConvention.NORMALIZED));
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 3964efebb6..256ffafe8d 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
@@ -33,9 +33,8 @@ import org.apache.sis.io.wkt.Convention;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
-import static org.opengis.test.Assert.assertInstanceOf;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
@@ -94,23 +93,21 @@ public final class DefaultCompoundCRSTest extends TestCase {
final Map<String,Object> properties = new HashMap<>(4);
assertNull(properties.put(DefaultCompoundCRS.LOCALE_KEY,
Locale.ENGLISH));
assertNull(properties.put(DefaultCompoundCRS.NAME_KEY, "3D +
illegal"));
- try {
- new DefaultCompoundCRS(properties, HardCodedCRS.WGS84, HEIGHT,
HardCodedCRS.SPHERE);
- fail("Should not allow construction with two horizontal
components.");
- } catch (IllegalArgumentException e) {
- assertEquals("Compound coordinate reference systems cannot contain
two horizontal components.", e.getMessage());
- }
+
+ IllegalArgumentException e;
+ e = assertThrows(IllegalArgumentException.class,
+ () -> new DefaultCompoundCRS(properties, HardCodedCRS.WGS84,
HEIGHT, HardCodedCRS.SPHERE),
+ "Should not allow construction with two horizontal
components.");
+ assertEquals("Compound coordinate reference systems cannot contain two
horizontal components.", e.getMessage());
/*
* Try again with duplicated vertical components, opportunistically
* testing localization in a different language.
*/
properties.put(DefaultCompoundCRS.LOCALE_KEY, Locale.FRENCH);
- try {
- new DefaultCompoundCRS(properties, HardCodedCRS.WGS84, HEIGHT,
HardCodedCRS.ELLIPSOIDAL_HEIGHT);
- fail("Should not allow construction with two vertical
components.");
- } catch (IllegalArgumentException e) {
- assertEquals("Un système de référence des coordonnées ne peut pas
contenir deux composantes verticales.", e.getMessage());
- }
+ e = assertThrows(IllegalArgumentException.class,
+ () -> new DefaultCompoundCRS(properties, HardCodedCRS.WGS84,
HEIGHT, HardCodedCRS.ELLIPSOIDAL_HEIGHT),
+ "Should not allow construction with two vertical components.");
+ assertEquals("Un système de référence des coordonnées ne peut pas
contenir deux composantes verticales.", e.getMessage());
}
/**
@@ -124,13 +121,12 @@ public final class DefaultCompoundCRSTest extends
TestCase {
final Map<String,Object> properties = new HashMap<>(4);
assertNull(properties.put(DefaultCompoundCRS.LOCALE_KEY,
Locale.ENGLISH));
assertNull(properties.put(DefaultCompoundCRS.NAME_KEY, "3D"));
- try {
- new DefaultCompoundCRS(properties, HardCodedCRS.WGS84,
HardCodedCRS.ELLIPSOIDAL_HEIGHT);
- fail("Should not allow construction with ellipsoidal height.");
- } catch (IllegalArgumentException e) {
- assertEquals("Compound coordinate reference systems should not
contain ellipsoidal height. "
- + "Use a three-dimensional geographic system instead.",
e.getMessage());
- }
+
+ var e = assertThrows(IllegalArgumentException.class,
+ () -> new DefaultCompoundCRS(properties, HardCodedCRS.WGS84,
HardCodedCRS.ELLIPSOIDAL_HEIGHT),
+ "Should not allow construction with ellipsoidal height.");
+ assertEquals("Compound coordinate reference systems should not contain
ellipsoidal height. "
+ + "Use a three-dimensional geographic system instead.",
e.getMessage());
/*
* We allow an ellipsoidal height if there is no horizontal CRS.
* This is a departure from ISO 19111.
@@ -152,8 +148,8 @@ public final class DefaultCompoundCRSTest extends TestCase {
* Verifies the coordinate system axes.
*/
final CoordinateSystem cs = crs4.getCoordinateSystem();
- assertInstanceOf("coordinateSystem", DefaultCompoundCS.class, cs);
- assertEquals("dimension", 4, cs.getDimension());
+ assertInstanceOf(DefaultCompoundCS.class, cs);
+ assertEquals(4, cs.getDimension());
assertSame(HardCodedAxes.GEODETIC_LONGITUDE, cs.getAxis(0));
assertSame(HardCodedAxes.GEODETIC_LATITUDE, cs.getAxis(1));
assertSame(HardCodedAxes.GRAVITY_RELATED_HEIGHT, cs.getAxis(2));
@@ -205,19 +201,19 @@ public final class DefaultCompoundCRSTest extends
TestCase {
final DefaultGeographicCRS crs3 = HardCodedCRS.WGS84_3D;
final DefaultCompoundCRS crs4 = new
DefaultCompoundCRS(Map.of(NAME_KEY, "4D"), crs3, TIME);
CoordinateSystemAxis axis = crs4.getCoordinateSystem().getAxis(0);
- assertEquals("longitude.minimumValue", -180.0, axis.getMinimumValue(),
STRICT);
- assertEquals("longitude.maximumValue", +180.0, axis.getMaximumValue(),
STRICT);
+ assertEquals(-180.0, axis.getMinimumValue(), STRICT);
+ assertEquals(+180.0, axis.getMaximumValue(), STRICT);
- assertSame("Expected a no-op.", crs4,
crs4.forConvention(AxesConvention.RIGHT_HANDED));
- final DefaultCompoundCRS shifted =
crs4.forConvention(AxesConvention.POSITIVE_RANGE);
- assertNotSame("Expected a new CRS.", crs4, shifted);
+ assertSame(crs4, crs4.forConvention(AxesConvention.RIGHT_HANDED),
"Expected a no-op.");
+ final DefaultCompoundCRS shifted =
crs4.forConvention(AxesConvention.POSITIVE_RANGE);
+ assertNotSame(crs4, shifted, "Expected a new CRS.");
Validators.validate(shifted);
axis = shifted.getCoordinateSystem().getAxis(0);
- assertEquals("longitude.minimumValue", 0.0,
axis.getMinimumValue(), STRICT);
- assertEquals("longitude.maximumValue", 360.0,
axis.getMaximumValue(), STRICT);
- assertSame("Expected a no-op.", shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE));
- assertSame("Expected cached instance.", shifted, crs4
.forConvention(AxesConvention.POSITIVE_RANGE));
+ assertEquals( 0.0, axis.getMinimumValue(), STRICT);
+ assertEquals(360.0, axis.getMaximumValue(), STRICT);
+ assertSame(shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE), "Expected a no-op.");
+ assertSame(shifted, crs4
.forConvention(AxesConvention.POSITIVE_RANGE), "Expected cached instance.");
}
/**
@@ -345,8 +341,8 @@ public final class DefaultCompoundCRSTest extends TestCase {
* Shallow verification of the components.
*/
final List<CoordinateReferenceSystem> components = crs.getComponents();
- assertSame("singleComponents", components, crs.getSingleComponents());
- assertEquals("components.size", 2, components.size());
+ assertSame(components, crs.getSingleComponents());
+ assertEquals(2, components.size());
assertEpsgNameAndIdentifierEqual("JGD2011", 6668,
components.get(0));
assertEpsgNameAndIdentifierEqual("JGD2011 (vertical) height", 6695,
components.get(1));
/*
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 0c68db4b5b..45e91ba419 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
@@ -33,7 +33,7 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.referencing.operation.DefaultConversionTest;
import org.apache.sis.test.DependsOn;
@@ -79,38 +79,46 @@ public final class DefaultDerivedCRSTest extends TestCase {
*/
@Test
public void testGetType() {
- assertEquals("Using consistent arguments.", WKTKeywords.VerticalCRS,
+ // Using consistent arguments.
+ assertEquals(WKTKeywords.VerticalCRS,
DefaultDerivedCRS.getType(HardCodedCRS.ELLIPSOIDAL_HEIGHT,
HardCodedCS.GRAVITY_RELATED_HEIGHT));
- assertNull("Using inconsistent arguments.",
- DefaultDerivedCRS.getType(HardCodedCRS.ELLIPSOIDAL_HEIGHT,
HardCodedCS.SECONDS));
+ // Using inconsistent arguments.
+ assertNull(DefaultDerivedCRS.getType(HardCodedCRS.ELLIPSOIDAL_HEIGHT,
HardCodedCS.SECONDS));
- assertEquals("Using consistent arguments.", WKTKeywords.TimeCRS,
+ // Using consistent arguments.
+ assertEquals(WKTKeywords.TimeCRS,
DefaultDerivedCRS.getType(HardCodedCRS.TIME,
HardCodedCS.SECONDS));
- assertNull("Using inconsistent arguments.",
- DefaultDerivedCRS.getType(HardCodedCRS.TIME,
HardCodedCS.GRAVITY_RELATED_HEIGHT));
+ // Using inconsistent arguments.
+ assertNull(DefaultDerivedCRS.getType(HardCodedCRS.TIME,
HardCodedCS.GRAVITY_RELATED_HEIGHT));
- assertEquals("Using consistent arguments.", WKTKeywords.GeodeticCRS,
+ // Using consistent arguments.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.WGS84,
HardCodedCS.GEODETIC_2D));
- assertEquals("Using consistent arguments but one more dimension.",
WKTKeywords.GeodeticCRS,
+ // Using consistent arguments but one more dimension.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.WGS84,
HardCodedCS.GEODETIC_3D));
- assertEquals("Using consistent arguments.", WKTKeywords.GeodeticCRS,
+ // Using consistent arguments.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.GEOCENTRIC,
HardCodedCS.CARTESIAN_3D));
- assertEquals("Using consistent arguments but one less dimension.",
WKTKeywords.GeodeticCRS,
+ // Using consistent arguments but one less dimension.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.GEOCENTRIC,
HardCodedCS.CARTESIAN_2D));
- assertEquals("Using different coordinate system type.",
WKTKeywords.GeodeticCRS,
+ // Using different coordinate system type.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.GEOCENTRIC,
HardCodedCS.SPHERICAL));
- assertEquals("Using different coordinate system type.",
WKTKeywords.GeodeticCRS,
+ // Using different coordinate system type.
+ assertEquals(WKTKeywords.GeodeticCRS,
DefaultDerivedCRS.getType(HardCodedCRS.WGS84,
HardCodedCS.CARTESIAN_2D));
- assertNull("Using illegal coordinate system type.",
- DefaultDerivedCRS.getType(HardCodedCRS.WGS84,
HardCodedCS.GRAVITY_RELATED_HEIGHT));
+ // Using illegal coordinate system type.
+ assertNull(DefaultDerivedCRS.getType(HardCodedCRS.WGS84,
HardCodedCS.GRAVITY_RELATED_HEIGHT));
}
/**
@@ -133,14 +141,14 @@ public final class DefaultDerivedCRSTest extends TestCase
{
final DefaultDerivedCRS crs = createLongitudeRotation();
Validators.validate(crs);
- assertEquals("name", "Back to Greenwich",
crs.getName().getCode());
- assertEquals("baseCRS", "NTF (Paris)",
crs.getBaseCRS().getName().getCode());
- assertEquals("datum", "Nouvelle Triangulation Française",
crs.getDatum().getName().getCode());
- assertSame ("coordinateSystem", HardCodedCS.GEODETIC_φλ,
crs.getCoordinateSystem());
+ assertEquals("Back to Greenwich",
crs.getName().getCode());
+ assertEquals("NTF (Paris)",
crs.getBaseCRS().getName().getCode());
+ assertEquals("Nouvelle Triangulation Française",
crs.getDatum().getName().getCode());
+ assertSame (HardCodedCS.GEODETIC_φλ, crs.getCoordinateSystem());
final Conversion conversion = crs.getConversionFromBase();
- assertSame("sourceCRS", crs.getBaseCRS(), conversion.getSourceCRS());
- assertSame("targetCRS", crs, conversion.getTargetCRS());
+ assertSame(crs.getBaseCRS(), conversion.getSourceCRS());
+ assertSame(crs, conversion.getTargetCRS());
assertMatrixEquals("Longitude rotation", new Matrix3(
0, 1, 0,
1, 0, 2.33722917,
@@ -244,9 +252,9 @@ public final class DefaultDerivedCRSTest extends TestCase {
final Conversion conversion = crs.getConversionFromBase();
final ParameterValueGroup pg = conversion.getParameterValues();
assertEpsgNameAndIdentifierEqual("Geographic/topocentric conversions",
9837, conversion.getMethod());
- assertEquals("Latitude", 55, pg.parameter("Latitude of topocentric
origin" ).doubleValue(Units.DEGREE), STRICT);
- assertEquals("Longitude", 5, pg.parameter("Longitude of topocentric
origin").doubleValue(Units.DEGREE), STRICT);
- assertEquals("Height", 0, pg.parameter("Ellipsoidal height of
topocentric origin").doubleValue(Units.METRE), STRICT);
+ assertEquals(55, pg.parameter("Latitude of topocentric origin"
).doubleValue(Units.DEGREE), STRICT);
+ assertEquals( 5, pg.parameter("Longitude of topocentric
origin").doubleValue(Units.DEGREE), STRICT);
+ assertEquals( 0, pg.parameter("Ellipsoidal height of topocentric
origin").doubleValue(Units.METRE), STRICT);
/*
* Test marshalling and compare with the original file.
*/
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 872c23920d..d41e2e33ff 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
@@ -28,8 +28,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.xml.test.TestCase;
import org.apache.sis.referencing.cs.HardCodedCS;
import static org.apache.sis.metadata.Assertions.assertXmlEquals;
@@ -155,17 +154,17 @@ public final class DefaultEngineeringCRSTest extends
TestCase {
xml, "xmlns:*");
final DefaultEngineeringCRS crs =
unmarshal(DefaultEngineeringCRS.class, xml);
- assertEquals("name", "A construction site CRS",
crs.getName().getCode());
- assertEquals("datum.name", "P1", crs.getDatum().getName().getCode());
+ assertEquals("A construction site CRS", crs.getName().getCode());
+ assertEquals("P1", crs.getDatum().getName().getCode());
final CoordinateSystem cs = crs.getCoordinateSystem();
- assertInstanceOf("coordinateSystem", CartesianCS.class, cs);
- assertEquals("cs.name", "Cartesian 2D", cs.getName().getCode());
- assertEquals("cs.dimension", 2, cs.getDimension());
+ assertInstanceOf(CartesianCS.class, cs);
+ assertEquals("Cartesian 2D", cs.getName().getCode());
+ assertEquals(2, cs.getDimension());
assertAxisDirectionsEqual("cartesianCS", cs, AxisDirection.EAST,
AxisDirection.NORTH);
- assertEquals("cs.axis[0].name", "x",
cs.getAxis(0).getName().getCode());
- assertEquals("cs.axis[1].name", "y",
cs.getAxis(1).getName().getCode());
+ assertEquals("x", cs.getAxis(0).getName().getCode());
+ assertEquals("y", cs.getAxis(1).getName().getCode());
}
/**
@@ -222,20 +221,20 @@ public final class DefaultEngineeringCRSTest extends
TestCase {
xml, "xmlns:*");
final DefaultEngineeringCRS crs =
unmarshal(DefaultEngineeringCRS.class, xml);
- assertEquals("name", "A spherical CRS", crs.getName().getCode());
- assertEquals("datum.name", "Centre",
crs.getDatum().getName().getCode());
+ assertEquals("A spherical CRS", crs.getName().getCode());
+ assertEquals("Centre", crs.getDatum().getName().getCode());
final CoordinateSystem cs = crs.getCoordinateSystem();
- assertInstanceOf("coordinateSystem", SphericalCS.class, cs);
- assertEquals("cs.name", "Spherical", cs.getName().getCode());
- assertEquals("cs.dimension", 3, cs.getDimension());
+ assertInstanceOf(SphericalCS.class, cs);
+ assertEquals("Spherical", cs.getName().getCode());
+ assertEquals(3, cs.getDimension());
assertAxisDirectionsEqual("cartesianCS", cs, AxisDirection.NORTH,
AxisDirection.EAST, AxisDirection.UP);
- assertEquals("cs.axis[0].name", "Spherical latitude",
cs.getAxis(0).getName().getCode());
- assertEquals("cs.axis[1].name", "Spherical longitude",
cs.getAxis(1).getName().getCode());
- assertEquals("cs.axis[2].name", "Geocentric radius",
cs.getAxis(2).getName().getCode());
- assertEquals("cs.axis[0].abbreviation", "Ω",
cs.getAxis(0).getAbbreviation());
- assertEquals("cs.axis[1].abbreviation", "θ",
cs.getAxis(1).getAbbreviation());
- assertEquals("cs.axis[2].abbreviation", "r",
cs.getAxis(2).getAbbreviation());
+ assertEquals("Spherical latitude", cs.getAxis(0).getName().getCode());
+ assertEquals("Spherical longitude", cs.getAxis(1).getName().getCode());
+ assertEquals("Geocentric radius", cs.getAxis(2).getName().getCode());
+ assertEquals("Ω", cs.getAxis(0).getAbbreviation());
+ assertEquals("θ", cs.getAxis(1).getAbbreviation());
+ assertEquals("r", cs.getAxis(2).getAbbreviation());
}
}
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
index 9758f47303..875ae24ee6 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeocentricCRSTest.java
@@ -27,7 +27,7 @@ import org.apache.sis.measure.Units;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
@@ -61,9 +61,9 @@ public final class DefaultGeocentricCRSTest extends TestCase {
assertNotSame(crs, normalized);
final CoordinateSystem cs = normalized.getCoordinateSystem();
final CoordinateSystem ref = crs.getCoordinateSystem();
- assertSame("longitude", ref.getAxis(1), cs.getAxis(0));
- assertSame("latitude", ref.getAxis(0), cs.getAxis(1));
- assertSame("height", ref.getAxis(2), cs.getAxis(2));
+ assertSame(ref.getAxis(1), cs.getAxis(0));
+ assertSame(ref.getAxis(0), cs.getAxis(1));
+ assertSame(ref.getAxis(2), cs.getAxis(2));
}
/**
@@ -74,18 +74,18 @@ public final class DefaultGeocentricCRSTest extends
TestCase {
public void testShiftLongitudeRange() {
final DefaultGeocentricCRS crs = HardCodedCRS.SPHERICAL;
CoordinateSystemAxis axis = crs.getCoordinateSystem().getAxis(1);
- assertEquals("longitude.minimumValue", -180.0, axis.getMinimumValue(),
STRICT);
- assertEquals("longitude.maximumValue", +180.0, axis.getMaximumValue(),
STRICT);
+ assertEquals(-180.0, axis.getMinimumValue(), STRICT);
+ assertEquals(+180.0, axis.getMaximumValue(), STRICT);
final DefaultGeocentricCRS shifted =
crs.forConvention(AxesConvention.POSITIVE_RANGE);
- assertNotSame("Expected a new CRS.", crs, shifted);
+ assertNotSame(crs, shifted, "Expected a new CRS.");
Validators.validate(shifted);
axis = shifted.getCoordinateSystem().getAxis(1);
- assertEquals("longitude.minimumValue", 0.0,
axis.getMinimumValue(), STRICT);
- assertEquals("longitude.maximumValue", 360.0,
axis.getMaximumValue(), STRICT);
- assertSame("Expected a no-op.", shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE));
- assertSame("Expected cached instance.", shifted, crs
.forConvention(AxesConvention.POSITIVE_RANGE));
+ assertEquals( 0.0, axis.getMinimumValue(), STRICT);
+ assertEquals(360.0, axis.getMaximumValue(), STRICT);
+ assertSame(shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE), "Expected a no-op.");
+ assertSame(shifted,
crs.forConvention(AxesConvention.POSITIVE_RANGE), "Expected cached instance.");
}
/**
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 84cd0d09b0..b6547ae396 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
@@ -22,7 +22,7 @@ import org.apache.sis.referencing.GeodeticObjectVerifier;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.xml.test.TestCase;
@@ -71,7 +71,7 @@ public final class DefaultGeodeticCRSTest extends TestCase {
* Values in the following tests are specific to our XML file.
* The actual texts in the EPSG database are more descriptive.
*/
- assertEquals("scope", "Horizontal component of 3D system.",
crs.getScope().toString());
+ assertEquals("Horizontal component of 3D system.",
crs.getScope().toString());
/*
* Marshal and compare with the original file.
*/
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 52ae9e7a66..4464963e5f 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
@@ -25,7 +25,7 @@ import org.apache.sis.io.wkt.Convention;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.DependsOnMethod;
@@ -62,19 +62,19 @@ public final class DefaultGeographicCRSTest extends
TestCase {
public void testShiftLongitudeRange() {
final DefaultGeographicCRS crs = HardCodedCRS.WGS84_3D;
CoordinateSystemAxis axis = crs.getCoordinateSystem().getAxis(0);
- assertEquals("longitude.minimumValue", -180.0, axis.getMinimumValue(),
STRICT);
- assertEquals("longitude.maximumValue", +180.0, axis.getMaximumValue(),
STRICT);
+ assertEquals(-180.0, axis.getMinimumValue(), STRICT);
+ assertEquals(+180.0, axis.getMaximumValue(), STRICT);
- assertSame("Expected a no-op.", crs,
crs.forConvention(AxesConvention.RIGHT_HANDED));
+ assertSame(crs, crs.forConvention(AxesConvention.RIGHT_HANDED),
"Expected a no-op.");
final DefaultGeographicCRS shifted =
crs.forConvention(AxesConvention.POSITIVE_RANGE);
- assertNotSame("Expected a new CRS.", crs, shifted);
+ assertNotSame(crs, shifted, "Expected a new CRS.");
Validators.validate(shifted);
axis = shifted.getCoordinateSystem().getAxis(0);
- assertEquals("longitude.minimumValue", 0.0,
axis.getMinimumValue(), STRICT);
- assertEquals("longitude.maximumValue", 360.0,
axis.getMaximumValue(), STRICT);
- assertSame("Expected a no-op.", shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE));
- assertSame("Expected cached instance.", shifted, crs
.forConvention(AxesConvention.POSITIVE_RANGE));
+ assertEquals( 0.0, axis.getMinimumValue(), STRICT);
+ assertEquals(360.0, axis.getMaximumValue(), STRICT);
+ assertSame(shifted,
shifted.forConvention(AxesConvention.POSITIVE_RANGE), "Expected a no-op.");
+ assertSame(shifted,
crs.forConvention(AxesConvention.POSITIVE_RANGE), "Expected cached instance.");
}
/**
@@ -101,41 +101,41 @@ public final class DefaultGeographicCRSTest extends
TestCase {
public void testIdentifiers() {
GeographicCRS crs = CommonCRS.WGS72.geographic();
Identifier identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "EPSG", identifier.getCodeSpace());
- assertEquals("code", "4322", identifier.getCode());
+ assertEquals("EPSG", identifier.getCodeSpace());
+ assertEquals("4322", identifier.getCode());
crs = CommonCRS.WGS72.normalizedGeographic();
assertTrue(crs.getIdentifiers().isEmpty());
crs = CommonCRS.WGS84.geographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "EPSG", identifier.getCodeSpace());
- assertEquals("code", "4326", identifier.getCode());
+ assertEquals("EPSG", identifier.getCodeSpace());
+ assertEquals("4326", identifier.getCode());
crs = CommonCRS.WGS84.normalizedGeographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "CRS", identifier.getCodeSpace());
- assertEquals("code", "84", identifier.getCode());
+ assertEquals("CRS", identifier.getCodeSpace());
+ assertEquals("84", identifier.getCode());
crs = CommonCRS.NAD83.geographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "EPSG", identifier.getCodeSpace());
- assertEquals("code", "4269", identifier.getCode());
+ assertEquals("EPSG", identifier.getCodeSpace());
+ assertEquals("4269", identifier.getCode());
crs = CommonCRS.NAD83.normalizedGeographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "CRS", identifier.getCodeSpace());
- assertEquals("code", "83", identifier.getCode());
+ assertEquals("CRS", identifier.getCodeSpace());
+ assertEquals("83", identifier.getCode());
crs = CommonCRS.NAD27.geographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "EPSG", identifier.getCodeSpace());
- assertEquals("code", "4267", identifier.getCode());
+ assertEquals("EPSG", identifier.getCodeSpace());
+ assertEquals("4267", identifier.getCode());
crs = CommonCRS.NAD27.normalizedGeographic();
identifier = getSingleton(crs.getIdentifiers());
- assertEquals("codespace", "CRS", identifier.getCodeSpace());
- assertEquals("code", "27", identifier.getCode());
+ assertEquals("CRS", identifier.getCodeSpace());
+ assertEquals("27", identifier.getCode());
}
/**
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 3ae6ceaea6..957eace1fd 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
@@ -30,8 +30,7 @@ import org.apache.sis.xml.Namespaces;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.opengis.test.Assert.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.xml.test.TestCase;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.cs.HardCodedAxes;
@@ -152,19 +151,19 @@ public final class DefaultImageCRSTest extends TestCase {
assertXmlEquals(expected, xml, "xmlns:*");
final DefaultImageCRS crs = unmarshal(DefaultImageCRS.class, xml);
- assertEquals("name", "An image CRS", crs.getName().getCode());
- assertEquals("datum.name", "C1", crs.getDatum().getName().getCode());
+ assertEquals("An image CRS", crs.getName().getCode());
+ assertEquals("C1", crs.getDatum().getName().getCode());
final CoordinateSystem cs = crs.getCoordinateSystem();
- assertInstanceOf("coordinateSystem", cartesian ? CartesianCS.class :
AffineCS.class, cs);
- assertEquals("cs.isCartesian", cartesian, cs instanceof CartesianCS);
- assertEquals("cs.name", "Grid", cs.getName().getCode());
- assertEquals("cs.dimension", 2, cs.getDimension());
+ assertInstanceOf((Class<?>) (cartesian ? CartesianCS.class :
AffineCS.class), cs);
+ assertEquals(cartesian, cs instanceof CartesianCS);
+ assertEquals("Grid", cs.getName().getCode());
+ assertEquals(2, cs.getDimension());
assertAxisDirectionsEqual("cartesianCS", cs,
AxisDirection.COLUMN_POSITIVE, AxisDirection.ROW_POSITIVE);
- assertEquals("cs.axis[0].name", "Column",
cs.getAxis(0).getName().getCode());
- assertEquals("cs.axis[1].name", "Row",
cs.getAxis(1).getName().getCode());
- assertEquals("cs.axis[0].abbreviation", "i",
cs.getAxis(0).getAbbreviation());
- assertEquals("cs.axis[1].abbreviation", "j",
cs.getAxis(1).getAbbreviation());
+ assertEquals("Column", cs.getAxis(0).getName().getCode());
+ assertEquals("Row", cs.getAxis(1).getName().getCode());
+ assertEquals("i", cs.getAxis(0).getAbbreviation());
+ assertEquals("j", cs.getAxis(1).getAbbreviation());
}
}
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 116dd8a3e1..94522db628 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
@@ -39,11 +39,12 @@ import org.apache.sis.measure.Units;
import org.junit.After;
import org.junit.Test;
import org.junit.Rule;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.Validators;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
+import static org.apache.sis.test.Assertions.assertMessageContains;
import org.apache.sis.xml.test.TestCase;
import org.apache.sis.referencing.cs.HardCodedCS;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
@@ -109,13 +110,9 @@ public final class DefaultProjectedCRSTest extends
TestCase {
public void testConstructor() throws FactoryException {
final ProjectedCRS crs = create(HardCodedCRS.NTF);
verifyParameters(crs.getConversionFromBase().getParameterValues());
- try {
- create(HardCodedCRS.WGS84_3D);
- fail("Should not accept a three-dimensional base geodetic CRS.");
- } catch (InvalidGeodeticParameterException e) {
- final String message = e.getMessage();
- assertTrue(message, message.contains("Lambert Conic Conformal
(1SP)"));
- }
+ var e = assertThrows(InvalidGeodeticParameterException.class, () ->
create(HardCodedCRS.WGS84_3D),
+ "Should not accept a three-dimensional base
geodetic CRS.");
+ assertMessageContains(e, "Lambert Conic Conformal (1SP)");
}
/**
@@ -144,11 +141,11 @@ public final class DefaultProjectedCRSTest extends
TestCase {
* or something equivalent.
*/
private static void verifyParameters(final ParameterValueGroup pg) {
- assertEquals("Latitude of natural origin", 52,
pg.parameter("Latitude of natural origin") .doubleValue(Units.GRAD),
STRICT);
- assertEquals("Longitude of natural origin", 0,
pg.parameter("Longitude of natural origin") .doubleValue(Units.GRAD),
STRICT);
- assertEquals("Scale factor at natural origin", 0.99987742,
pg.parameter("Scale factor at natural origin").doubleValue(),
STRICT);
- assertEquals("False easting", 600000,
pg.parameter("False easting") .doubleValue(Units.METRE),
STRICT);
- assertEquals("False northing", 2200000,
pg.parameter("False northing") .doubleValue(Units.METRE),
STRICT);
+ assertEquals(52, pg.parameter("Latitude of natural origin")
.doubleValue(Units.GRAD));
+ assertEquals( 0, pg.parameter("Longitude of natural origin")
.doubleValue(Units.GRAD));
+ assertEquals( 0.99987742, pg.parameter("Scale factor at natural
origin").doubleValue());
+ assertEquals( 600000, pg.parameter("False easting")
.doubleValue(Units.METRE));
+ assertEquals(2200000, pg.parameter("False northing")
.doubleValue(Units.METRE));
}
/**
@@ -486,14 +483,14 @@ public final class DefaultProjectedCRSTest extends
TestCase {
Validators.validate(crs);
assertEpsgNameAndIdentifierEqual("NTF (Paris) / Lambert zone II",
27572, crs);
assertEpsgNameAndIdentifierEqual("NTF (Paris)", 4807,
crs.getBaseCRS());
- assertEquals("scope", "Large and medium scale topographic mapping and
engineering survey.", crs.getScope().toString());
+ assertEquals("Large and medium scale topographic mapping and
engineering survey.", crs.getScope().toString());
assertAxisDirectionsEqual("baseCRS",
crs.getBaseCRS().getCoordinateSystem(), AxisDirection.NORTH,
AxisDirection.EAST);
assertAxisDirectionsEqual("coordinateSystem",
crs.getCoordinateSystem(), AxisDirection.EAST, AxisDirection.NORTH);
final Projection conversion = crs.getConversionFromBase();
assertEpsgNameAndIdentifierEqual("Lambert zone II", 18082, conversion);
assertEpsgNameAndIdentifierEqual("Lambert Conic Conformal (1SP)",
9801, conversion.getMethod());
- assertNotNull("conversion.mathTransform",
conversion.getMathTransform());
+ assertNotNull(conversion.getMathTransform());
verifyParameters(conversion.getParameterValues());
/*
* Test marshalling and compare with the original file. The comparison
ignores the <gml:name> nodes because the
@@ -513,10 +510,11 @@ public final class DefaultProjectedCRSTest extends
TestCase {
public void testEquals() throws FactoryException {
final ProjectedCRS standard = create(CommonCRS.WGS84.geographic());
final ProjectedCRS normalized =
create(CommonCRS.WGS84.normalizedGeographic());
- assertFalse("STRICT", ((LenientComparable)
standard).equals(normalized, ComparisonMode.STRICT));
- assertFalse("BY_CONTRACT", ((LenientComparable)
standard).equals(normalized, ComparisonMode.BY_CONTRACT));
- assertTrue ("IGNORE_METADATA", ((LenientComparable)
standard).equals(normalized, ComparisonMode.IGNORE_METADATA));
- assertTrue ("APPROXIMATE", ((LenientComparable)
standard).equals(normalized, ComparisonMode.APPROXIMATE));
- assertTrue ("ALLOW_VARIANT", ((LenientComparable)
standard).equals(normalized, ComparisonMode.ALLOW_VARIANT));
+ final var c = assertInstanceOf(LenientComparable.class, standard);
+ assertFalse(c.equals(normalized, ComparisonMode.STRICT));
+ assertFalse(c.equals(normalized, ComparisonMode.BY_CONTRACT));
+ assertTrue (c.equals(normalized, ComparisonMode.IGNORE_METADATA));
+ assertTrue (c.equals(normalized, ComparisonMode.APPROXIMATE));
+ assertTrue (c.equals(normalized, ComparisonMode.ALLOW_VARIANT));
}
}
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 7aa7f2ff04..cce322e6be 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
@@ -27,7 +27,7 @@ import static
org.apache.sis.util.internal.StandardDateFormat.NANOS_PER_MILLISEC
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.referencing.cs.HardCodedCS;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
@@ -97,10 +97,10 @@ public final class DefaultTemporalCRSTest extends TestCase {
final double value = 58543.25; //
2019-03-01T06:00:00Z
final Date date = crs.toDate(value);
final Instant instant = crs.toInstant(value);
- assertEquals("toInstant", Instant.ofEpochSecond(1551420000L), instant);
- assertEquals("toDate", instant, date.toInstant());
- assertEquals("toValue", value, crs.toValue(instant), STRICT);
- assertEquals("toValue", value, crs.toValue(date), STRICT);
+ assertEquals(Instant.ofEpochSecond(1551420000L), instant);
+ assertEquals(instant, date.toInstant());
+ assertEquals(value, crs.toValue(instant));
+ assertEquals(value, crs.toValue(date));
}
/**
@@ -127,10 +127,10 @@ public final class DefaultTemporalCRSTest extends
TestCase {
*/
final Instant t = Instant.ofEpochSecond(10002L*(60*60*24) + 15, 789 *
NANOS_PER_MILLISECOND);
final double v = 2 + (15.789 - 12.345) / (60*60*24);
- assertEquals("toValue", v, crs.toValue(t), ε);
- assertEquals("toValue", v, crs.toValue(Date.from(t)), ε);
- assertEquals("toInstant", t, crs.toInstant(v));
- assertEquals("toDate", Date.from(t), crs.toDate(v));
+ assertEquals(v, crs.toValue(t), ε);
+ assertEquals(v, crs.toValue(Date.from(t)), ε);
+ assertEquals(t, crs.toInstant(v));
+ assertEquals(Date.from(t), crs.toDate(v));
}
/**
@@ -142,6 +142,6 @@ public final class DefaultTemporalCRSTest extends TestCase {
final Duration duration = crs.toDuration(4.25);
assertEquals( 4, duration.toDays());
assertEquals(102, duration.toHours());
- assertEquals(4.25, crs.toValue(duration), STRICT);
+ assertEquals(4.25, crs.toValue(duration));
}
}
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 afb887bd1e..5394dbf8cf 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
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.crs;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.opengis.test.ValidatorContainer;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOn;
@@ -67,16 +67,16 @@ public final class HardCodedCRSTest extends TestCase {
*/
@Test
public void testDimensions() {
- assertEquals("TIME", 1, TIME
.getCoordinateSystem().getDimension());
- assertEquals("DEPTH", 1, DEPTH
.getCoordinateSystem().getDimension());
- assertEquals("WGS84", 2, WGS84
.getCoordinateSystem().getDimension());
- assertEquals("WGS84 (φ,λ)", 2,
WGS84_LATITUDE_FIRST.getCoordinateSystem().getDimension());
- assertEquals("WGS84_3D", 3, WGS84_3D
.getCoordinateSystem().getDimension());
- assertEquals("CARTESIAN_2D", 2, CARTESIAN_2D
.getCoordinateSystem().getDimension());
- assertEquals("CARTESIAN_3D", 3, CARTESIAN_3D
.getCoordinateSystem().getDimension());
- assertEquals("GEOCENTRIC", 3, GEOCENTRIC
.getCoordinateSystem().getDimension());
- assertEquals("SPHERICAL", 3, SPHERICAL
.getCoordinateSystem().getDimension());
- assertEquals("GEOID_4D", 4, GEOID_4D
.getCoordinateSystem().getDimension());
+ assertEquals(1, TIME
.getCoordinateSystem().getDimension());
+ assertEquals(1, DEPTH
.getCoordinateSystem().getDimension());
+ assertEquals(2, WGS84
.getCoordinateSystem().getDimension());
+ assertEquals(2,
WGS84_LATITUDE_FIRST.getCoordinateSystem().getDimension());
+ assertEquals(3, WGS84_3D
.getCoordinateSystem().getDimension());
+ assertEquals(2, CARTESIAN_2D
.getCoordinateSystem().getDimension());
+ assertEquals(3, CARTESIAN_3D
.getCoordinateSystem().getDimension());
+ assertEquals(3, GEOCENTRIC
.getCoordinateSystem().getDimension());
+ assertEquals(3, SPHERICAL
.getCoordinateSystem().getDimension());
+ assertEquals(4, GEOID_4D
.getCoordinateSystem().getDimension());
}
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/SubTypesTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/SubTypesTest.java
index 77f9826c7c..b45207befa 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/SubTypesTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/SubTypesTest.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
// Test dependencies
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
diff --git a/netbeans-project/ivy.xml b/netbeans-project/ivy.xml
index 536f6fffc6..a014dd993e 100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@ -27,9 +27,9 @@
<dependency org="org.antlr" name="antlr4-maven-plugin"
rev="4.11.1"/>
<dependency org="jakarta.servlet" name="jakarta.servlet-api"
rev="6.0.0"/>
<dependency org="org.osgi" name="osgi.core"
rev="8.0.0"/>
- <dependency org="org.junit.platform"
name="junit-platform-launcher" rev="1.10.1"/>
- <dependency org="org.junit.jupiter" name="junit-jupiter-api"
rev="5.10.1"/>
- <dependency org="org.junit.vintage" name="junit-vintage-engine"
rev="5.10.1"/>
+ <dependency org="org.junit.platform"
name="junit-platform-launcher" rev="1.10.2"/>
+ <dependency org="org.junit.jupiter" name="junit-jupiter-api"
rev="5.10.2"/>
+ <dependency org="org.junit.vintage" name="junit-vintage-engine"
rev="5.10.2"/>
<dependency org="junit" name="junit"
rev="4.13.2"/>
<dependency org="org.apache.derby" name="derby"
rev="10.15.2.0"/>
<dependency org="org.apache.derby" name="derbytools"
rev="10.15.2.0"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dfae83c775..886e3dc144 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -73,10 +73,10 @@ dependencyResolutionManagement {
create("tests") {
library("geoapi", "org.opengis",
"geoapi-conformance") .version {strictly(geoapiVersion)}
library("junit4", "junit", "junit")
.version {strictly("4.13.2")}
- library("junit5", "org.junit.jupiter",
"junit-jupiter-api") .version {strictly("5.10.1")}
- library("junit", "org.junit.vintage",
"junit-vintage-engine") .version {strictly("5.10.1")}
- library("jupiter", "org.junit.jupiter",
"junit-jupiter-engine") .version {strictly("5.10.1")}
- library("junitLauncher", "org.junit.platform",
"junit-platform-launcher").version {strictly("1.10.1")}
+ library("junit5", "org.junit.jupiter",
"junit-jupiter-api") .version {strictly("5.10.2")}
+ library("junit", "org.junit.vintage",
"junit-vintage-engine") .version {strictly("5.10.2")}
+ library("jupiter", "org.junit.jupiter",
"junit-jupiter-engine") .version {strictly("5.10.2")}
+ library("junitLauncher", "org.junit.platform",
"junit-platform-launcher").version {strictly("1.10.2")}
library("jama", "gov.nist.math", "jama")
.version {strictly("1.0.3")}
library("geographiclib", "net.sf.geographiclib",
"GeographicLib-Java") .version {strictly("2.0")}
library("slf4j", "org.slf4j",
"slf4j-jdk14").version {
