From 3315e4bedde8d21f3707f26ba413f18ec894e351 Mon Sep 17 00:00:00 2001 From: sharifi Date: Wed, 5 May 2021 09:50:45 +0430 Subject: [PATCH 1/3] bael-4909: add unit test --- core-java-modules/core-java-11-2/pom.xml | 6 +++ .../com/baeldung/version/VersionUnitTest.java | 50 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml index b92963a5c8..4a65b113af 100644 --- a/core-java-modules/core-java-11-2/pom.xml +++ b/core-java-modules/core-java-11-2/pom.xml @@ -51,6 +51,11 @@ ${junit.jupiter.version} test + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + @@ -74,6 +79,7 @@ 5.7.0 3.17.2 5.11.1 + 3.12.0 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 new file mode 100644 index 0000000000..b347118df2 --- /dev/null +++ b/core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionUnitTest.java @@ -0,0 +1,50 @@ +package com.baeldung.version; + +import org.apache.commons.lang3.SystemUtils; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +public class VersionUnitTest { + + @Test + public void givenJava_whenUsingRuntime_thenGetVersion() { + String expectedVersion = "11"; + Runtime.Version runtimeVersion = Runtime.version(); + String version = String.valueOf(runtimeVersion.version().get(0)); + Assertions.assertThat(version).isEqualTo(expectedVersion); + } + + @Test + @Disabled("Disabled until Java version is 11") + public void givenJava_whenUsingCommonsLang_thenGetVersion() { + String expectedVersion = "8"; + String version = SystemUtils.JAVA_SPECIFICATION_VERSION; + if (version.startsWith("1.")) { + version = version.substring(2, 3); + } else { + int separator = version.indexOf("."); + if (separator != -1) { + version = version.substring(0, separator); + } + } + Assertions.assertThat(version).isEqualTo(expectedVersion); + } + + @Test + @Disabled("Disabled until Java version is 11") + public void givenJava_whenUsingSystemProp_thenGetVersion() { + String expectedVersion = "8"; + String version = System.getProperty("java.version"); + if (version.startsWith("1.")) { + version = version.substring(2, 3); + } else { + int separator = version.indexOf("."); + if (separator != -1) { + version = version.substring(0, separator); + } + } + Assertions.assertThat(version).isEqualTo(expectedVersion); + } +} + From 2a636b94f1f01689bb229ec385ad6e60d625f7c6 Mon Sep 17 00:00:00 2001 From: sharifi Date: Thu, 6 May 2021 15:56:37 +0430 Subject: [PATCH 2/3] bael-4909: update @Disabled comments --- .../src/test/java/com/baeldung/version/VersionUnitTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b347118df2..5d82346e03 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 @@ -16,7 +16,7 @@ public class VersionUnitTest { } @Test - @Disabled("Disabled until Java version is 11") + @Disabled("Only valid for Java 8 and lower") public void givenJava_whenUsingCommonsLang_thenGetVersion() { String expectedVersion = "8"; String version = SystemUtils.JAVA_SPECIFICATION_VERSION; @@ -32,7 +32,7 @@ public class VersionUnitTest { } @Test - @Disabled("Disabled until Java version is 11") + @Disabled("Only valid for Java 8 and lower") public void givenJava_whenUsingSystemProp_thenGetVersion() { String expectedVersion = "8"; String version = System.getProperty("java.version"); From d69e133c0e204727548ecde0d15f47c9322a74e6 Mon Sep 17 00:00:00 2001 From: sharifi Date: Wed, 12 May 2021 08:41:27 +0430 Subject: [PATCH 3/3] 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); }