Changeset 18777 in josm for trunk/test/unit/org

Timestamp:

2023-07-20T22:21:29+02:00 (16 months ago)

Author:

taylor.smock

Message:

Reduce allocations during startup from Shape

Shape#hashCode made between 8 and 24 MB of allocations at startup. This was
reduced by moving the math out of Arrays#hash and the default List#hash methods.
This additionally reduced the allocations from the Shape#equals method.

As an implementation note, the Shape#hashCode method returns exactly the same
hashcode as it did prior to this change. This may change in the future.

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/ShapeTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/ShapeTest.java

@@ -5 +5 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.awt.Polygon;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Objects;
 
+import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -53 +57 @@
                 () -> assertEquals(coordinate, shape.getPoints().get(1).getLat()));
     }
+
+    /**
+     * Ensure that the hashcode is semantically the same as what it previously was
+     */
+    @ParameterizedTest
+    @ValueSource(strings = {"47.1 11.1 47.2 11.2 47.3 11.3", "-47.1 -11.1 -47.2 -11.2 -47.3 -11.3"})
+    void testHashCode(String shapeString) {
+        final Shape shape = new Shape(shapeString, " ");
+        assertEquals(Objects.hash(shape.getPoints()), shape.hashCode(),
+                "The hashcode for shape should be the same as that for the point list (specific coord list)");
+        assertEquals(Objects.hash(new ArrayList<>(shape.getPoints())), shape.hashCode(),
+                "The hashcode for shape should be the same as that for the point list (non-specific)");
+    }
+
+    @Test
+    void testEqualsHashCodeContract() {
+        EqualsVerifier.simple().forClass(Shape.class)
+                .withNonnullFields("coords")
+                .withPrefabValues(Polygon.class, new Polygon(), new Polygon(new int[] {1, 2, 3}, new int[]{4, 5, 6}, 3))
+                .verify();
+    }
 }