Filip/bld
1
0
Fork 0
mirror of https://github.com/rife2/bld synced 2025-12-20 16:48:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed version parsing in tests

Browse source
This commit is contained in:
Erik C. Thauvin 2024-08-03 07:47:12 -07:00
parent 7a946b17d8
commit d029bb9b87
No known key found for this signature in database
GPG key ID: 776702A6A2DA330E
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/test/java/rife/bld/operations/TestJlinkOperation.java
View file

@ -114,7 +114,7 @@ public class TestJlinkOperation {
"src/test/resources/jlink/options_version.txt"); "src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jlink::execute); assertDoesNotThrow(jlink::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
@Test @Test
@ -147,6 +147,6 @@ public class TestJlinkOperation {
var jlink = new JlinkOperation().toolArgs("--verbose", "--version"); var jlink = new JlinkOperation().toolArgs("--verbose", "--version");
assertDoesNotThrow(jlink::execute); assertDoesNotThrow(jlink::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
} }

4
src/test/java/rife/bld/operations/TestJmodOperation.java
View file

@ -153,7 +153,7 @@ public class TestJmodOperation {
var jmod = new JmodOperation().fileOptions("src/test/resources/jlink/options_version.txt"); var jmod = new JmodOperation().fileOptions("src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jmod::execute); assertDoesNotThrow(jmod::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
@Test @Test
@ -162,6 +162,6 @@ public class TestJmodOperation {
var jmod = new JmodOperation().toolArgs("--version"); var jmod = new JmodOperation().toolArgs("--version");
assertDoesNotThrow(jmod::execute); assertDoesNotThrow(jmod::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
} }

4
src/test/java/rife/bld/operations/TestJpackageOperation.java
View file

@ -200,7 +200,7 @@ public class TestJpackageOperation {
"src/test/resources/jlink/options_version.txt"); "src/test/resources/jlink/options_version.txt");
assertDoesNotThrow(jpackage::execute); assertDoesNotThrow(jpackage::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
@Test @Test
@ -224,6 +224,6 @@ public class TestJpackageOperation {
var jpackage = new JpackageOperation().toolArgs("--verbose", "--version"); var jpackage = new JpackageOperation().toolArgs("--verbose", "--version");
assertDoesNotThrow(jpackage::execute); assertDoesNotThrow(jpackage::execute);
var out = outputStreamCaptor.toString(); var out = outputStreamCaptor.toString();
assertTrue(out.matches("\\d+.\\d+.\\d+[\\r\\n]+"), out); assertTrue(out.matches("[\\d.]+[\\r\\n]+"), out);
} }
} }