diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-28 09:43:09 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-28 10:13:44 -0800 |
commit | 42d24a0b59fa21bfa79040c2cd51a1f7384eee12 (patch) | |
tree | 34d6c34442cf73a8b98865b715453f3321bf12a1 /scalalib | |
parent | eec3a8995de1555f5d8120e106dd16badf2fdb00 (diff) | |
download | mill-42d24a0b59fa21bfa79040c2cd51a1f7384eee12.tar.gz mill-42d24a0b59fa21bfa79040c2cd51a1f7384eee12.tar.bz2 mill-42d24a0b59fa21bfa79040c2cd51a1f7384eee12.zip |
DRY up test suite by making `Discover` generation implicit
Also avoid passing around `Discover` and `Evaluator` together, since the latter already contains the former
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/mill/scalalib/GenIdea.scala | 2 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 3 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 8 |
3 files changed, 3 insertions, 10 deletions
diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index c48e3bc8..ea401b04 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -14,7 +14,7 @@ object GenIdea { def apply()(implicit ctx: LogCtx, rootModule0: BaseModule.Implicit, - discover: Discover): Unit = { + discover: Discover[_]): Unit = { val rootModule = rootModule0.value val pp = new scala.xml.PrettyPrinter(999, 4) rm! pwd/".idea" diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index ae5810df..58992e4f 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -5,7 +5,7 @@ import mill._ import mill.define.Discover import mill.util.{TestEvaluator, TestUtil} import utest._ - +import mill.util.TestEvaluator.implicitDisover object GenIdeaTests extends TestSuite { val basePath = pwd / 'target / 'workspace / "gen-idea" @@ -21,7 +21,6 @@ object GenIdeaTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, - Discover[HelloWorld.type], outPath, workingSrcPath ) diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index 85e53703..06d650c1 100644 --- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -10,7 +10,7 @@ import mill.eval.{Evaluator, Result} import mill.scalalib.publish._ import mill.util.{TestEvaluator, TestUtil} import utest._ - +import mill.util.TestEvaluator.implicitDisover import scala.collection.JavaConverters._ @@ -84,37 +84,31 @@ object HelloWorldTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, - Discover[HelloWorld.type], outPath, workingSrcPath ) val helloWorldWithMainEvaluator = new TestEvaluator( HelloWorldWithMain, - Discover[HelloWorldWithMain.type], outPath, workingSrcPath ) val helloWorldWithMainAssemblyEvaluator = new TestEvaluator( HelloWorldWithMainAssembly, - Discover[HelloWorldWithMainAssembly.type], outPath, workingSrcPath ) val helloWorldFatalEvaluator = new TestEvaluator( HelloWorldFatalWarnings, - Discover[HelloWorldFatalWarnings.type], outPath, workingSrcPath ) val helloWorldOverrideEvaluator = new TestEvaluator( HelloWorldScalaOverride, - Discover[HelloWorldScalaOverride.type], outPath, workingSrcPath ) val helloWorldCrossEvaluator = new TestEvaluator( CrossHelloWorld, - Discover[CrossHelloWorld.type], outPath, workingSrcPath ) |