(sis) 01/04: Remove an assertion method replaced by a GeoAPI assertion methods.

[desruisseaux]

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 a71069f7072bb21050b4bb9c82fa20f4a68e06e4
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Feb 17 22:49:26 2024 +0100

    Remove an assertion method replaced by a GeoAPI assertion methods.
---
 .../test/org/apache/sis/feature/Assertions.java    | 35 ----------------------
 .../sis/geometry/wrapper/j2d/FlatShapeTest.java    |  8 ++---
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
index 66f13daa9a..20545eff26 100644
--- 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
+++ 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/Assertions.java
@@ -20,7 +20,6 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
-import java.awt.geom.PathIterator;
 import org.apache.sis.image.PixelIterator;
 import org.apache.sis.util.Static;
 
@@ -170,38 +169,4 @@ public final class Assertions extends Static {
                 + "— matrix indices (" + i + ", " + j + ") band " + band
                 + ": expected " + expected + " but found " + actual;
     }
-
-    /**
-     * Asserts that the path is equal to given reference.
-     *
-     * @param  expected   expected geometry outline.
-     * @param  actual     actual geometry outline.
-     * @param  tolerance  tolerance threshold for floating point value 
comparisons.
-     */
-    @SuppressWarnings("fallthrough")
-    public static void assertPathEquals(final PathIterator expected, final 
PathIterator actual, final double tolerance) {
-        assertEquals(expected.getWindingRule(), actual.getWindingRule(), 
"windingRule");
-        final double[] buffer = new double[6];
-        final double[] values = new double[6];
-        while (!expected.isDone()) {
-            assertFalse(actual.isDone(), "isDone");
-            final int type = expected.currentSegment(buffer);
-            assertEquals(type, actual.currentSegment(values), 
"currentSegment");
-            switch (type) {
-                case PathIterator.SEG_CUBICTO: assertEquals(buffer[4], 
values[4], tolerance, "x₃");
-                                               assertEquals(buffer[5], 
values[5], tolerance, "y₃");
-                case PathIterator.SEG_QUADTO:  assertEquals(buffer[2], 
values[2], tolerance, "x₂");
-                                               assertEquals(buffer[3], 
values[3], tolerance, "y₂");
-                case PathIterator.SEG_LINETO:  assertEquals(buffer[0], 
values[0], tolerance, "x₁");
-                                               assertEquals(buffer[1], 
values[1], tolerance, "y₁"); break;
-                case PathIterator.SEG_MOVETO:  assertEquals(buffer[0], 
values[0], tolerance, "x₀");
-                                               assertEquals(buffer[1], 
values[1], tolerance, "y₀");
-                case PathIterator.SEG_CLOSE:   break;
-                default: fail("Unexpected type: " + type);
-            }
-            expected.next();
-            actual.next();
-        }
-        assertTrue(actual.isDone(), "isDone");
-    }
 }
diff --git 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
index a85ee63b00..3dded7cc3e 100644
--- 
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
+++ 
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/j2d/FlatShapeTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.TransformException;
 // Test dependencies
 import org.junit.jupiter.api.Test;
 import org.apache.sis.test.TestCase;
-import static org.apache.sis.feature.Assertions.assertPathEquals;
+import static org.opengis.test.Assertions.assertPathEquals;
 
 
 /**
@@ -65,7 +65,7 @@ public final class FlatShapeTest extends TestCase {
 
         final Path2D.Double r = new Path2D.Double(Path2D.WIND_NON_ZERO);
         createReferenceShape(r, coordinates, closed);
-        assertPathEquals(r.getPathIterator(null), p.getPathIterator(null), 
STRICT);
+        assertPathEquals(r.getPathIterator(null), p.getPathIterator(null), 
STRICT, STRICT, null);
     }
 
     /**
@@ -105,7 +105,7 @@ public final class FlatShapeTest extends TestCase {
             createReferenceShape(r, coordinates[i], false);
         }
         final MultiPolylines p = new MultiPolylines(polylines);
-        assertPathEquals(r.getPathIterator(null), p.getPathIterator(null), 
STRICT);
+        assertPathEquals(r.getPathIterator(null), p.getPathIterator(null), 
STRICT, STRICT, null);
     }
 
     /**
@@ -128,6 +128,6 @@ public final class FlatShapeTest extends TestCase {
         createReferenceShape(r, new double[]{4,5, 6,3, 8,5, 3,8, 7,5, 9,3, 
-2,5}, true);
         createReferenceShape(r, new double[]{3,5, 6,1, -2,7}, false);
         createReferenceShape(r, new double[]{3,8, 10,4, 6,4}, true);
-        assertPathEquals(r.getPathIterator(null), 
b.build().getPathIterator(null), STRICT);
+        assertPathEquals(r.getPathIterator(null), 
b.build().getPathIterator(null), STRICT, STRICT, null);
     }
 }