diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-04 14:35:35 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-04 15:00:58 -0800 |
commit | 7022254ac1b156a466baa45afea1bb723bd59929 (patch) | |
tree | 8bf0fa5bd42765d54ef0d4a9d915550f7586de2b /core/test/src | |
parent | f47697c1da18407374cf11372af36c4960d80576 (diff) | |
download | mill-7022254ac1b156a466baa45afea1bb723bd59929.tar.gz mill-7022254ac1b156a466baa45afea1bb723bd59929.tar.bz2 mill-7022254ac1b156a466baa45afea1bb723bd59929.zip |
allow Result.Failure to take a value
Diffstat (limited to 'core/test/src')
-rw-r--r-- | core/test/src/mill/util/TestEvaluator.scala | 6 | ||||
-rw-r--r-- | core/test/src/mill/util/TestUtil.scala | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/test/src/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala index 3fdd7c63..92ce5b37 100644 --- a/core/test/src/mill/util/TestEvaluator.scala +++ b/core/test/src/mill/util/TestEvaluator.scala @@ -32,7 +32,7 @@ class TestEvaluator[T <: TestUtil.TestBuild](module: T) val logger = new PrintLogger(true, ammonite.util.Colors.Default, System.out, System.out, System.err) val evaluator = new Evaluator(outPath, TestEvaluator.externalOutPath, module, discover, logger) - def apply[T](t: Task[T]): Either[Result.Failing, (T, Int)] = { + def apply[T](t: Task[T]): Either[Result.Failing[T], (T, Int)] = { val evaluated = evaluator.evaluate(Agg(t)) if (evaluated.failing.keyCount == 0) { @@ -49,7 +49,9 @@ class TestEvaluator[T <: TestUtil.TestBuild](module: T) )) } else { Left( - evaluated.failing.lookupKey(evaluated.failing.keys().next).items.next()) + evaluated.failing.lookupKey(evaluated.failing.keys().next).items.next() + .asInstanceOf[Result.Failing[T]] + ) } } diff --git a/core/test/src/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala index 59ef74df..93ea5ad8 100644 --- a/core/test/src/mill/util/TestUtil.scala +++ b/core/test/src/mill/util/TestUtil.scala @@ -49,9 +49,9 @@ object TestUtil { var failure = Option.empty[String] var exception = Option.empty[Throwable] override def evaluate(args: Ctx) = { - failure.map(Result.Failure) orElse - exception.map(Result.Exception(_, new OuterStack(Nil))) getOrElse - Result.Success(counter + args.args.map(_.asInstanceOf[Int]).sum) + failure.map(Result.Failure(_)) orElse + exception.map(Result.Exception(_, new OuterStack(Nil))) getOrElse + Result.Success(counter + args.args.map(_.asInstanceOf[Int]).sum) } override def sideHash = counter + failure.hashCode() + exception.hashCode() } |