Merge pull request #5671 from ropalka/WFCORE-6506

[WFCORE-6506] Initial Java releases contain neither minor nor micro part in the version string - adjusting tests
wildfly · Sep 20, 2023 · 91c7baa · 91c7baa
2 parents ef07287 + 17a25bf
commit 91c7baa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...oller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java b/...oller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
@@ -121,7 +121,7 @@ public void testCreateConfiguration() throws UnknownHostException {
     private static int getJavaVersion() throws NumberFormatException {
         final String versionString = System.getProperty("java.version");
         int indexOfDot = versionString.indexOf('.');
-        return Integer.valueOf(versionString.substring(0, indexOfDot)).intValue();
+        return Integer.valueOf(indexOfDot > 0 ? versionString.substring(0, indexOfDot) : versionString).intValue();
     }
 
     /**

diff --git a/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java b/launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
@@ -293,7 +293,7 @@ private void testJPMSArguments(final Collection<String> command, final int expec
     private static int getJavaVersion() throws NumberFormatException {
         final String versionString = System.getProperty("java.version");
         int indexOfDot = versionString.indexOf('.');
-        return Integer.valueOf(versionString.substring(0, indexOfDot)).intValue();
+        return Integer.valueOf(indexOfDot > 0 ? versionString.substring(0, indexOfDot) : versionString).intValue();
     }
 
     private void testModularJvmArguments(final Collection<String> command, final int expectedCount) {