Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Feb 11, 2025
1 parent 742a4c9 commit 3d4995d
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package mill.playlib

import mill.api.Result.Failure
import mill.api.ExecResult
import mill.define.{Cross, Discover}
import mill.scalalib.ScalaModule
Expand Down
2 changes: 1 addition & 1 deletion core/api/src/mill/api/Result.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sealed trait Result[+T] {
}
object Result {
implicit def create[T](value: T): Result[T] = Success(value)

case class Success[+T](value: T) extends Result[T] {

def map[V](f: T => V): Result[V] = Success(f(value))
Expand Down
4 changes: 3 additions & 1 deletion core/resolve/src/mill/resolve/ParseArgs.scala
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ private[mill] object ParseArgs {

private def validateSelectors(selectors: Seq[String]): Result[Unit] = {
if (selectors.isEmpty || selectors.exists(_.isEmpty)) {
Result.Failure("Target selector must not be empty. Try `mill resolve _` to see what's available.")
Result.Failure(
"Target selector must not be empty. Try `mill resolve _` to see what's available."
)
} else Result.Success(())
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import mill.api.ExecResult
import mill.define.Discover
import mill.exec.ExecutionPaths
import mill.testkit.{TestBaseModule, UnitTester}
import sbt.testing.Status
import utest.{TestSuite, Tests, assert, test}

object KotlinJsKotestModuleTests extends TestSuite {
Expand Down Expand Up @@ -56,7 +55,7 @@ object KotlinJsKotestModuleTests extends TestSuite {
|
|HelloTests - failure: AssertionFailedError: expected:<\"Not hello, world\"> but was:<\"Hello, world\">
|
|""".stripMargin,
|""".stripMargin
// doneMessage == s"""
// |Tests: 2, Passed: 1, Failed: 1, Skipped: 0
// |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import mill.api.ExecResult
import mill.define.Discover
import mill.exec.ExecutionPaths
import mill.testkit.{TestBaseModule, UnitTester}
import sbt.testing.Status
import utest.{TestSuite, Tests, assert, test}

object KotlinJsKotlinTestPackageModuleTests extends TestSuite {
Expand Down Expand Up @@ -57,7 +56,7 @@ object KotlinJsKotlinTestPackageModuleTests extends TestSuite {
|
|foo HelloTests - failure: AssertionError: Expected <Hello, world>, actual <Not hello, world>.
|
|""".stripMargin,
|""".stripMargin
// doneMessage == s"""
// |Tests: 2, Passed: 1, Failed: 1, Skipped: 0
// |
Expand Down
2 changes: 1 addition & 1 deletion main/init/test/src/mill/init/InitModuleTests.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package mill.init

import mill.api.{Result, Val}
import mill.api.Val
import mill.define.Discover
import mill.testkit.UnitTester
import mill.testkit.TestBaseModule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ object CheckstyleXsltModuleTest extends TestSuite {
val eval = UnitTester(module, modulePath)

eval(module.checkstyle(CheckstyleArgs(check = false, sources = Leftover()))).get


val Right(reports) = eval(module.checkstyleXsltReports): @unchecked

Expand Down
1 change: 0 additions & 1 deletion scalalib/test/src/mill/scalalib/AssemblyExeTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package mill.scalalib

import mill.api.ExecResult
import scala.util.Properties
import mill.api.Result
import mill.testkit.UnitTester
import utest._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package mill.scalalib

import mill.api.Result
import mill.api.ExecResult
import mill.testkit.UnitTester
import sbt.testing.Status
Expand Down
1 change: 0 additions & 1 deletion scalalib/test/src/mill/scalalib/TestRunnerUtestTests.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package mill.scalalib

import mill.api.Result
import mill.api.ExecResult
import mill.testkit.UnitTester
import sbt.testing.Status
Expand Down
6 changes: 5 additions & 1 deletion testkit/src/mill/testkit/UnitTester.scala
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ class UnitTester(
}
}

def fail(target: Target[?], expectedFailCount: Int, expectedRawValues: Seq[ExecResult[?]]): Unit = {
def fail(
target: Target[?],
expectedFailCount: Int,
expectedRawValues: Seq[ExecResult[?]]
): Unit = {

val res = evaluator.evaluate(Seq(target))

Expand Down

0 comments on commit 3d4995d

Please sign in to comment.