From 66938996d8ced275e03d9232ae91a559778f839d Mon Sep 17 00:00:00 2001 From: Klemek Date: Sun, 20 Jan 2019 14:15:35 +0100 Subject: [PATCH] Fixing tests for jdk9+ --- .../java/fr/klemek/logger/LoggerTest.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/test/java/fr/klemek/logger/LoggerTest.java b/src/test/java/fr/klemek/logger/LoggerTest.java index c6f37fe..ac504c3 100644 --- a/src/test/java/fr/klemek/logger/LoggerTest.java +++ b/src/test/java/fr/klemek/logger/LoggerTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.fail; public class LoggerTest { private static Path output = new File("output.log").toPath(); - private static int majorJavaVersion = LoggerTest.getMajorJavaVersion(); - private static String internalPackage = majorJavaVersion <= 8 ? "sun" : "java.base/jdk.internal"; + private static double javaVersion = Double.parseDouble(System.getProperty("java.specification.version")); + private static String internalPackage = javaVersion <= 8 ? "sun" : "java.base/jdk.internal"; @Test public void testLogException() { @@ -97,12 +97,6 @@ public class LoggerTest { }); } - @BeforeClass - public static void setUpClass() { - System.out.println("Java major version is " + majorJavaVersion); - System.out.println("internalPackage is " + internalPackage); - } - @Test public void testLogExceptionCustomLevel() { Logger.log(Level.WARNING, new Exception("custom exception")); @@ -119,11 +113,6 @@ public class LoggerTest { }); } - private static int getMajorJavaVersion() { - String[] javaVersionElements = System.getProperty("java.version").split("\\."); - return Integer.parseInt(javaVersionElements[1]); - } - @Test public void testLogExceptionCauseCustomLevel() { Logger.log(Level.WARNING, new Exception("custom exception", new Exception("custom cause"))); @@ -177,4 +166,10 @@ public class LoggerTest { } } + @BeforeClass + public static void setUpClass() { + System.out.println("Java major version is " + javaVersion); + System.out.println("internalPackage is " + internalPackage); + } + } \ No newline at end of file