Fix Coordinate#toString, Update Coordinate Tests

Author: Gregory Mitchell

src/main/java/me/gamercoder215/calcgames/levelz/coord/Coordinate2D.java

@@ -125,11 +125,10 @@ public int hashCode() {
     @Override
     public String toString() {
         int xInt = (int) x, yInt = (int) y;
+        String xs = x == xInt ? String.valueOf(xInt) : String.valueOf(x);
+        String ys = y == yInt ? String.valueOf(yInt) : String.valueOf(y);
 
-        if (x == xInt && y == yInt)
-            return "[" + xInt + ", " + yInt + "]";
-        else
-            return "[" + x + ", " + y + "]";
+        return "[" + xs + ", " + ys + "]";
     }
 
     /**

src/main/java/me/gamercoder215/calcgames/levelz/coord/Coordinate3D.java

@@ -131,11 +131,11 @@ public int hashCode() {
     @Override
     public String toString() {
         int xInt = (int) x, yInt = (int) y, zInt = (int) z;
+        String xs = x == xInt ? String.valueOf(xInt) : String.valueOf(x);
+        String ys = y == yInt ? String.valueOf(yInt) : String.valueOf(y);
+        String zs = z == zInt ? String.valueOf(zInt) : String.valueOf(z);
 
-        if (x == xInt && y == yInt && z == zInt)
-            return "[" + xInt + ", " + yInt + ", " + zInt + "]";
-        else
-            return "[" + x + ", " + y + ", " + z + "]";
+        return "[" + xs + ", " + ys + ", " + zs + "]";
     }
 
     /**

src/test/java/me/gamercoder215/calcgames/levelz/coord/TestCoordinate2D.java

@@ -26,16 +26,20 @@ public void testFromString() {
         Assertions.assertEquals(new Coordinate2D(0.5, 1), Coordinate2D.fromString("[0.5, 1.0]"));
 
         Coordinate2D a = new Coordinate2D(0, 0);
-        Assertions.assertEquals(a.toString(), "[0.0, 0.0]");
+        Assertions.assertEquals(a.toString(), "[0, 0]");
         Assertions.assertEquals(a, Coordinate2D.fromString(a.toString()));
 
         Coordinate2D b = new Coordinate2D(3, 4);
-        Assertions.assertEquals(b.toString(), "[3.0, 4.0]");
+        Assertions.assertEquals(b.toString(), "[3, 4]");
         Assertions.assertEquals(b, Coordinate2D.fromString(b.toString()));
 
         Coordinate2D c = new Coordinate2D(2.5, -1.25);
         Assertions.assertEquals(c.toString(), "[2.5, -1.25]");
         Assertions.assertEquals(c, Coordinate2D.fromString(c.toString()));
+
+        Coordinate2D d = new Coordinate2D(-7, 9.5);
+        Assertions.assertEquals(d.toString(), "[-7, 9.5]");
+        Assertions.assertEquals(d, Coordinate2D.fromString(d.toString()));
     }
 
 }

src/test/java/me/gamercoder215/calcgames/levelz/coord/TestCoordinate3D.java

@@ -26,16 +26,20 @@ public void testFromString() {
         Assertions.assertEquals(new Coordinate3D(0.5, -1, -0.5), Coordinate3D.fromString("[0.5, -1.0, -0.5]"));
 
         Coordinate3D a = new Coordinate3D(0, 0, 0);
-        Assertions.assertEquals(a.toString(), "[0.0, 0.0, 0.0]");
+        Assertions.assertEquals(a.toString(), "[0, 0, 0]");
         Assertions.assertEquals(a, Coordinate3D.fromString(a.toString()));
 
-        Coordinate3D b = new Coordinate3D(3, 4, -2);
-        Assertions.assertEquals(b.toString(), "[3.0, 4.0, -2.0]");
+        Coordinate3D b = new Coordinate3D(3, 4, -2.5);
+        Assertions.assertEquals(b.toString(), "[3, 4, -2.5]");
         Assertions.assertEquals(b, Coordinate3D.fromString(b.toString()));
 
         Coordinate3D c = new Coordinate3D(2.5, -1.25, 12.5);
         Assertions.assertEquals(c.toString(), "[2.5, -1.25, 12.5]");
         Assertions.assertEquals(c, Coordinate3D.fromString(c.toString()));
+
+        Coordinate3D d = new Coordinate3D(-11, -45.75, 88);
+        Assertions.assertEquals(d.toString(), "[-11, -45.75, 88]");
+        Assertions.assertEquals(d, Coordinate3D.fromString(d.toString()));
     }
 
 }