46 broken hashcode implementation in icon (#47)

* Issue 46 - fix broken Icon hashCode - move to non-deprecated junit methods * Issue 46 - release 3.0.9 --------- Co-authored-by: Mark Wickens <[email protected]>
urbancamo · Apr 26, 2024 · edb1135 · edb1135
1 parent 1a9788f
commit edb1135
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>uk.m0nom</groupId>
   <artifactId>javaapiforkml</artifactId>
-  <version>3.0.9-SNAPSHOT</version>
+  <version>3.0.9</version>
   <packaging>jar</packaging>
   <name>Java Api for Kml</name>
   <description>This is JavaApiForKml, Micromata's library for use with applications that want to parse, generate and

diff --git a/src/main/java/de/micromata/opengis/kml/v_2_2_0/Icon.java b/src/main/java/de/micromata/opengis/kml/v_2_2_0/Icon.java
@@ -419,13 +419,19 @@ public int hashCode() {
         int result = super.hashCode();
         long temp;
         result = ((prime*result)+((refreshMode == null)? 0 :refreshMode.hashCode()));
-        temp = Double.doubleToLongBits(refreshInterval);
-        result = ((prime*result)+((int)(temp^(temp >>>(32)))));
+        if (refreshInterval != null) {
+            temp = Double.doubleToLongBits(refreshInterval);
+            result = ((prime * result) + ((int) (temp ^ (temp >>> (32)))));
+        }
         result = ((prime*result)+((viewRefreshMode == null)? 0 :viewRefreshMode.hashCode()));
-        temp = Double.doubleToLongBits(viewRefreshTime);
-        result = ((prime*result)+((int)(temp^(temp >>>(32)))));
-        temp = Double.doubleToLongBits(viewBoundScale);
-        result = ((prime*result)+((int)(temp^(temp >>>(32)))));
+        if (viewRefreshTime != null) {
+            temp = Double.doubleToLongBits(viewRefreshTime);
+            result = ((prime * result) + ((int) (temp ^ (temp >>> (32)))));
+        }
+        if (viewBoundScale != null) {
+            temp = Double.doubleToLongBits(viewBoundScale);
+            result = ((prime * result) + ((int) (temp ^ (temp >>> (32)))));
+        }
         result = ((prime*result)+((viewFormat == null)? 0 :viewFormat.hashCode()));
         result = ((prime*result)+((httpQuery == null)? 0 :httpQuery.hashCode()));
         result = ((prime*result)+((linkSimpleExtension == null)? 0 :linkSimpleExtension.hashCode()));

diff --git a/src/test/java/de/micromata/jak/AtsConformanceLevel1Test.java b/src/test/java/de/micromata/jak/AtsConformanceLevel1Test.java
@@ -20,7 +20,7 @@
 
 import jakarta.xml.bind.annotation.XmlRootElement;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/test/java/de/micromata/jak/AtsConformanceLevel2Test.java b/src/test/java/de/micromata/jak/AtsConformanceLevel2Test.java
@@ -5,7 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

diff --git a/src/test/java/de/micromata/jak/AtsConformanceLevel3Test.java b/src/test/java/de/micromata/jak/AtsConformanceLevel3Test.java
@@ -17,7 +17,7 @@
 
 import java.lang.reflect.Field;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

diff --git a/src/test/java/de/micromata/jak/Utils.java b/src/test/java/de/micromata/jak/Utils.java
@@ -39,6 +39,8 @@
 public final class Utils {
 	private static final Logger LOG = LoggerFactory.getLogger(Utils.class.getName());
 
+	public static final double DOUBLE_CHECK_DELTA = 0.0001d;
+
 	/**
 	 * java.util.List<de.micromata.opengis.kml.v_2_2_0.Coordinate> --> de.micromata.opengis.kml.v_2_2_0.Coordinate
 	 *

diff --git a/src/test/java/de/micromata/jak/examples/CloneTest.java b/src/test/java/de/micromata/jak/examples/CloneTest.java
@@ -3,7 +3,7 @@
 import java.io.File;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
@@ -16,6 +16,8 @@
 import de.micromata.opengis.kml.v_2_2_0.Placemark;
 import de.micromata.opengis.kml.v_2_2_0.Polygon;
 
+import static de.micromata.jak.Utils.DOUBLE_CHECK_DELTA;
+
 public class CloneTest {
 
   @Test
@@ -54,15 +56,15 @@ public void testClonePlacemark() {
         double longitude = c.getLongitude();
         double latitude = c.getLatitude();
         double altitude = c.getAltitude();
-        Assert.assertEquals(c.getLongitude(), coordinates.get(j).getLongitude());
-        Assert.assertEquals(c.getLatitude(), coordinates.get(j).getLatitude());
-        Assert.assertEquals(c.getAltitude(), coordinates.get(j).getAltitude());
+        Assert.assertEquals(c.getLongitude(), coordinates.get(j).getLongitude(), DOUBLE_CHECK_DELTA);
+        Assert.assertEquals(c.getLatitude(), coordinates.get(j).getLatitude(), DOUBLE_CHECK_DELTA);
+        Assert.assertEquals(c.getAltitude(), coordinates.get(j).getAltitude(), DOUBLE_CHECK_DELTA);
         c.setLongitude(0);
         c.setLatitude(0);
         c.setAltitude(0);
-        Assert.assertEquals(longitude, coordinates.get(j).getLongitude());
-        Assert.assertEquals(latitude, coordinates.get(j).getLatitude());
-        Assert.assertEquals(altitude, coordinates.get(j).getAltitude());
+        Assert.assertEquals(longitude, coordinates.get(j).getLongitude(), DOUBLE_CHECK_DELTA);
+        Assert.assertEquals(latitude, coordinates.get(j).getLatitude(), DOUBLE_CHECK_DELTA);
+        Assert.assertEquals(altitude, coordinates.get(j).getAltitude(), DOUBLE_CHECK_DELTA);
 
       }
       if (!p.getInnerBoundaryIs().isEmpty()) {
@@ -75,15 +77,15 @@ public void testClonePlacemark() {
             double longitude = c.getLongitude();
             double latitude = c.getLatitude();
             double altitude = c.getAltitude();
-            Assert.assertEquals(c.getLongitude(), coordinatesInner.get(k).getLongitude());
-            Assert.assertEquals(c.getLatitude(), coordinatesInner.get(k).getLatitude());
-            Assert.assertEquals(c.getAltitude(), coordinatesInner.get(k).getAltitude());
+            Assert.assertEquals(c.getLongitude(), coordinatesInner.get(k).getLongitude(), DOUBLE_CHECK_DELTA);
+            Assert.assertEquals(c.getLatitude(), coordinatesInner.get(k).getLatitude(), DOUBLE_CHECK_DELTA);
+            Assert.assertEquals(c.getAltitude(), coordinatesInner.get(k).getAltitude(), DOUBLE_CHECK_DELTA);
             c.setLongitude(0);
             c.setLatitude(0);
             c.setAltitude(0);
-            Assert.assertEquals(longitude, coordinatesInner.get(k).getLongitude());
-            Assert.assertEquals(latitude, coordinatesInner.get(k).getLatitude());
-            Assert.assertEquals(altitude, coordinatesInner.get(k).getAltitude());
+            Assert.assertEquals(longitude, coordinatesInner.get(k).getLongitude(), DOUBLE_CHECK_DELTA);
+            Assert.assertEquals(latitude, coordinatesInner.get(k).getLatitude(), DOUBLE_CHECK_DELTA);
+            Assert.assertEquals(altitude, coordinatesInner.get(k).getAltitude(), DOUBLE_CHECK_DELTA);
           }
           polygon.addToInnerBoundaryIs(innerBoundary);
         }

diff --git a/src/test/java/de/micromata/opengis/kml/v_2_2_0/IconTest.java b/src/test/java/de/micromata/opengis/kml/v_2_2_0/IconTest.java
@@ -0,0 +1,14 @@
+package de.micromata.opengis.kml.v_2_2_0;
+
+import org.junit.Test;
+
+public class IconTest {
+   @Test
+    public void hashCodeTest() {
+        Icon icon1 = new Icon();
+        Icon icon2 = new Icon();
+
+        // Ensure we don't get an NPE
+        assert(icon1.hashCode() == icon2.hashCode());
+   }
+}