Skip to content

Commit 66f2fd9

Browse files
authored
NIT add brackets when trimming integration test console outputs (#2661)
1 parent 98d1127 commit 66f2fd9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

modules/integration/src/test/scala/scala/cli/integration/FixTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class FixTests extends ScalaCliSuite {
6969
val runProc = os.proc(TestUtil.cli, "--power", "compile", ".", extraOptions)
7070
.call(cwd = root, stderr = os.Pipe)
7171

72-
expect(!runProc.err.trim.contains("Using directives detected in multiple files"))
72+
expect(!runProc.err.trim().contains("Using directives detected in multiple files"))
7373
}
7474
}
7575

@@ -128,7 +128,7 @@ class FixTests extends ScalaCliSuite {
128128
val runProc = os.proc(TestUtil.cli, "--power", "compile", ".", extraOptions)
129129
.call(cwd = root, stderr = os.Pipe)
130130

131-
expect(!runProc.err.trim.contains("Using directives detected in multiple files"))
131+
expect(!runProc.err.trim().contains("Using directives detected in multiple files"))
132132
}
133133
}
134134

@@ -223,7 +223,7 @@ class FixTests extends ScalaCliSuite {
223223
val runProc = os.proc(TestUtil.cli, "--power", "compile", ".", extraOptions)
224224
.call(cwd = root, stderr = os.Pipe)
225225

226-
expect(!runProc.err.trim.contains("Using directives detected in multiple files"))
226+
expect(!runProc.err.trim().contains("Using directives detected in multiple files"))
227227
}
228228
}
229229

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,9 +1614,9 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
16141614
env = Map("SCALA_CLI_INTERACTIVE_INPUTS" -> "Run-1") ++ configEnv
16151615
)
16161616

1617-
expect(proc.out.trim.contains("[0] Run-1"))
1618-
expect(proc.out.trim.contains("[1] Run-2"))
1619-
expect(proc.out.trim.contains("Run-1 launched"))
1617+
expect(proc.out.trim().contains("[0] Run-1"))
1618+
expect(proc.out.trim().contains("[1] Run-2"))
1619+
expect(proc.out.trim().contains("Run-1 launched"))
16201620
}
16211621
}
16221622

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class SipScalaTests extends ScalaCliSuite {
436436
val res = os.proc(TestUtil.cli, "--power", "export", ".", "--object-wrapper", "--md")
437437
.call(cwd = root, mergeErrIntoOut = true)
438438

439-
val output = res.out.trim
439+
val output = res.out.trim()
440440

441441
assertNoDiff(
442442
output,

0 commit comments

Comments
 (0)