Skip to content

SI-6502 Convert test to asserts #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2015
Merged

SI-6502 Convert test to asserts #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions test/files/run/t6502.check
View file
Open in desktop

This file was deleted.

46 changes: 25 additions & 21 deletions test/files/run/t6502.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ object Test extends StoreReporterDirectTest {
val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar", "test.Test.test()")
val output = ILoop.run(codeToRun, settings)
val lines = output.split("\n")
val res1 = lines(4).contains("Added") && lines(4).contains("test1.jar")
val res2 = lines(lines.length-3).contains("testing...")

println(s"test1 res1: $res1")
println(s"test1 res2: $res2")
assert {
lines(4).contains("Added") && lines(4).contains("test1.jar")
}
assert {
lines(lines.length-3).contains("testing...")
}
}

def test2(): Unit = {
Expand All @@ -75,11 +76,12 @@ object Test extends StoreReporterDirectTest {
val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar2")
val output = ILoop.run(codeToRun, settings)
val lines = output.split("\n")
val res1 = lines(4).contains("Added") && lines(4).contains("test1.jar")
val res2 = lines(lines.length-3).contains("test2.jar") && lines(lines.length-3).contains("existing classpath entries conflict")

println(s"test2 res1: $res1")
println(s"test2 res2: $res2")
assert {
lines(4).contains("Added") && lines(4).contains("test1.jar")
}
assert {
lines(lines.length-3).contains("test2.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
}
}

def test3(): Unit = {
Expand All @@ -91,11 +93,12 @@ object Test extends StoreReporterDirectTest {
val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar3", "test.Test3.test()")
val output = ILoop.run(codeToRun, settings)
val lines = output.split("\n")
val res1 = lines(4).contains("Added") && lines(4).contains("test1.jar")
val res2 = lines(lines.length-3).contains("new object in existing package")

println(s"test3 res1: $res1")
println(s"test3 res2: $res2")
assert {
lines(4).contains("Added") && lines(4).contains("test1.jar")
}
assert {
lines(lines.length-3).contains("new object in existing package")
}
}

def test4(): Unit = {
Expand All @@ -104,11 +107,12 @@ object Test extends StoreReporterDirectTest {
val codeToRun = toCodeInSeparateLines(s":require ${testOutput.path}/$jar1", s":require ${testOutput.path}/$jar1")
val output = ILoop.run(codeToRun, settings)
val lines = output.split("\n")
val res1 = lines(4).contains("Added") && lines(4).contains("test1.jar")
val res2 = lines(lines.length-3).contains("test1.jar") && lines(lines.length-3).contains("existing classpath entries conflict")

println(s"test4 res1: $res1")
println(s"test4 res2: $res2")
assert {
lines(4).contains("Added") && lines(4).contains("test1.jar")
}
assert {
lines(lines.length-3).contains("test1.jar") && lines(lines.length-3).contains("existing classpath entries conflict")
}
}

def test5(): Unit = {
Expand Down Expand Up @@ -138,5 +142,5 @@ object Test extends StoreReporterDirectTest {
test6()
}

def toCodeInSeparateLines(lines: String*): String = lines.map(_ + "\n").mkString
def toCodeInSeparateLines(lines: String*): String = lines mkString "\n"
}