Improved unit tests

Author: rijnb

src/main/java/com/mapcode/Mapcode.java

@@ -421,14 +421,14 @@ public int hashCode() {
     }
 
     @Override
-    public boolean equals(@Nullable final Object o) {
-        if (this == o) {
+    public boolean equals(@Nullable final Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (!(o instanceof Mapcode)) {
+        if (!(obj instanceof Mapcode)) {
             return false;
         }
-        final Mapcode that = (Mapcode) o;
+        final Mapcode that = (Mapcode) obj;
         return this.territory.equals(that.territory) &&
             this.codePrecision8.equals(that.codePrecision8);
     }

src/main/java/com/mapcode/Point.java

@@ -277,9 +277,12 @@ else if (lat > 180) {
             lat = 180;
         }
 
+        // Rounding factor.
+        final double fractionRounding = 0.1;
+
         // Lat now [0..180].
         lat = lat * LAT_TO_FRACTIONS_FACTOR;
-        double latFractionOnly = Math.floor(lat + 0.1);         // TODO: Check the + 0.1! Why?
+        double latFractionOnly = Math.floor(lat + fractionRounding);
         latMicroDeg = (int) (latFractionOnly / LAT_MICRODEG_TO_FRACTIONS_FACTOR);
         latFractionOnly = latFractionOnly - ((double) latMicroDeg * LAT_MICRODEG_TO_FRACTIONS_FACTOR);
         latFractionOnlyDeg = (int) latFractionOnly;
@@ -293,7 +296,7 @@ else if (lat > 180) {
 
         // Lon now in [0..360>.
         lon = lon * LON_TO_FRACTIONS_FACTOR;
-        double lonFractionOnly = Math.floor(lon + 0.1);         // TODO: Check the + 0.1! Why?
+        double lonFractionOnly = Math.floor(lon + fractionRounding);
         lonMicroDeg = (int) (lonFractionOnly / LON_MICRODEG_TO_FRACTIONS_FACTOR);
         lonFractionOnly = lonFractionOnly - ((double) lonMicroDeg * LON_MICRODEG_TO_FRACTIONS_FACTOR);
         lonFractionOnlyDeg = (int) lonFractionOnly;
@@ -327,6 +330,7 @@ int getLatFraction() {
     /**
      * Package private construction, from integer fractions (no loss of precision).
      */
+    @SuppressWarnings("NumericCastThatLosesPrecision")
     @Nonnull
     static Point fromLatLonFractions(final double latFraction, final double lonFraction) {
         final Point p = new Point();

src/test/java/com/mapcode/EncoderTest.java

@@ -24,7 +24,7 @@
 
 import static org.junit.Assert.assertEquals;
 
-@SuppressWarnings({"OverlyBroadThrowsClause", "ProhibitedExceptionDeclared"})
+@SuppressWarnings({"OverlyBroadThrowsClause", "ProhibitedExceptionDeclared", "ValueOfIncrementOrDecrementUsed"})
 public class EncoderTest {
     private static final Logger LOG = LoggerFactory.getLogger(EncoderTest.class);
 
@@ -173,21 +173,26 @@ public void encodeToShortest1() throws Exception {
 
         // test extremely precise encoding
         {
-          double lat2 = 52.3, lon2 = 4.908;
-          Mapcode m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD") );
-          assertEquals("NLD GG.NBC-SHR33333", m.getCodeWithTerritory(8));
-          lat2 = 52.3000004; lon2 = 4.9080004;
-          m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD") );
-          assertEquals("NLD GG.NBC-SHSS1010", m.getCodeWithTerritory(8));
-          lat2 = 52.299999999; lon2 = 4.907999999;
-          m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD") );
-          assertEquals("NLD GG.NBC-SHLWXWQB", m.getCodeWithTerritory(8));
-          lat2 = 52.29993200000; lon2 = 4.90786600000;
-          m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD") );
-          assertEquals("NLD GG.NBC-00000000", m.getCodeWithTerritory(8));
-          lat2 = 52.29993200000; lon2 = 4.9078659999999;
-          m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD") );
-          assertEquals("NLD GG.N98-45454545", m.getCodeWithTerritory(8));          
+            double lat2 = 52.3;
+            double lon2 = 4.908;
+            Mapcode m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD"));
+            assertEquals("NLD GG.NBC-SHR33333", m.getCodeWithTerritory(8));
+            lat2 = 52.3000004;
+            lon2 = 4.9080004;
+            m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD"));
+            assertEquals("NLD GG.NBC-SHSS1010", m.getCodeWithTerritory(8));
+            lat2 = 52.299999999;
+            lon2 = 4.907999999;
+            m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD"));
+            assertEquals("NLD GG.NBC-SHLWXWQB", m.getCodeWithTerritory(8));
+            lat2 = 52.29993200000;
+            lon2 = 4.90786600000;
+            m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD"));
+            assertEquals("NLD GG.NBC-00000000", m.getCodeWithTerritory(8));
+            lat2 = 52.29993200000;
+            lon2 = 4.9078659999999;
+            m = MapcodeCodec.encodeToShortest(lat2, lon2, Territory.fromString("NLD"));
+            assertEquals("NLD GG.N98-45454545", m.getCodeWithTerritory(8));
         }
     }
 
@@ -223,13 +228,14 @@ public void encodeToShortest4() throws Exception {
         MapcodeCodec.encodeToShortest(lat, lon, Territory.NLD);
     }
 
+    @SuppressWarnings("MisorderedAssertEqualsArguments")
     @Test
     public void legalArguments() {
         LOG.info("legalArguments");
         assertEquals(MapcodeCodec.encode(-90, 0).size(), 3); // 2 x ATA and AAA
         assertEquals(MapcodeCodec.encode(-60, 0).size(), 2); // ATA and AAA
         assertEquals(MapcodeCodec.encode(90, 0).size(), 1); // AAA only
-        assertEquals(MapcodeCodec.encode(0, -180),MapcodeCodec.encode(0, 180));
+        assertEquals(MapcodeCodec.encode(0, -180), MapcodeCodec.encode(0, 180));
         assertEquals(MapcodeCodec.encode(-91, 0), MapcodeCodec.encode(-90, 0));
         assertEquals(MapcodeCodec.encode(91, 0), MapcodeCodec.encode(90, 0));
         assertEquals(MapcodeCodec.encode(0, -181), MapcodeCodec.encode(0, 179));