This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7d2c731b1b1a1fc4e8077734f99ec5b446943662
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 17 22:59:40 2024 +0100
Replace calls to an SIS assertion method by calls to the equivalent GeoAPI
assertion method.
---
.../org/apache/sis/coverage/grid/GridCoverage2DTest.java | 3 ++-
.../apache/sis/coverage/grid/ResampledGridCoverageTest.java | 9 +++++----
.../test/org/apache/sis/image/MaskedImageTest.java | 13 +++++++------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java
index 542ae3cff0..bf4084bb03 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
@@ -43,6 +43,7 @@ import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.referencing.crs.HardCodedCRS;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
@@ -294,7 +295,7 @@ public class GridCoverage2DTest extends TestCase {
assertEquals(2, result.getMinY());
assertEquals(GRID_SIZE, result.getWidth());
assertEquals(GRID_SIZE, result.getHeight());
- assertPixelsEqual(coverage.render(null), null, result, null);
+ assertSampleValuesEqual(coverage.render(null), result, STRICT, null);
}
/**
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 2557bc727f..592bd01f5b 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
@@ -57,6 +57,7 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.image.TiledImageMock;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.operation.HardCodedConversions;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.referencing.Assertions.assertEnvelopeEquals;
import static org.apache.sis.feature.Assertions.assertValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
@@ -408,7 +409,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
new AxisDirection[] {AxisDirection.FUTURE, AxisDirection.EAST,
AxisDirection.NORTH, AxisDirection.UP},
"Expected (t,λ,φ,H) axes.");
- assertPixelsEqual(source.render(null), null, result.render(null),
null);
+ assertSampleValuesEqual(source.render(null), result.render(null),
STRICT, null);
}
/**
@@ -548,7 +549,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
* Target image should be 6×6 pixels, like source image.
*/
final GridCoverage result = resample(source, targetGeom);
- assertPixelsEqual(source.render(null), null, result.render(null),
null);
+ assertSampleValuesEqual(source.render(null), result.render(null),
STRICT, null);
}
/**
@@ -564,7 +565,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
final GridGeometry target4D =
createGridGeometryND(HardCodedCRS.WGS84_4D, 0, 1, 2, 3, false);
final GridCoverage result = resample(source3D, target4D);
assertEquals(target4D, result.getGridGeometry());
- assertPixelsEqual(source3D.render(null), null, result.render(null),
null);
+ assertSampleValuesEqual(source3D.render(null), result.render(null),
STRICT, null);
}
/**
@@ -578,7 +579,7 @@ public final class ResampledGridCoverageTest extends
TestCase {
final GridCoverage source4D = createCoverageND(true);
final GridCoverage result = resample(source4D, target3D);
assertEquals(target3D, result.getGridGeometry());
- assertPixelsEqual(source4D.render(null), null, result.render(null),
null);
+ assertSampleValuesEqual(source4D.render(null), result.render(null),
STRICT, null);
}
/**
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
index 81c8e5c26e..e09fc2028a 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/MaskedImageTest.java
@@ -36,8 +36,9 @@ import org.apache.sis.util.Debug;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.sis.test.TestCase;
+import static org.opengis.test.Assertions.assertSampleValuesEqual;
import static org.apache.sis.feature.Assertions.assertPixelsEqual;
+import org.apache.sis.test.TestCase;
/**
@@ -88,7 +89,7 @@ public final class MaskedImageTest extends TestCase {
public void noErrorOnEmptyMasks() {
final BufferedImage source = monoTile();
final RenderedImage masked = new MaskedImage(source, new Polygon(),
true, new Number[] {127});
- assertPixelsEqual(source, null, masked, null);
+ assertSampleValuesEqual(source, masked, STRICT, null);
assertSame(source.getRaster(), masked.getTile(0,0)); //
Optimization applied by MaskedImage.
}
@@ -202,7 +203,7 @@ public final class MaskedImageTest extends TestCase {
3, 3, 3, 3, 2, 2, 2, 2,
3, 3, 3, 3, 2, 2, 2, 2
});
- assertPixelsEqual(expected, null, masked, null);
+ assertSampleValuesEqual(expected, masked, STRICT, null);
}
/**
@@ -221,7 +222,7 @@ public final class MaskedImageTest extends TestCase {
4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4
});
- assertPixelsEqual(expected, null, masked, null);
+ assertSampleValuesEqual(expected, masked, STRICT, null);
}
/**
@@ -240,7 +241,7 @@ public final class MaskedImageTest extends TestCase {
3, 3, 3, 3, 2, 2, 2, 2,
3, 3, 3, 3, 2, 2, 2, 2
});
- assertPixelsEqual(expected, null, masked, null);
+ assertSampleValuesEqual(expected, masked, STRICT, null);
}
/**
@@ -259,7 +260,7 @@ public final class MaskedImageTest extends TestCase {
4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4
});
- assertPixelsEqual(expected, null, masked, null);
+ assertSampleValuesEqual(expected, masked, STRICT, null);
}
/**
