diff options
Diffstat (limited to 'core/src/test/scala')
4 files changed, 11 insertions, 11 deletions
diff --git a/core/src/test/scala/mill/define/CacherTests.scala b/core/src/test/scala/mill/define/CacherTests.scala index bb86ae65..bacfa598 100644 --- a/core/src/test/scala/mill/define/CacherTests.scala +++ b/core/src/test/scala/mill/define/CacherTests.scala @@ -2,7 +2,7 @@ package mill.define import mill.discover.Discovered import mill.eval.Evaluator -import mill.util.OSet +import mill.util.{DummyLogger, OSet} import mill.T import utest._ import utest.framework.TestPath @@ -27,7 +27,7 @@ object CacherTests extends TestSuite{ def eval[T: Discovered, V](base: T, v: Task[V])(implicit tp: TestPath) = { val workspace = ammonite.ops.pwd / 'target / 'workspace / tp.value - val evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ()) + val evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger) evaluator.evaluate(OSet(v)).values(0) } diff --git a/core/src/test/scala/mill/eval/EvaluationTests.scala b/core/src/test/scala/mill/eval/EvaluationTests.scala index d3c1861f..3b136ba0 100644 --- a/core/src/test/scala/mill/eval/EvaluationTests.scala +++ b/core/src/test/scala/mill/eval/EvaluationTests.scala @@ -5,7 +5,7 @@ import mill.util.TestUtil.{Test, test} import mill.define.{Graph, Target, Task} import mill.{Module, T} import mill.discover.Discovered -import mill.util.{OSet, TestGraphs, TestUtil} +import mill.util.{DummyLogger, OSet, TestGraphs, TestUtil} import utest._ import utest.framework.TestPath @@ -14,7 +14,7 @@ object EvaluationTests extends TestSuite{ val workspace = ammonite.ops.pwd / 'target / 'workspace / tp.value ammonite.ops.rm(ammonite.ops.Path(workspace, ammonite.ops.pwd)) // Make sure data is persisted even if we re-create the evaluator each time - def evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ()) + def evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger) def apply(target: Task[_], expValue: Any, expEvaled: OSet[Task[_]], diff --git a/core/src/test/scala/mill/eval/FailureTests.scala b/core/src/test/scala/mill/eval/FailureTests.scala index 6977334d..2279d931 100644 --- a/core/src/test/scala/mill/eval/FailureTests.scala +++ b/core/src/test/scala/mill/eval/FailureTests.scala @@ -2,7 +2,7 @@ package mill.eval import mill.define.Target import mill.discover.Discovered -import mill.util.OSet +import mill.util.{DummyLogger, OSet} import utest._ import utest.framework.TestPath @@ -17,7 +17,7 @@ object FailureTests extends TestSuite{ def check[T: Discovered](base: T) (target: T => Target[_], expectedFailCount: Int, expectedRawValues: Seq[Result[_]]) (implicit tp: TestPath) = { - val evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ()) + val evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger) val res = evaluator.evaluate(OSet(target(base))) assert( res.rawValues == expectedRawValues, diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala index 6c32f9b8..e0a43c6e 100644 --- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala +++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala @@ -4,10 +4,10 @@ import ammonite.ops.ImplicitWd._ import ammonite.ops._ import mill.define.{Target, Task} import mill.discover.Discovered -import mill.modules.Jvm.jarUp +import mill.modules.Jvm import mill.util.Ctx.DestCtx import mill.{Module, T} -import mill.util.OSet +import mill.util.{DummyLogger, OSet} import utest._ object JavaCompileJarTests extends TestSuite{ @@ -39,7 +39,7 @@ object JavaCompileJarTests extends TestSuite{ def resourceRoot = T.source{ resourceRootPath } def allSources = T{ ls.rec(sourceRoot().path).map(PathRef(_)) } def classFiles = T{ compileAll(allSources()) } - def jar = T{ jarUp(resourceRoot, classFiles) } + def jar = T{ Jvm.createJar(Seq(resourceRoot().path, classFiles().path)) } def run(mainClsName: String) = T.command{ %%('java, "-cp", classFiles().path, mainClsName) @@ -50,7 +50,7 @@ object JavaCompileJarTests extends TestSuite{ val mapping = Discovered.mapping(Build) def eval[T](t: Task[T]): Either[Result.Failing, (T, Int)] = { - val evaluator = new Evaluator(workspacePath, mapping, _ => ()) + val evaluator = new Evaluator(workspacePath, mapping, DummyLogger) val evaluated = evaluator.evaluate(OSet(t)) if (evaluated.failing.keyCount == 0){ @@ -67,7 +67,7 @@ object JavaCompileJarTests extends TestSuite{ } def check(targets: OSet[Task[_]], expected: OSet[Task[_]]) = { - val evaluator = new Evaluator(workspacePath, mapping, _ => ()) + val evaluator = new Evaluator(workspacePath, mapping, DummyLogger) val evaluated = evaluator.evaluate(targets) .evaluated |