summaryrefslogtreecommitdiff
path: root/scalalib/test/src
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-04 14:35:35 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-04 15:00:58 -0800
commit7022254ac1b156a466baa45afea1bb723bd59929 (patch)
tree8bf0fa5bd42765d54ef0d4a9d915550f7586de2b /scalalib/test/src
parentf47697c1da18407374cf11372af36c4960d80576 (diff)
downloadmill-7022254ac1b156a466baa45afea1bb723bd59929.tar.gz
mill-7022254ac1b156a466baa45afea1bb723bd59929.tar.bz2
mill-7022254ac1b156a466baa45afea1bb723bd59929.zip
allow Result.Failure to take a value
Diffstat (limited to 'scalalib/test/src')
-rw-r--r--scalalib/test/src/mill/scalalib/HelloWorldTests.scala6
-rw-r--r--scalalib/test/src/mill/scalalib/ResolveDepsTests.scala6
2 files changed, 6 insertions, 6 deletions
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 6fc26b03..24527cf1 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -199,7 +199,7 @@ object HelloWorldTests extends TestSuite {
'failOnError - workspaceTest(HelloWorld){eval =>
write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ")
- val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorld.core.compile)
+ val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.compile)
val paths = Evaluator.resolveDestPaths(
@@ -221,7 +221,7 @@ object HelloWorldTests extends TestSuite {
}
'passScalacOptions - workspaceTest(HelloWorldFatalWarnings){ eval =>
// compilation fails because of "-Xfatal-warnings" flag
- val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorldFatalWarnings.core.compile)
+ val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorldFatalWarnings.core.compile)
}
}
@@ -271,7 +271,7 @@ object HelloWorldTests extends TestSuite {
'notRunWhenCompileFailed - workspaceTest(HelloWorld){eval =>
write.append(HelloWorld.millSourcePath / 'core / 'src / "Main.scala", "val x: ")
- val Left(Result.Failure("Compilation failed")) = eval.apply(HelloWorld.core.runMain("Main"))
+ val Left(Result.Failure("Compilation failed", _)) = eval.apply(HelloWorld.core.runMain("Main"))
}
}
diff --git a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
index f697127c..6eb9a014 100644
--- a/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
+++ b/scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
@@ -21,19 +21,19 @@ object ResolveDepsTests extends TestSuite {
'errOnInvalidOrgDeps - {
val deps = Agg(ivy"xxx.yyy.invalid::pprint:0.5.3")
- val Failure(errMsg) = evalDeps(deps)
+ val Failure(errMsg, _) = evalDeps(deps)
assert(errMsg.contains("xxx.yyy.invalid"))
}
'errOnInvalidVersionDeps - {
val deps = Agg(ivy"com.lihaoyi::pprint:invalid.version.num")
- val Failure(errMsg) = evalDeps(deps)
+ val Failure(errMsg, _) = evalDeps(deps)
assert(errMsg.contains("invalid.version.num"))
}
'errOnPartialSuccess - {
val deps = Agg(ivy"com.lihaoyi::pprint:0.5.3", ivy"fake::fake:fake")
- val Failure(errMsg) = evalDeps(deps)
+ val Failure(errMsg, _) = evalDeps(deps)
assert(errMsg.contains("fake"))
}
}