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 52e92eab1e Update for change in argument order in GeoAPI, for
consistency with JUnit 5.
52e92eab1e is described below
commit 52e92eab1ec021af638b08416ac504126e4d09a0
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 17 22:11:10 2024 +0100
Update for change in argument order in GeoAPI, for consistency with JUnit 5.
---
.../projection/ObliqueStereographicTest.java | 5 ++---
.../operation/projection/TransverseMercatorTest.java | 2 +-
.../transform/AbridgedMolodenskyTransformTest.java | 2 +-
.../operation/transform/MolodenskyTransformTest.java | 6 ++++--
.../transform/PassThroughTransformTest.java | 20 ++++++++++----------
geoapi/snapshot | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
index 7fda3f1253..f534bb20d2 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ObliqueStereographicTest.java
@@ -375,9 +375,8 @@ public final class ObliqueStereographicTest extends
MapProjectionTestCase {
final Matrix derivative = spherical.transform(srcPts, 0, null, 0,
true);
tolerance = 1E-12;
- assertMatrixEquals("Spherical derivative", reference, derivative,
- new Matrix2(tolerance, tolerance,
- tolerance, tolerance));
+ assertMatrixEquals(reference, derivative, new Matrix2(tolerance,
tolerance, tolerance, tolerance),
+ "Spherical derivative");
}
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
index 874326a6a0..c6563701b8 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/TransverseMercatorTest.java
@@ -275,7 +275,7 @@ public final class TransverseMercatorTest extends
MapProjectionTestCase {
else if (longitude <= 66) tolerance = 0.1;
else tolerance = 0.7;
transform.transform(source, 0, source, 0, 1);
- assertCoordinateEquals(line, target, source,
reader.getLineNumber(), CalculationType.DIRECT_TRANSFORM);
+ assertCoordinateEquals(target, source,
reader.getLineNumber(), CalculationType.DIRECT_TRANSFORM, line);
}
}
}
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 3238cd68a4..c4388f19dc 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
@@ -77,7 +77,7 @@ public final class AbridgedMolodenskyTransformTest extends
MathTransformTestCase
for (int i=0; i<sources.length; i+=2) {
transform.transform(sources, i, targets, 0, 1); // Use the
overridden method.
transform.transform(sources, i, expected, 0, false); // Use the
MolodenskyTransform method.
- assertCoordinateEquals("transform", expected, targets, 0,
CalculationType.DIRECT_TRANSFORM);
+ assertCoordinateEquals(expected, targets, 0,
CalculationType.DIRECT_TRANSFORM, "transform");
}
}
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 958f41cc95..23a8daab1d 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
@@ -135,8 +135,10 @@ public final class MolodenskyTransformTest extends
MathTransformTestCase {
}
StatisticsFormat.getInstance().format(stats, TestCase.out);
}
- assertCoordinatesEqual("Comparison of Molodensky and geocentric
translation", 3,
- expected, 0, actual, 0, expected.length / 3,
CalculationType.DIRECT_TRANSFORM);
+ assertCoordinatesEqual(3, expected, 0,
+ actual, 0, expected.length / 3,
+ CalculationType.DIRECT_TRANSFORM,
+ "Comparison of Molodensky and geocentric translation");
}
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
index bebb69e751..00f8971324 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/PassThroughTransformTest.java
@@ -224,8 +224,8 @@ public final class PassThroughTransformTest extends
MathTransformTestCase {
toleranceModifier = null;
final double[] transformedData = new double[StrictMath.max(sourceDim,
targetDim) * numPts];
transform.transform(passthroughData, 0, transformedData, 0, numPts);
- assertCoordinatesEqual("PassThroughTransform results do not match the
results computed by this test.",
- targetDim, expectedData, 0, transformedData, 0, numPts,
CalculationType.DIRECT_TRANSFORM);
+ assertCoordinatesEqual(targetDim, expectedData, 0, transformedData, 0,
numPts, CalculationType.DIRECT_TRANSFORM,
+ "PassThroughTransform results do not match the
results computed by this test.");
/*
* Test inverse transform.
*/
@@ -234,8 +234,8 @@ public final class PassThroughTransformTest extends
MathTransformTestCase {
toleranceModifier = ToleranceModifier.RELATIVE;
Arrays.fill(transformedData, Double.NaN);
transform.inverse().transform(expectedData, 0, transformedData, 0,
numPts);
- assertCoordinatesEqual("Inverse of PassThroughTransform do not
give back the original data.",
- sourceDim, passthroughData, 0, transformedData, 0, numPts,
CalculationType.INVERSE_TRANSFORM);
+ assertCoordinatesEqual(sourceDim, passthroughData, 0,
transformedData, 0, numPts, CalculationType.INVERSE_TRANSFORM,
+ "Inverse of PassThroughTransform do not
give back the original data.");
}
/*
* Verify the consistency between different 'transform(…)' methods.
@@ -250,8 +250,8 @@ public final class PassThroughTransformTest extends
MathTransformTestCase {
if (transform instanceof LinearTransform) {
tolerance = 1E-4;
toleranceModifier = ToleranceModifier.RELATIVE;
- assertCoordinatesEqual("PassThroughTransform.transform(…) variants
produce inconsistent results.",
- sourceDim, expectedData, 0, targetAsFloat, 0, numPts,
CalculationType.DIRECT_TRANSFORM);
+ assertCoordinatesEqual(sourceDim, expectedData, 0, targetAsFloat,
0, numPts, CalculationType.DIRECT_TRANSFORM,
+ "PassThroughTransform.transform(…) variants
produce inconsistent results.");
}
}
@@ -289,8 +289,8 @@ public final class PassThroughTransformTest extends
MathTransformTestCase {
0, 0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0, 1});
- assertMatrixEquals("Expected removal of dimensions 0 and 4 before
pass-through",
- m, MathTransforms.getMatrix(steps.get(0)), null);
+ assertMatrixEquals(m, MathTransforms.getMatrix(steps.get(0)), null,
+ "Expected removal of dimensions 0 and 4 before
pass-through");
/*
* The number of pass-through dimensions have decreased from 2 to 1 on
both sides of the sub-transform.
*/
@@ -307,8 +307,8 @@ public final class PassThroughTransformTest extends
MathTransformTestCase {
0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 1});
- assertMatrixEquals("Expected removal of dimensions 1 and 2 after
pass-through",
- m, MathTransforms.getMatrix(steps.get(2)), null);
+ assertMatrixEquals(m, MathTransforms.getMatrix(steps.get(2)), null,
+ "Expected removal of dimensions 1 and 2 after
pass-through");
}
/**
diff --git a/geoapi/snapshot b/geoapi/snapshot
index 5ad50c808f..84e48733a2 160000
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@ -1 +1 @@
-Subproject commit 5ad50c808fc8cea1aa2ace46992435a86f604003
+Subproject commit 84e48733a2ec792e1af71ed51f15e70683182e53
