diff options
Diffstat (limited to 'core/src/test/scala')
-rw-r--r-- | core/src/test/scala/mill/ApplicativeTests.scala (renamed from core/src/test/scala/forge/ApplicativeTests.scala) | 4 | ||||
-rw-r--r-- | core/src/test/scala/mill/CacherTests.scala (renamed from core/src/test/scala/forge/CacherTests.scala) | 10 | ||||
-rw-r--r-- | core/src/test/scala/mill/EvaluationTests.scala (renamed from core/src/test/scala/forge/EvaluationTests.scala) | 14 | ||||
-rw-r--r-- | core/src/test/scala/mill/GraphTests.scala (renamed from core/src/test/scala/forge/GraphTests.scala) | 10 | ||||
-rw-r--r-- | core/src/test/scala/mill/JavaCompileJarTests.scala (renamed from core/src/test/scala/forge/JavaCompileJarTests.scala) | 14 | ||||
-rw-r--r-- | core/src/test/scala/mill/MacroErrorTests.scala (renamed from core/src/test/scala/forge/MacroErrorTests.scala) | 8 | ||||
-rw-r--r-- | core/src/test/scala/mill/TarjanTests.scala (renamed from core/src/test/scala/forge/TarjanTests.scala) | 4 | ||||
-rw-r--r-- | core/src/test/scala/mill/TestGraphs.scala (renamed from core/src/test/scala/forge/TestGraphs.scala) | 6 | ||||
-rw-r--r-- | core/src/test/scala/mill/TestMain.scala (renamed from core/src/test/scala/forge/TestMain.scala) | 4 | ||||
-rw-r--r-- | core/src/test/scala/mill/TestUtil.scala (renamed from core/src/test/scala/forge/TestUtil.scala) | 6 | ||||
-rw-r--r-- | core/src/test/scala/mill/UTestFramework.scala (renamed from core/src/test/scala/forge/UTestFramework.scala) | 4 |
11 files changed, 42 insertions, 42 deletions
diff --git a/core/src/test/scala/forge/ApplicativeTests.scala b/core/src/test/scala/mill/ApplicativeTests.scala index 682414d3..5bb9945c 100644 --- a/core/src/test/scala/forge/ApplicativeTests.scala +++ b/core/src/test/scala/mill/ApplicativeTests.scala @@ -1,5 +1,5 @@ -package forge -import forge.define.Applicative +package mill +import mill.define.Applicative import utest._ import language.experimental.macros diff --git a/core/src/test/scala/forge/CacherTests.scala b/core/src/test/scala/mill/CacherTests.scala index 5f40ee20..1a510e4c 100644 --- a/core/src/test/scala/forge/CacherTests.scala +++ b/core/src/test/scala/mill/CacherTests.scala @@ -1,9 +1,9 @@ -package forge +package mill -import forge.define.Task -import forge.discover.Discovered -import forge.eval.Evaluator -import forge.util.OSet +import mill.define.Task +import mill.discover.Discovered +import mill.eval.Evaluator +import mill.util.OSet import utest._ import utest.framework.TestPath diff --git a/core/src/test/scala/forge/EvaluationTests.scala b/core/src/test/scala/mill/EvaluationTests.scala index 5fe29446..48b42539 100644 --- a/core/src/test/scala/forge/EvaluationTests.scala +++ b/core/src/test/scala/mill/EvaluationTests.scala @@ -1,12 +1,12 @@ -package forge +package mill -import forge.TestUtil.{Test, test} -import forge.define.{Target, Task} -import forge.define.Task.Cacher -import forge.discover.Discovered -import forge.eval.Evaluator -import forge.util.OSet +import mill.TestUtil.{Test, test} +import mill.define.{Target, Task} +import mill.define.Task.Cacher +import mill.discover.Discovered +import mill.eval.Evaluator +import mill.util.OSet import utest._ import utest.framework.TestPath diff --git a/core/src/test/scala/forge/GraphTests.scala b/core/src/test/scala/mill/GraphTests.scala index db522fff..575b4a89 100644 --- a/core/src/test/scala/forge/GraphTests.scala +++ b/core/src/test/scala/mill/GraphTests.scala @@ -1,11 +1,11 @@ -package forge +package mill import utest._ import TestUtil.test -import forge.define.Task -import forge.discover.Discovered -import forge.eval.Evaluator -import forge.util.OSet +import mill.define.Task +import mill.discover.Discovered +import mill.eval.Evaluator +import mill.util.OSet object GraphTests extends TestSuite{ diff --git a/core/src/test/scala/forge/JavaCompileJarTests.scala b/core/src/test/scala/mill/JavaCompileJarTests.scala index 1c9bf9b8..6e398540 100644 --- a/core/src/test/scala/forge/JavaCompileJarTests.scala +++ b/core/src/test/scala/mill/JavaCompileJarTests.scala @@ -1,13 +1,13 @@ -package forge +package mill import ammonite.ops._ import ImplicitWd._ -import forge.define.Task -import forge.discover.Discovered -import forge.eval.{Evaluator, PathRef} -import forge.modules.Jvm.jarUp -import forge.util.OSet +import mill.define.Task +import mill.discover.Discovered +import mill.eval.{Evaluator, PathRef} +import mill.modules.Jvm.jarUp +import mill.util.OSet import utest._ object JavaCompileJarTests extends TestSuite{ @@ -56,7 +56,7 @@ object JavaCompileJarTests extends TestSuite{ val evaluated = evaluator.evaluate(OSet(t)) Tuple2( evaluated.values(0).asInstanceOf[T], - evaluated.targets.filter(x => mapping.contains(x) || x.isInstanceOf[forge.define.Command[_]]).size + evaluated.targets.filter(x => mapping.contains(x) || x.isInstanceOf[mill.define.Command[_]]).size ) } def check(targets: OSet[Task[_]], expected: OSet[Task[_]]) = { diff --git a/core/src/test/scala/forge/MacroErrorTests.scala b/core/src/test/scala/mill/MacroErrorTests.scala index 6e76cd17..20bf805a 100644 --- a/core/src/test/scala/forge/MacroErrorTests.scala +++ b/core/src/test/scala/mill/MacroErrorTests.scala @@ -1,4 +1,4 @@ -package forge +package mill import utest._ @@ -10,7 +10,7 @@ object MacroErrorTests extends TestSuite{ val expectedMsg = "T{} members must be defs defined in a Cacher class/trait/object body" - val err = compileError("object Foo extends forge.define.Target.Cacher{ val x = T{1} }") + val err = compileError("object Foo extends mill.define.Task.Cacher{ val x = T{1} }") assert(err.msg == expectedMsg) } @@ -35,7 +35,7 @@ object MacroErrorTests extends TestSuite{ val expectedMsg = "Target#apply() call cannot use `value n` defined within the T{...} block" - val err = compileError("""new forge.define.Target.Cacher{ + val err = compileError("""new mill.define.Task.Cacher{ def a = T{ 1 } val arr = Array(a) def b = { @@ -51,7 +51,7 @@ object MacroErrorTests extends TestSuite{ val expectedMsg = "Target#apply() call cannot use `value x` defined within the T{...} block" - val err = compileError("""new forge.define.Target.Cacher{ + val err = compileError("""new mill.define.Task.Cacher{ def a = T{ 1 } val arr = Array(a) def b = { diff --git a/core/src/test/scala/forge/TarjanTests.scala b/core/src/test/scala/mill/TarjanTests.scala index 58032b86..7ae7dd04 100644 --- a/core/src/test/scala/forge/TarjanTests.scala +++ b/core/src/test/scala/mill/TarjanTests.scala @@ -1,5 +1,5 @@ -package forge -import forge.eval.Tarjans +package mill +import mill.eval.Tarjans import utest._ object TarjanTests extends TestSuite{ def check(input: Seq[Seq[Int]], expected: Seq[Seq[Int]]) = { diff --git a/core/src/test/scala/forge/TestGraphs.scala b/core/src/test/scala/mill/TestGraphs.scala index 9709979d..46fad053 100644 --- a/core/src/test/scala/forge/TestGraphs.scala +++ b/core/src/test/scala/mill/TestGraphs.scala @@ -1,7 +1,7 @@ -package forge +package mill -import forge.define.Task.Cacher -import forge.TestUtil.test +import mill.define.Task.Cacher +import mill.TestUtil.test class TestGraphs(){ // single diff --git a/core/src/test/scala/forge/TestMain.scala b/core/src/test/scala/mill/TestMain.scala index c94e13f0..d0ebfc9d 100644 --- a/core/src/test/scala/forge/TestMain.scala +++ b/core/src/test/scala/mill/TestMain.scala @@ -1,4 +1,4 @@ -package forge +package mill import ammonite.ops._ import java.io.File @@ -57,7 +57,7 @@ object TestMain { val outputDir = pwd/'target/'zinc mkdir(outputDir) - val scalaFiles = ls.rec(pwd/'src/'main/'scala/'forge).filter(_.ext == "scala").map(_.toIO).toArray + val scalaFiles = ls.rec(pwd/'src/'main/'scala/'mill).filter(_.ext == "scala").map(_.toIO).toArray pprint.log(scalaFiles) scalac.apply( diff --git a/core/src/test/scala/forge/TestUtil.scala b/core/src/test/scala/mill/TestUtil.scala index 1ae60e6d..f2c4ad3a 100644 --- a/core/src/test/scala/forge/TestUtil.scala +++ b/core/src/test/scala/mill/TestUtil.scala @@ -1,7 +1,7 @@ -package forge +package mill -import forge.define.Task -import forge.util.{Args, OSet} +import mill.define.Task +import mill.util.{Args, OSet} import utest.assert import scala.collection.mutable diff --git a/core/src/test/scala/forge/UTestFramework.scala b/core/src/test/scala/mill/UTestFramework.scala index 3435e9c0..6c0d5191 100644 --- a/core/src/test/scala/forge/UTestFramework.scala +++ b/core/src/test/scala/mill/UTestFramework.scala @@ -1,8 +1,8 @@ -package forge +package mill class UTestFramework extends utest.runner.Framework { override def exceptionStackFrameHighlighter(s: StackTraceElement) = { - s.getClassName.startsWith("forge.") + s.getClassName.startsWith("mill.") } override def setup() = { import ammonite.ops._ |