fix-tests

10 files changed, 21 insertions, 24 deletions

diff --git a/main/test/src/mill/define/CacherTests.scala b/main/test/src/mill/define/CacherTests.scala
index 606de846..03232930 100644
--- a/main/test/src/mill/define/CacherTests.scala
+++ b/main/test/src/mill/define/CacherTests.scala
@@ -7,7 +7,7 @@ import mill.T
 import mill.eval.Result.Success
 import utest._
 import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
 
 object CacherTests extends TestSuite{
   object Base extends Base
@@ -27,7 +27,7 @@ object CacherTests extends TestSuite{
 
   val tests = Tests{
     def eval[T <: TestUtil.BaseModule, V](mapping: T, v: Task[V])
-                                         (implicit discover: Discover[T], tp: TestPath) = {
+                                         (implicit tp: TestPath) = {
       val evaluator = new TestEvaluator(mapping)
       evaluator(v).right.get._1
     }
diff --git a/main/test/src/mill/eval/CrossTests.scala b/main/test/src/mill/eval/CrossTests.scala
index aa12e180..3dec0222 100644
--- a/main/test/src/mill/eval/CrossTests.scala
+++ b/main/test/src/mill/eval/CrossTests.scala
@@ -3,7 +3,7 @@ package mill.eval
 import ammonite.ops._
 import mill.define.Discover
 import mill.util.TestEvaluator
-import mill.util.TestEvaluator.implicitDisover
+
 import mill.util.TestGraphs.{crossResolved, doubleCross, nestedCrosses, singleCross}
 import utest._
 object CrossTests extends TestSuite{
diff --git a/main/test/src/mill/eval/EvaluationTests.scala b/main/test/src/mill/eval/EvaluationTests.scala
index da399449..3de78998 100644
--- a/main/test/src/mill/eval/EvaluationTests.scala
+++ b/main/test/src/mill/eval/EvaluationTests.scala
@@ -8,12 +8,11 @@ import mill.util.{DummyLogger, TestEvaluator, TestGraphs, TestUtil}
 import mill.util.Strict.Agg
 import utest._
 import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
 import ammonite.ops._
 
 object EvaluationTests extends TestSuite{
-  class Checker[T <: TestUtil.BaseModule](module: T)
-                                        (implicit tp: TestPath, discover: Discover[T]) {
+  class Checker[T <: TestUtil.BaseModule](module: T)(implicit tp: TestPath) {
     // Make sure data is persisted even if we re-create the evaluator each time
 
     def evaluator = new TestEvaluator(module).evaluator
diff --git a/main/test/src/mill/eval/FailureTests.scala b/main/test/src/mill/eval/FailureTests.scala
index 90cff686..244b084d 100644
--- a/main/test/src/mill/eval/FailureTests.scala
+++ b/main/test/src/mill/eval/FailureTests.scala
@@ -5,7 +5,7 @@ import ammonite.ops.{Path, pwd, rm}
 import mill.eval.Result.OuterStack
 import utest._
 import utest.framework.TestPath
-import mill.util.TestEvaluator.implicitDisover
+
 
 object FailureTests extends TestSuite{
 
diff --git a/main/test/src/mill/eval/JavaCompileJarTests.scala b/main/test/src/mill/eval/JavaCompileJarTests.scala
index 966c272f..0921ae6d 100644
--- a/main/test/src/mill/eval/JavaCompileJarTests.scala
+++ b/main/test/src/mill/eval/JavaCompileJarTests.scala
@@ -10,7 +10,6 @@ import mill.util.{DummyLogger, Loose, TestEvaluator, TestUtil}
 import mill.util.Strict.Agg
 import utest._
 import mill._
-import TestEvaluator.implicitDisover
 object JavaCompileJarTests extends TestSuite{
   def compileAll(sources: Seq[PathRef])(implicit ctx: Dest) = {
     mkdir(ctx.dest)
diff --git a/main/test/src/mill/eval/ModuleTests.scala b/main/test/src/mill/eval/ModuleTests.scala
index c6125b32..d2fa7184 100644
--- a/main/test/src/mill/eval/ModuleTests.scala
+++ b/main/test/src/mill/eval/ModuleTests.scala
@@ -4,7 +4,7 @@ import ammonite.ops._
 import mill.util.{TestEvaluator, TestUtil}
 import mill.T
 import mill.define.Discover
-import mill.util.TestEvaluator.implicitDisover
+
 import utest._
 
 object ModuleTests extends TestSuite{
diff --git a/main/test/src/mill/eval/TaskTests.scala b/main/test/src/mill/eval/TaskTests.scala
index 114a2910..4ba65e17 100644
--- a/main/test/src/mill/eval/TaskTests.scala
+++ b/main/test/src/mill/eval/TaskTests.scala
@@ -3,7 +3,7 @@ package mill.eval
 import utest._
 import ammonite.ops._
 import mill.T
-import mill.util.TestEvaluator.implicitDisover
+
 import mill.util.TestEvaluator
 object TaskTests extends TestSuite{
   val tests = Tests{
diff --git a/main/test/src/mill/main/MainTests.scala b/main/test/src/mill/main/MainTests.scala
index fbf193e1..f9bf7aec 100644
--- a/main/test/src/mill/main/MainTests.scala
+++ b/main/test/src/mill/main/MainTests.scala
@@ -2,21 +2,20 @@ package mill.main
 
 import mill.define.{Discover, Segment, Task}
 import mill.util.TestGraphs._
-import mill.util.TestEvaluator.implicitDisover
+
 import utest._
 object MainTests extends TestSuite{
 
-  def check[T <: mill.Module](module: T)(
-                              selectorString: String,
-                              expected0: Either[String, Seq[T => Task[_]]])
-                             (implicit discover: Discover[T])= {
+  def check[T <: mill.define.BaseModule](module: T)(
+                                         selectorString: String,
+                                         expected0: Either[String, Seq[T => Task[_]]])= {
 
     val expected = expected0.map(_.map(_(module)))
     val resolved = for{
       selectors <- mill.util.ParseArgs(Seq(selectorString), multiSelect = false).map(_._1.head)
       val crossSelectors = selectors._2.value.map{case Segment.Cross(x) => x.toList.map(_.toString) case _ => Nil}
       task <- mill.main.ResolveTasks.resolve(
-        selectors._2.value.toList, module, discover, Nil, crossSelectors.toList, Nil
+        selectors._2.value.toList, module, module.millDiscover, Nil, crossSelectors.toList, Nil
       )
     } yield task
     assert(resolved == expected)
diff --git a/main/test/src/mill/util/TestEvaluator.scala b/main/test/src/mill/util/TestEvaluator.scala
index b35ebeb8..be91abaa 100644
--- a/main/test/src/mill/util/TestEvaluator.scala
+++ b/main/test/src/mill/util/TestEvaluator.scala
@@ -11,20 +11,17 @@ import utest.framework.TestPath
 
 import language.experimental.macros
 object TestEvaluator{
-  implicit def implicitDisover[T]: Discover[T] = macro applyImpl[T]
   val externalOutPath = pwd / 'target / 'external
 
 
   def static[T <: TestUtil.BaseModule](module: T)
-                                     (implicit discover: Discover[T],
-                                     fullName: sourcecode.FullName) = {
-    new TestEvaluator[T](module)(discover, fullName, TestPath(Nil))
+                                     (implicit fullName: sourcecode.FullName) = {
+    new TestEvaluator[T](module)(fullName, TestPath(Nil))
   }
 }
 
 class TestEvaluator[T <: TestUtil.BaseModule](module: T)
-                                            (implicit discover: Discover[T],
-                                             fullName: sourcecode.FullName,
+                                            (implicit fullName: sourcecode.FullName,
                                              tp: TestPath){
   val outPath =  TestUtil.getOutPath()
 
diff --git a/main/test/src/mill/util/TestGraphs.scala b/main/test/src/mill/util/TestGraphs.scala
index 581d5e0a..20f5c9ef 100644
--- a/main/test/src/mill/util/TestGraphs.scala
+++ b/main/test/src/mill/util/TestGraphs.scala
@@ -1,6 +1,6 @@
 package mill.util
 import TestUtil.test
-import mill.define.Cross
+import mill.define.{Cross, Discover}
 import mill.{Module, T}
 
 /**
@@ -180,6 +180,7 @@ object TestGraphs{
   object canOverrideSuper extends TestUtil.BaseModule with BaseModule {
     override def foo = T{ super.foo() ++ Seq("object") }
     override def cmd(i: Int) = T.command{ super.cmd(i)() ++ Seq("object" + i) }
+    def millDiscover: Discover[this.type] = Discover[this.type]
   }
 
   trait TraitWithModule extends Module{ outer =>
@@ -191,7 +192,9 @@ object TestGraphs{
 
 
   // Make sure nested objects inherited from traits work
-  object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule
+  object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule{
+    def millDiscover: Discover[this.type] = Discover[this.type]
+  }
 
 
   object singleCross extends TestUtil.BaseModule {