Skip to content

Commit 3e5d107

Browse files
Fix ITs for Maven 4 rc-3
1 parent a83bcdd commit 3e5d107

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/it/projects/jigsaw/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
*/
1919
File log = new File(basedir, 'build.log')
2020
assert log.exists()
21-
assert 1 == log.readLines().count( "Hello World")
21+
assert 1 == log.text.count( "Hello World")

src/it/projects/longModulepath with spaces/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
*/
1919
File log = new File(basedir, 'build.log')
2020
assert log.exists()
21-
assert 1 == log.readLines().count( "Hello World")
21+
assert 1 == log.text.count( "Hello World")

src/it/projects/mexec-gh-389-block-exit-non-zero/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def buildLogLines = new File( basedir, "build.log" ).readLines()
2020
def infoMessageLineNumber = buildLogLines.indexOf("[INFO] System::exit was called with return code 123")
2121
assert infoMessageLineNumber > 0
2222
// Verify that preceding line is program output
23-
assert buildLogLines[infoMessageLineNumber - 1] == "[one, two, three]"
23+
assert buildLogLines[infoMessageLineNumber - 1].contains("[one, two, three]")
2424
// Verify that subsequent lines contain the beginning of the thrown SystemExitException stack trace
2525
assert buildLogLines[infoMessageLineNumber + 1].startsWith("[WARNING]")
2626
assert buildLogLines[infoMessageLineNumber + 2].contains("SystemExitException: System::exit was called with return code 123")

src/it/projects/mexec-gh-389-block-exit-zero/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ def buildLogLines = new File( basedir, "build.log" ).readLines()
2020
def infoMessageLineNumber = buildLogLines.indexOf("[INFO] System::exit was called with return code 0")
2121
assert infoMessageLineNumber > 0
2222
// Verify that preceding line is program output
23-
assert buildLogLines[infoMessageLineNumber - 1] == "[one, two, three]"
23+
assert buildLogLines[infoMessageLineNumber - 1].contains("[one, two, three]")

src/it/projects/mexec-gh-389-default-permit-exit/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ def buildLogLines = new File( basedir, "build.log" ).readLines()
1818

1919
// Second-last line is the last line the called program prints before exiting the JVM with System.exit.
2020
// Last line is "Running post-build script: ...", i.e. we need to disregard it.
21-
assert buildLogLines[-2] == "[one, two, three]"
21+
assert buildLogLines[-2].contains("[one, two, three]")

0 commit comments

Comments
 (0)