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

Timestamp:

2016-06-07T21:26:44+02:00 (8 years ago)

Author:

Don-vip

Message:

fix equals methods for Coordinate classes

Location:

trunk/test/unit/org/openstreetmap/josm/data/coor

Files:

• CachedLatLonTest.java (added)
• LatLonTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+
+import java.text.DecimalFormat;
 
 import org.junit.Before;
@@ -9 +11 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
@@ -120 +123 @@
 
     /**
-     * Test of {@link LatLon#equals}
+     * Unit test of methods {@link LatLon#equals} and {@link LatLon#hashCode}.
      */
     @Test
-    public void testEquals() {
-        for (int i = 1; i < SAMPLE_VALUES.length; i++) {
-            LatLon a = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
-            LatLon b = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
-            assertEquals(a, b);
-        }
-    }
-
-    /**
-     * Test of {@link LatLon#hashCode}
-     */
-    @Test
-    public void testHashCode() {
-        for (int i = 1; i < SAMPLE_VALUES.length; i++) {
-            LatLon a = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
-            LatLon b = new LatLon(SAMPLE_VALUES[i-1], SAMPLE_VALUES[i]);
-            assertEquals(a.hashCode(), b.hashCode());
-        }
+    public void equalsContract() {
+        EqualsVerifier.forClass(LatLon.class).usingGetClass()
+            .withPrefabValues(DecimalFormat.class, new DecimalFormat("00.0"), new DecimalFormat("00.000"))
+            .verify();
     }