Changeset 31795 in osm for applications/editors

Timestamp:

2015-12-03T22:27:47+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Add tests for TrafficoSign

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyph.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSign.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyphTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSignTest.java (added)
• test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

@@ -37 +37 @@
         "Bearer " + Main.pref.get("mapillary.access-token"));
 
-    BufferedReader in = new BufferedReader(new InputStreamReader(
-        con.getInputStream()));
-    return Json.createReader(in).readObject();
+    try (
+      BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()))
+    ) {
+      return Json.createReader(in).readObject();
+    }
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyph.java

@@ -10 +10 @@
 import javax.json.JsonReader;
 
-public class TrafficoGlyph {
+public final class TrafficoGlyph {
   private TrafficoGlyph() {
     // private constructor to avoid instantiation

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoSign.java

@@ -9 +9 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 import javax.json.Json;
@@ -15 +14 @@
 import javax.json.JsonObject;
 
-public class TrafficoSign {
-  private static final Map<String, String> isIn = new TreeMap<>();
-
-  static {
-    isIn.put("be", "europe");
-    isIn.put("de", "europe");
-    isIn.put("dk", "europe");
-    isIn.put("es", "europe");
+public final class TrafficoSign {
+  private TrafficoSign() {
+    // private constructor to avoid instantiation
   }
 
@@ -31 +25 @@
       System.out.println("Read signs for " + country);
       InputStream countryStream = TrafficoSign.class
-          .getResourceAsStream("/data/fonts/traffico/signs/" + country
-              + ".json");
+          .getResourceAsStream("/data/fonts/traffico/signs/" + country + ".json");
       if (countryStream == null) {
         return null;
@@ -89 +82 @@
       return signs.get(country).get(signName);
     }
-    if (isIn.containsKey(country)) {
-      return TrafficoSign.getSign(isIn.get(country), signName);
-    }
     return null;
   }

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/traffico/TrafficoGlyphTest.java

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 
-import java.lang.reflect.Constructor;
-
 import org.junit.Test;
+import org.openstreetmap.josm.plugins.mapillary.utils.TestUtil;
 
 public class TrafficoGlyphTest {
@@ -17 +16 @@
   }
 
-  /**
-   * The following test has the only purpose to provide code coverage for the private constructor.
-   */
   @Test
-  public void testPrivateConstructor() throws Exception {
-    Constructor<?> c = TrafficoGlyph.class.getDeclaredConstructors()[0];
-    c.setAccessible(true);
-    c.newInstance();
+  public void testUtilityClass() {
+    TestUtil.testUtilityClass(TrafficoGlyph.class);
   }
 

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/TestUtil.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary.utils;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 import org.openstreetmap.josm.Main;
@@ -41 +47 @@
   }
 
+  /**
+   * This method tests utility classes for common coding standards (exactly one constructor that's private,
+   * only static methods, …) and fails the current test if one of those standards is not met.
+   * This is inspired by http://stackoverflow.com/questions/4520216 .
+   * @param c the class under test
+   */
+  public static void testUtilityClass(final Class<?> c) {
+    try {
+      // class must be final
+      assertTrue(Modifier.isFinal(c.getModifiers()));
+      // with exactly one constructor
+      assertEquals(1, c.getDeclaredConstructors().length);
+      final Constructor<?> constructor = c.getDeclaredConstructors()[0];
+      // constructor has to be private
+      assertTrue(!constructor.isAccessible() && Modifier.isPrivate(constructor.getModifiers()));
+      constructor.setAccessible(true);
+      // Call private constructor for code coverage
+      constructor.newInstance();
+      for (Method m : c.getMethods()) {
+        // Check if all methods are static
+        assertTrue(m.getDeclaringClass() != c || Modifier.isStatic(m.getModifiers()));
+      }
+    } catch (Exception e) {
+      assertTrue(e.getMessage(), false);
+    }
+  }
 }