Fixed version parsing in tests

rife2 · Aug 3, 2024 · d029bb9 · d029bb9
1 parent 7a946b1
commit d029bb9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/test/java/rife/bld/operations/TestJlinkOperation.java b/src/test/java/rife/bld/operations/TestJlinkOperation.java
@@ -114,7 +114,7 @@ void testFileOptions() {
                 "src/test/resources/jlink/options_version.txt");
         assertDoesNotThrow(jlink::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 
     @Test
@@ -147,6 +147,6 @@ void testVersion() {
         var jlink = new JlinkOperation().toolArgs("--verbose", "--version");
         assertDoesNotThrow(jlink::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 }
diff --git a/src/test/java/rife/bld/operations/TestJmodOperation.java b/src/test/java/rife/bld/operations/TestJmodOperation.java
@@ -153,7 +153,7 @@ void testFileOptions() {
         var jmod = new JmodOperation().fileOptions("src/test/resources/jlink/options_version.txt");
         assertDoesNotThrow(jmod::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 
     @Test
@@ -162,6 +162,6 @@ void testVersion() {
         var jmod = new JmodOperation().toolArgs("--version");
         assertDoesNotThrow(jmod::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 }
diff --git a/src/test/java/rife/bld/operations/TestJpackageOperation.java b/src/test/java/rife/bld/operations/TestJpackageOperation.java
@@ -200,7 +200,7 @@ void testFileOptions() {
                 "src/test/resources/jlink/options_version.txt");
         assertDoesNotThrow(jpackage::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 
     @Test
@@ -224,6 +224,6 @@ void testVersion() {
         var jpackage = new JpackageOperation().toolArgs("--verbose", "--version");
         assertDoesNotThrow(jpackage::execute);
         var out = outputStreamCaptor.toString();
-        assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out);
+        assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
     }
 }