Changeset 12130 in josm for trunk/test/unit/org/openstreetmap/josm/tools

Timestamp:

2017-05-13T00:56:58+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11924 - do not try old workaround with java 9 (pollutes console with stacktrace)

File:

• trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -196 +196 @@
 
     /**
+     * Test {@link Utils#getJavaVersion}
+     */
+    @Test
+    public void testGetJavaVersion() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            System.setProperty("java.version", "1.8.0_72-ea");
+            assertEquals(8, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9-ea");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9");
+            assertEquals(9, Utils.getJavaVersion());
+
+            System.setProperty("java.version", "9.0.1");
+            assertEquals(9, Utils.getJavaVersion());
+        } finally {
+            System.setProperty("java.version", javaVersion);
+        }
+    }
+
+    /**
      * Tests if readBytesFromStream handles null streams (might happen when there is no data on error stream)
      * @throws IOException in case of I/O error