diff options
author | Roman Timushev <rtimush@gmail.com> | 2017-12-13 16:01:34 +0100 |
---|---|---|
committer | Roman Timushev <rtimush@gmail.com> | 2017-12-29 18:52:49 +0100 |
commit | 25ea45645861b7cae2ad75dc2b238e41596f3bb9 (patch) | |
tree | f47f6997e81188f6151791f7326a287180e3e64c /scalaplugin | |
parent | c16849178e733a15d03e2de8d7571489467472be (diff) | |
download | mill-25ea45645861b7cae2ad75dc2b238e41596f3bb9.tar.gz mill-25ea45645861b7cae2ad75dc2b238e41596f3bb9.tar.bz2 mill-25ea45645861b7cae2ad75dc2b238e41596f3bb9.zip |
Move TestEvaluator to core
Diffstat (limited to 'scalaplugin')
5 files changed, 4 insertions, 30 deletions
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala index 13349aec..529dda0c 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala +++ b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala @@ -7,6 +7,7 @@ import mill.discover.Discovered import mill.scalaplugin.publish._ import utest._ import mill.util.JsonFormatters._ +import mill.util.TestEvaluator object AcyclicBuild{ val acyclic = for(crossVersion <- Cross("2.10.6", "2.11.8", "2.12.3", "2.12.4")) diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala index f2e21a81..f608f311 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala +++ b/scalaplugin/src/test/scala/mill/scalaplugin/BetterFilesTests.scala @@ -5,6 +5,7 @@ import ammonite.ops._ import mill.discover.Discovered import utest._ import mill.util.JsonFormatters._ +import mill.util.TestEvaluator object BetterFilesBuild{ trait BetterFilesModule extends SbtScalaModule{ outer => diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala index 51d1dc94..a265b953 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala +++ b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala @@ -9,6 +9,7 @@ import mill.define.{Cross, Target} import mill.discover.Discovered import mill.eval.{Evaluator, Result} import mill.scalaplugin.publish._ +import mill.util.TestEvaluator import sbt.internal.inc.CompileFailed import utest._ diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala index 97dff017..81d6e71a 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala +++ b/scalaplugin/src/test/scala/mill/scalaplugin/JawnTests.scala @@ -8,6 +8,7 @@ import mill.discover.Discovered import mill.eval.Result import utest._ import mill.util.JsonFormatters._ +import mill.util.TestEvaluator object JawnBuild{ val Jawn = Cross("2.10.6", "2.11.11", "2.12.3").map(new Jawn(_)) diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala b/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala deleted file mode 100644 index f1cee213..00000000 --- a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala +++ /dev/null @@ -1,30 +0,0 @@ -package mill.scalaplugin - -import ammonite.ops.Path -import mill.define.{Target, Task} -import mill.discover.{Discovered, Mirror} -import mill.eval.{Evaluator, Result} -import mill.util.{DummyLogger, OSet, PrintLogger} - -class TestEvaluator(mapping: Discovered.Mapping[_], workspacePath: Path){ - val evaluator = new Evaluator(workspacePath, mapping, DummyLogger) - - def apply[T](t: Task[T]): Either[Result.Failing, (T, Int)] = { - val evaluated = evaluator.evaluate(OSet(t)) - - if (evaluated.failing.keyCount == 0) { - Right( - Tuple2( - evaluated.rawValues.head.asInstanceOf[Result.Success[T]].value, - evaluated.evaluated.collect { - case t: Target[_] if mapping.targets.contains(t) => t - case t: mill.define.Command[_] => t - }.size - )) - } else { - Left( - evaluated.failing.lookupKey(evaluated.failing.keys().next).items.next()) - } - } - -} |