Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/sbt-test/agent-1/confs/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def checkLog(logFile: String): Unit = {
val log = IO.read(file(logFile))

def expect(expected: String): Unit = {
assert(log contains expected, s"log should contain '$expected'")
assert(log.contains(expected), s"log should contain '$expected'")
}

expect("Agent 86")
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/agent-1/dist_1.9.x/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
output contains "Agent 86",
output.contains("Agent 86"),
"output does not include 'Agent 86'"
)
}
2 changes: 1 addition & 1 deletion src/sbt-test/agent-1/test/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ TaskKey[Unit]("check") := {
val testLog = IO.read(BuiltinCommands.lastLogFile(state.value).get)

assert(
testLog contains "Agent 86",
testLog.contains("Agent 86"),
"test log does not include 'Agent 86'"
)
}
8 changes: 4 additions & 4 deletions src/sbt-test/agent/arguments/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
!(output contains "Agent 86"),
!output.contains("Agent 86"),
"output includes 'Agent 86'"
)
assert(
!(output contains ";"),
!output.contains(";"),
"output includes ';'"
)
assert(
output contains "Get_Smart",
output.contains("Get_Smart"),
"output does not include 'Get_Smart'"
)
assert(
output contains "Agent_99",
output.contains("Agent_99"),
"output does not include 'Agent_99'"
)
}
2 changes: 1 addition & 1 deletion src/sbt-test/agent/compile/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ TaskKey[Unit]("checkDependency") := {
}

def expect(name: String, contents: String, expected: String): Unit =
assert(contents contains expected, s"$name should contain '$expected'")
assert(contents.contains(expected), s"$name should contain '$expected'")

TaskKey[Unit]("checkLog") := {
val log = IO.read(file("run.log"))
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/agent/dist/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
output contains "Agent 86",
output.contains("Agent 86"),
"output does not include 'Agent 86'"
)
}
2 changes: 1 addition & 1 deletion src/sbt-test/agent/named/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
output contains "Agent 86",
output.contains("Agent 86"),
"output does not include 'Agent 86'"
)
}
2 changes: 1 addition & 1 deletion src/sbt-test/agent/provided/test.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TaskKey[Unit]("check") := {
def expect(name: String, contents: String, expected: String): Unit =
assert(contents contains expected, s"$name should contain '$expected'")
assert(contents.contains(expected), s"$name should contain '$expected'")

val log = IO.read(file("run.log"))

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/agent/run/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TaskKey[Unit]("check") := {
val runLog = IO.read(file("run.log"))

assert(
runLog contains "Agent 86",
runLog.contains("Agent 86"),
"run log does not include 'Agent 86'"
)
}
2 changes: 1 addition & 1 deletion src/sbt-test/agent/test_and_dist/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
output contains "Agent 86",
output.contains("Agent 86"),
"output does not include 'Agent 86'"
)

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/agent/test_no_dist/test.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TaskKey[Unit]("check") := {
((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!

assert(
!(output contains "Agent 86"),
!output.contains("Agent 86"),
"output include 'Agent 86'"
)

Expand Down