update java to add integer encoding tests

Author: drinckes

java/src/main/java/com/google/openlocationcode/OpenLocationCode.java

@@ -188,14 +188,6 @@ public OpenLocationCode(String code) {
    * @throws IllegalArgumentException if the code length is not valid.
    */
   public OpenLocationCode(double latitude, double longitude, int codeLength) {
-    // Limit the maximum number of digits in the code.
-    codeLength = Math.min(codeLength, MAX_DIGIT_COUNT);
-    // Check that the code length requested is valid.
-    if (codeLength < PAIR_CODE_LENGTH && codeLength % 2 == 1 || codeLength < MIN_DIGIT_COUNT) {
-      throw new IllegalArgumentException("Illegal code length " + codeLength);
-    }
-
-    // Compute the code.
     long[] integers = degreesToIntegers(latitude, longitude);
     this.code = encodeIntegers(integers[0], integers[1], codeLength);
   }
@@ -208,7 +200,13 @@ public OpenLocationCode(double latitude, double longitude, int codeLength) {
    * @param codeLength The requested number of digits.
    * @return The OLC for the location.
    */
-  private static String encodeIntegers(long lat, long lng, int codeLength) {
+  static String encodeIntegers(long lat, long lng, int codeLength) {
+    // Limit the maximum number of digits in the code.
+    codeLength = Math.min(codeLength, MAX_DIGIT_COUNT);
+    // Check that the code length requested is valid.
+    if (codeLength < PAIR_CODE_LENGTH && codeLength % 2 == 1 || codeLength < MIN_DIGIT_COUNT) {
+      throw new IllegalArgumentException("Illegal code length " + codeLength);
+    }
     // Store the code - we build it in reverse and reorder it afterwards.
     StringBuilder revCodeBuilder = new StringBuilder();
     // Compute the grid part of the code if necessary.

java/src/test/java/com/google/openlocationcode/EncodingTest.java

@@ -23,8 +23,10 @@ public class EncodingTest {
 
   private static class TestData {
 
-    private final double latitude;
-    private final double longitude;
+    private final double latitudeDegrees;
+    private final double longitudeDegrees;
+    private final long latitudeInteger;
+    private final long longitudeInteger;
     private final int length;
     private final String code;
 
@@ -33,10 +35,12 @@ public TestData(String line) {
       if (parts.length != 4) {
         throw new IllegalArgumentException("Wrong format of testing data.");
       }
-      this.latitude = Double.parseDouble(parts[0]);
-      this.longitude = Double.parseDouble(parts[1]);
-      this.length = Integer.parseInt(parts[2]);
-      this.code = parts[3];
+      this.latitudeDegrees = Double.parseDouble(parts[0]);
+      this.longitudeDegrees = Double.parseDouble(parts[1]);
+      this.latitudeInteger = Long.parseLong(parts[2]);
+      this.longitudeInteger = Long.parseLong(parts[3]);
+      this.length = Integer.parseInt(parts[4]);
+      this.code = parts[5];
     }
   }
 
@@ -61,9 +65,36 @@ public void testEncodeFromLatLong() {
       Assert.assertEquals(
           String.format(
               "Latitude %f, longitude %f and length %d were wrongly encoded.",
-              testData.latitude, testData.longitude, testData.length),
+              testData.latitudeDegrees, testData.longitudeDegrees, testData.length),
           testData.code,
-          OpenLocationCode.encode(testData.latitude, testData.longitude, testData.length));
+          OpenLocationCode.encode(testData.latitudeDegrees, testData.longitudeDegrees, testData.length));
+    }
+  }
+
+  @Test
+  public void testDegreesToIntegers() {
+    for (TestData testData : testDataList) {
+      long[] got = OpenLocationCode.degreesToIntegers(testData.latitudeDegrees, testData.longitudeDegrees);
+      Assert.assertEquals(
+          String.format("Latitude %f integer conversion is incorrect", testData.latitudeDegrees),
+          testData.latitudeInteger,
+          got[0]);
+      Assert.assertEquals(
+          String.format("Longitude %f integer conversion is incorrect", testData.longitudeDegrees),
+          testData.longitudeInteger,
+          got[1]);
+    }
+  }
+
+  @Test
+  public void testEncodeIntegers() {
+    for (TestData testData : testDataList) {
+      Assert.assertEquals(
+          String.format(
+              "Latitude %d, longitude %d and length %d were wrongly encoded.",
+              testData.latitudeInteger, testData.longitudeInteger, testData.length),
+          testData.code,
+          OpenLocationCode.encodeIntegers(testData.latitudeInteger, testData.longitudeInteger, testData.length));
     }
   }
 }