improve point equals & hashcode

Author: JasperGeurtz

src/main/java/bwapi/Point.java

@@ -36,11 +36,12 @@ protected double getDistance(final int x, final int y) {
     }
 
     public boolean equals(final Object o) {
-        if (!(o instanceof Point)) {
-            return false;
+        if (o != null && this.getClass().equals(o.getClass())) {
+            final Point point = (Point) o;
+            return x == point.x && y == point.y;
         }
-        final Point point = (Point) o;
-        return scalar == point.scalar && x == point.x && y == point.y;
+        return false;
+
     }
 
     /**
@@ -53,7 +54,6 @@ public boolean isValid(final Game game) {
     }
 
     public int hashCode() {
-        //alternatively return Objects.hash(x, y); ?
-        return (x << 16) + y;
+        return (x << 16) ^ y;
     }
 }

src/test/java/bwapi/PointTest.java

@@ -0,0 +1,23 @@
+package bwapi;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+
+public class PointTest {
+	
+	@Test
+	public void pointEqualsTest() {
+		assertEquals(new TilePosition(1, 1), new TilePosition(1, 1));
+
+		assertNotEquals(new TilePosition(1, 1), new TilePosition(1, 2));
+		assertNotEquals(new TilePosition(1, 1), new TilePosition(2, 1));
+		assertNotEquals(new TilePosition(1, 1), new TilePosition(2, 2));
+
+		assertNotEquals(new TilePosition(1, 1), new Position(1, 1));
+
+		assertNotEquals(new TilePosition(1, 1), null);
+	}
+}

src/test/java/bwapi/UnitTypeContainerTest.java

@@ -1,25 +1,24 @@
 package bwapi;
 
-
-
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
+
 public class UnitTypeContainerTest {
+
     @Test
     public void checkContainerSizes() {
         final int expected = UnitType.values().length;
-        Assert.assertEquals(UnitTypeContainer.defaultArmorAmount.length, expected);
-        Assert.assertEquals(UnitTypeContainer.defaultOreCost.length, expected);
-        Assert.assertEquals(UnitTypeContainer.defaultGasCost.length, expected);
-        Assert.assertEquals(UnitTypeContainer.defaultTimeCost.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitSupplyProvided.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitSupplyRequired.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitSpaceRequired.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitSpaceProvided.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitBuildScore.length, expected);
-        Assert.assertEquals(UnitTypeContainer.unitDestroyScore.length, expected);
+        assertEquals(UnitTypeContainer.defaultArmorAmount.length, expected);
+        assertEquals(UnitTypeContainer.defaultOreCost.length, expected);
+        assertEquals(UnitTypeContainer.defaultGasCost.length, expected);
+        assertEquals(UnitTypeContainer.defaultTimeCost.length, expected);
+        assertEquals(UnitTypeContainer.unitSupplyProvided.length, expected);
+        assertEquals(UnitTypeContainer.unitSupplyRequired.length, expected);
+        assertEquals(UnitTypeContainer.unitSpaceRequired.length, expected);
+        assertEquals(UnitTypeContainer.unitSpaceProvided.length, expected);
+        assertEquals(UnitTypeContainer.unitBuildScore.length, expected);
+        assertEquals(UnitTypeContainer.unitDestroyScore.length, expected);
     }
 }