Changeset 10334 in josm

Timestamp:

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

Author:

Don-vip

Message:

fix equals methods for Coordinate classes

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/coor/CachedLatLon.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/coor/EastNorth.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/coor/LatLon.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/data/coor/CachedLatLonTest.java (added)
• test/unit/org/openstreetmap/josm/data/coor/LatLonTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.coor;
+
+import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -54 +56 @@
      */
     public final EastNorth getEastNorth() {
-        if (proj != Main.getProjection()) {
+        if (!Objects.equals(proj, Main.getProjection())) {
             proj = Main.getProjection();
             eastNorth = proj.latlon2eastNorth(this);
@@ -62 +64 @@
 
     @Override
+    public int hashCode() {
+        return Objects.hash(x, y, eastNorth);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj))
+            return false;
+        CachedLatLon other = (CachedLatLon) obj;
+        return Objects.equals(eastNorth, other.eastNorth);
+    }
+
+    @Override
     public String toString() {
         return "CachedLatLon[lat="+lat()+",lon="+lon()+']';

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -13 +13 @@
     private static final long serialVersionUID = 1L;
 
+    /**
+     * Constructs a new {@code EastNorth}.
+     * @param east easting
+     * @param north northing
+     */
     public EastNorth(double east, double north) {
         super(east, north);
     }
 
+    /**
+     * Returns easting.
+     * @return easting
+     */
     public double east() {
         return x;
     }
 
+    /**
+     * Returns northing.
+     * @return northing
+     */
     public double north() {
         return y;
@@ -53 +66 @@
     }
 
+    /**
+     * Scales this {@link EastNorth} instance to a given factor and returns the result.
+     * @param s factor
+     * @return The result.
+     */
     public EastNorth scale(double s) {
         return new EastNorth(s * x, s * y);

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -56 +56 @@
     public static final LatLon ZERO = new LatLon(0, 0);
 
-    /**
-     * North and south pole.
-     */
+    /** North pole. */
     public static final LatLon NORTH_POLE = new LatLon(90, 0);
+    /** South pole. */
     public static final LatLon SOUTH_POLE = new LatLon(-90, 0);
 
@@ -227 +226 @@
     }
 
-
     /**
      * Returns the latitude, i.e., the north-south position in degrees.
@@ -487 +485 @@
     public boolean equals(Object obj) {
         if (this == obj) return true;
-        if (!(obj instanceof LatLon)) return false;
+        if (obj == null || getClass() != obj.getClass()) return false;
         LatLon that = (LatLon) obj;
         return Double.compare(that.x, x) == 0 &&
-                Double.compare(that.y, y) == 0;
+               Double.compare(that.y, y) == 0;
     }
 

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();
     }