From 3cb6624aa6c923e7ba9f8461803b30d228d3eba6 Mon Sep 17 00:00:00 2001 From: sharifi Date: Wed, 12 May 2021 08:41:27 +0430 Subject: [PATCH] bael-4909: update test case --- .../com/baeldung/version/VersionUnitTest.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java index 5d82346e03..fb7d5647a5 100644 --- a/core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java +++ b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java @@ -18,15 +18,14 @@ public class VersionUnitTest { @Test @Disabled("Only valid for Java 8 and lower") public void givenJava_whenUsingCommonsLang_thenGetVersion() { - String expectedVersion = "8"; - String version = SystemUtils.JAVA_SPECIFICATION_VERSION; - if (version.startsWith("1.")) { - version = version.substring(2, 3); + int expectedVersion = 8; + String[] versionElements = SystemUtils.JAVA_SPECIFICATION_VERSION.split("\\."); + int discard = Integer.parseInt(versionElements[0]); + int version; + if (discard == 1) { + version = Integer.parseInt(versionElements[1]); } else { - int separator = version.indexOf("."); - if (separator != -1) { - version = version.substring(0, separator); - } + version = discard; } Assertions.assertThat(version).isEqualTo(expectedVersion); } @@ -34,15 +33,14 @@ public class VersionUnitTest { @Test @Disabled("Only valid for Java 8 and lower") public void givenJava_whenUsingSystemProp_thenGetVersion() { - String expectedVersion = "8"; - String version = System.getProperty("java.version"); - if (version.startsWith("1.")) { - version = version.substring(2, 3); + int expectedVersion = 8; + String[] versionElements = System.getProperty("java.version").split("\\."); + int discard = Integer.parseInt(versionElements[0]); + int version; + if (discard == 1) { + version = Integer.parseInt(versionElements[1]); } else { - int separator = version.indexOf("."); - if (separator != -1) { - version = version.substring(0, separator); - } + version = discard; } Assertions.assertThat(version).isEqualTo(expectedVersion); }