Make use of `CrossScalaModule` in `HelloWorldTests`

Also standardize the `HelloWorldTests` onto the typical project layout, where the module of interest is nested within a top-level `BaseModule`

3 files changed, 6 insertions, 3 deletions

diff --git a/core/test/src/mill/eval/FailureTests.scala b/core/test/src/mill/eval/FailureTests.scala
index 48209b4e..91b1851d 100644
--- a/core/test/src/mill/eval/FailureTests.scala
+++ b/core/test/src/mill/eval/FailureTests.scala
@@ -2,6 +2,7 @@ package mill.eval
 import mill.T
 import mill.util.{TestEvaluator, TestUtil}
 import ammonite.ops.{Path, pwd, rm}
+import mill.eval.Result.OuterStack
 import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
@@ -43,7 +44,7 @@ object FailureTests extends TestSuite{
       check.fail(
         target = singleton.single,
         expectedFailCount = 1,
-        expectedRawValues = Seq(Result.Exception(ex, Nil))
+        expectedRawValues = Seq(Result.Exception(ex, new OuterStack(Nil)))
       )
     }
     'evaluatePair - {
diff --git a/core/test/src/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala
index ee92c2c2..8ef12417 100644
--- a/core/test/src/mill/util/TestEvaluator.scala
+++ b/core/test/src/mill/util/TestEvaluator.scala
@@ -3,6 +3,7 @@ package mill.util
 import ammonite.ops.{Path, pwd}
 import mill.define.Discover.applyImpl
 import mill.define.{Discover, Input, Target, Task}
+import mill.eval.Result.OuterStack
 import mill.eval.{Evaluator, Result}
 import mill.util.Strict.Agg
 import utest.assert
@@ -57,7 +58,7 @@ class TestEvaluator[T <: TestUtil.TestBuild](module: T)
     val res = evaluator.evaluate(Agg(target))
 
     val cleaned = res.rawValues.map{
-      case Result.Exception(ex, _) => Result.Exception(ex, Nil)
+      case Result.Exception(ex, _) => Result.Exception(ex, new OuterStack(Nil))
       case x => x
     }
 
diff --git a/core/test/src/mill/util/TestUtil.scala b/core/test/src/mill/util/TestUtil.scala
index 1413e9c6..59ef74df 100644
--- a/core/test/src/mill/util/TestUtil.scala
+++ b/core/test/src/mill/util/TestUtil.scala
@@ -4,6 +4,7 @@ import ammonite.main.Router.Overrides
 import ammonite.ops.pwd
 import mill.define._
 import mill.eval.Result
+import mill.eval.Result.OuterStack
 import utest.assert
 import mill.util.Strict.Agg
 import utest.framework.TestPath
@@ -49,7 +50,7 @@ object TestUtil {
     var exception = Option.empty[Throwable]
     override def evaluate(args: Ctx) = {
       failure.map(Result.Failure) orElse
-        exception.map(Result.Exception(_, Nil)) getOrElse
+        exception.map(Result.Exception(_, new OuterStack(Nil))) getOrElse
         Result.Success(counter + args.args.map(_.asInstanceOf[Int]).sum)
     }
     override def sideHash = counter + failure.hashCode() + exception.hashCode()