B ImageApprovalWriter can handle version strings like "19-ea"

Author: LarsEckart

approvaltests-util-tests/src/test/java/com/spun/util/NumberUtilsTest.java

@@ -1,5 +1,6 @@
 package com.spun.util;
 
+import org.approvaltests.Approvals;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -62,4 +63,11 @@ private void assertDoubleStream(DoubleStream stream)
   {
     assertTrue(stream instanceof DoubleStream);
   }
+  @Test
+  void testStripNonNumeric()
+  {
+    String[] inputs = {"11.0", "19-ea", "", null, "19", "1.8.0"};
+    Approvals.verifyAll("Strip non numeric", inputs,
+        s -> String.format("%s -> %s", s, NumberUtils.stripNonNumeric(s)));
+  }
 }

approvaltests-util-tests/src/test/java/com/spun/util/NumberUtilsTest.testStripNonNumeric.approved.txt

@@ -0,0 +1,9 @@
+Strip non numeric
+
+
+11.0 -> 11.0
+19-ea -> 19
+ -> 
+null -> null
+19 -> 19
+1.8.0 -> 1.80

approvaltests-util/src/main/java/com/spun/util/NumberUtils.java

@@ -208,6 +208,41 @@ public static double convertPercentageToDouble(double percent)
   {
     return percent / 100;
   }
+  public static String stripNonNumeric(String input)
+  {
+    if (input == null)
+    { return null; }
+    StringBuffer result = new StringBuffer();
+    int periods = 0;
+    for (int i = 0; i < input.length(); i++)
+    {
+      char c = input.charAt(i);
+      switch (c)
+      {
+        case '0' :
+        case '1' :
+        case '2' :
+        case '3' :
+        case '4' :
+        case '5' :
+        case '6' :
+        case '7' :
+        case '8' :
+        case '9' :
+          result.append(c);
+          break;
+        case '.' :
+          if (periods < 1)
+          {
+            result.append(c);
+            periods++;
+          }
+        default :
+          break;
+      }
+    }
+    return result.toString();
+  }
   /* INNER CLASS */
   public static class Shuffler implements java.util.Comparator<Shuffler>, Serializable
   {

approvaltests/src/main/java/org/approvaltests/writers/ImageApprovalWriter.java

@@ -1,5 +1,6 @@
 package org.approvaltests.writers;
 
+import com.spun.util.NumberUtils;
 import com.spun.util.ObjectUtils;
 import org.approvaltests.core.ApprovalWriter;
 import org.approvaltests.namer.NamedEnvironment;
@@ -24,7 +25,9 @@ public static NamedEnvironment asJreAware()
   private static String getJreInformation()
   {
     String javaVersion = System.getProperty("java.version");
-    int major = Integer.parseInt(javaVersion.split("\\.")[0]);
+    String majorVersion = javaVersion.split("\\.")[0];
+    majorVersion = NumberUtils.stripNonNumeric(majorVersion);
+    int major = Integer.parseInt(majorVersion);
     return major < 11 ? "jdkPre11" : "jdkPost11";
   }
   @Override