Skip to content

Commit c9bd715

Browse files
lihaoyilihaoyi
authored
uTest 0.9.0 final (#5619)
1 parent 87095fe commit c9bd715

File tree

70 files changed

+229
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+229
-229
lines changed

‎contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ object BuildInfoTests extends TestSuite {
205205
val Right(_) =
206206
eval.apply(BuildInfoPlain.run(Task.Anon(Args(runResult.toString)))): @unchecked
207207

208-
assertAll(
208+
assert(
209209
os.exists(runResult),
210210
os.read(runResult) == scalaVersionString
211211
)
@@ -239,7 +239,7 @@ object BuildInfoTests extends TestSuite {
239239
val Right(_) =
240240
eval.apply(BuildInfoJava.run(Task.Anon(Args(runResult.toString)))): @unchecked
241241

242-
assertAll(
242+
assert(
243243
os.exists(runResult),
244244
os.read(runResult) == "not-provided-for-java-modules"
245245
)
@@ -252,7 +252,7 @@ object BuildInfoTests extends TestSuite {
252252
val Right(_) =
253253
eval.apply(BuildInfoJavaStatic.run(Task.Anon(Args(runResult.toString)))): @unchecked
254254

255-
assertAll(
255+
assert(
256256
os.exists(runResult),
257257
os.exists(generatedSrc),
258258
os.read(runResult) == "not-provided-for-java-modules"
@@ -264,7 +264,7 @@ object BuildInfoTests extends TestSuite {
264264
val Right(_) =
265265
eval.apply(BuildInfoKotlin.run(Task.Anon(Args(runResult.toString)))): @unchecked
266266

267-
assertAll(
267+
assert(
268268
os.exists(runResult),
269269
os.read(runResult) == scalaVersionString
270270
)
@@ -279,7 +279,7 @@ object BuildInfoTests extends TestSuite {
279279
val Right(_) =
280280
eval.apply(BuildInfoKotlinStatic.run(Task.Anon(Args(runResult.toString)))): @unchecked
281281

282-
assertAll(
282+
assert(
283283
os.exists(runResult),
284284
os.exists(generatedSrc),
285285
os.read(runResult) == scalaVersionString
@@ -292,7 +292,7 @@ object BuildInfoTests extends TestSuite {
292292
).scoped { eval =>
293293
val buildInfoGeneratedSourcesFolder = eval.outPath / "buildInfoSources.dest"
294294
val Right(result) = eval.apply(BuildInfoPlain.generatedSources): @unchecked
295-
assertAll(
295+
assert(
296296
result.value.size == 1,
297297
os.isDir(result.value.head.path),
298298
result.value.head.path == buildInfoGeneratedSourcesFolder

‎contrib/flyway/test/src/mill/contrib/flyway/BuildTest.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mill.api.Discover
55
import mill.javalib.*
66
import mill.testkit.UnitTester
77
import mill.testkit.TestRootModule
8-
import utest.{TestSuite, Tests, assert, assertAll, *}
8+
import utest.{TestSuite, Tests, assert, *}
99

1010
object BuildTest extends TestSuite {
1111

@@ -32,12 +32,12 @@ object BuildTest extends TestSuite {
3232

3333
test("migrate") - UnitTester(Build, null).scoped { eval =>
3434
val Right(result) = eval(Build.build.flywayMigrate()): @unchecked
35-
assertAll(
35+
assert(
3636
result.evalCount > 0,
3737
result.value.migrationsExecuted == 1
3838
)
3939
val Right(resultAgain) = eval(Build.build.flywayMigrate()): @unchecked
40-
assertAll(
40+
assert(
4141
resultAgain.evalCount > 0,
4242
resultAgain.value.migrationsExecuted == 0
4343
)

‎contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package playlib
33

44
import mill.javalib.api.JvmWorkerUtil
55
import mill.testkit.{TestRootModule, UnitTester}
6-
import utest.{TestSuite, Tests, assert, assertAll, *}
6+
import utest.{TestSuite, Tests, assert, *}
77
import mill.api.Discover
88

99
object PlayModuleTests extends TestSuite with PlayTestSuite {
@@ -37,7 +37,7 @@ object PlayModuleTests extends TestSuite with PlayTestSuite {
3737
eval.apply(playmulti.core(scalaVersion, playVersion).test.sources): @unchecked
3838
val Right(testResources) =
3939
eval.apply(playmulti.core(scalaVersion, playVersion).test.resources): @unchecked
40-
assertAll(
40+
assert(
4141
conf.value.map(_.path.relativeTo(playmulti.moduleDir).toString()) == Seq(
4242
"core/conf"
4343
),
@@ -75,7 +75,7 @@ object PlayModuleTests extends TestSuite with PlayTestSuite {
7575
"play-ahc-ws"
7676
)
7777
val outputModules = result.value.map(_.dep.module.name.value)
78-
assertAll(
78+
assert(
7979
outputModules.forall(expectedModules.contains),
8080
result.evalCount > 0
8181
)
@@ -120,7 +120,7 @@ object PlayModuleTests extends TestSuite with PlayTestSuite {
120120
).map(
121121
eval.outPath / "core" / scalaVersion / playVersion / "compile.dest/classes" / _
122122
)
123-
assertAll(
123+
assert(
124124
result.value.classes.path == eval.outPath / "core" / scalaVersion / playVersion / "compile.dest/classes",
125125
outputClassFiles.nonEmpty,
126126
outputClassFiles.forall(expectedClassfiles.contains),

‎contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package mill.playlib
22

33
import mill.Task
44
import mill.testkit.{TestRootModule, UnitTester}
5-
import utest.{TestSuite, Tests, assert, assertAll, *}
5+
import utest.{TestSuite, Tests, assert, *}
66
import mill.api.Discover
77
import mill.util.TokenReaders.*
88
object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
@@ -22,7 +22,7 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
2222
test("playVersion") {
2323
test("fromBuild") - UnitTester(playsingleapi, resourcePath).scoped { eval =>
2424
val Right(result) = eval.apply(playsingleapi.playVersion): @unchecked
25-
assertAll(
25+
assert(
2626
result.value == testPlay28,
2727
result.evalCount > 0
2828
)
@@ -36,7 +36,7 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
3636
val Right(resources) = eval.apply(playsingleapi.resources): @unchecked
3737
val Right(testSources) = eval.apply(playsingleapi.test.sources): @unchecked
3838
val Right(testResources) = eval.apply(playsingleapi.test.resources): @unchecked
39-
assertAll(
39+
assert(
4040
conf.value.map(_.path.relativeTo(playsingleapi.moduleDir).toString()) == Seq(
4141
"conf"
4242
),
@@ -75,7 +75,7 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
7575
).map(
7676
eval.outPath / "compile.dest/classes" / _
7777
)
78-
assertAll(
78+
assert(
7979
result.value.classes.path == eval.outPath / "compile.dest/classes",
8080
outputFiles.nonEmpty,
8181
outputFiles.forall(expectedClassfiles.contains),

‎contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package mill.playlib
33
import mill.api.Discover
44
import mill.Task
55
import mill.testkit.{TestRootModule, UnitTester}
6-
import utest.{TestSuite, Tests, assertAll, *}
6+
import utest.{TestSuite, Tests, *}
77
import mill.util.TokenReaders.*
88
object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
99

@@ -27,7 +27,7 @@ object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
2727
val Right(resources) = eval.apply(playsingle.resources): @unchecked
2828
val Right(testSources) = eval.apply(playsingle.test.sources): @unchecked
2929
val Right(testResources) = eval.apply(playsingle.test.resources): @unchecked
30-
assertAll(
30+
assert(
3131
conf.value.map(_.path.relativeTo(playsingle.moduleDir).toString()) == Seq("conf"),
3232
app.value.map(_.path.relativeTo(playsingle.moduleDir).toString()) == Seq("app"),
3333
sources.value == app.value,
@@ -66,7 +66,7 @@ object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
6666
).map(
6767
eval.outPath / "compile.dest/classes" / _
6868
)
69-
assertAll(
69+
assert(
7070
result.value.classes.path == eval.outPath / "compile.dest/classes",
7171
outputFiles.nonEmpty,
7272
outputFiles.forall(expectedClassfiles.contains),

‎contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import mill.api.ExecResult
44
import mill.api.{Cross, Discover}
55
import mill.scalalib.ScalaModule
66
import mill.testkit.{TestRootModule, UnitTester}
7-
import utest.{TestSuite, Tests, assert, assertAll, *}
7+
import utest.{TestSuite, Tests, assert, *}
88
import mill.util.TokenReaders.*
99
object RouterModuleTests extends TestSuite with PlayTestSuite {
1010

@@ -47,7 +47,7 @@ object RouterModuleTests extends TestSuite with PlayTestSuite {
4747
).map(
4848
eval.outPath / "core" / scalaVersion / playVersion / "compileRouter.dest" / _
4949
)
50-
assertAll(
50+
assert(
5151
result.value.classes.path == eval.outPath / "core" / scalaVersion / playVersion / "compileRouter.dest",
5252
outputFiles.nonEmpty,
5353
outputFiles.forall(expectedClassfiles.contains),

‎contrib/proguard/test/src/mill/contrib/proguard/ProguardTests.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ object ProguardTests extends TestSuite {
2929
test("should download proguard jars") - UnitTester(proguard, testModuleSourcesPath).scoped {
3030
eval =>
3131
val Right(result) = eval.apply(proguard.proguardClasspath): @unchecked
32-
assertAll(
32+
assert(
3333
result.value.iterator.toSeq.nonEmpty,
3434
result.value.iterator.toSeq.head.path.toString().contains("proguard-base")
3535
)
@@ -46,7 +46,7 @@ object ProguardTests extends TestSuite {
4646
mergeErrIntoOut = true,
4747
check = false
4848
)
49-
assertAll(
49+
assert(
5050
res.exitCode == 0,
5151
res.out.text().contains("Hello world!")
5252
)
@@ -63,7 +63,7 @@ object ProguardTests extends TestSuite {
6363
mergeErrIntoOut = true,
6464
check = false
6565
)
66-
assertAll(
66+
assert(
6767
res.exitCode == 0,
6868
res.out.text().contains("Hello proguarded world!")
6969
)

‎contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import mill.constants.Util
66
import mill.api.Discover
77
import mill.testkit.UnitTester
88
import mill.testkit.TestRootModule
9-
import utest.{TestSuite, Tests, assert, assertAll, *}
9+
import utest.{TestSuite, Tests, assert, *}
1010

1111
object TutorialTests extends TestSuite {
1212
val testScalaPbVersion = "0.11.7"
@@ -89,7 +89,7 @@ object TutorialTests extends TestSuite {
8989
test("fromBuild") - UnitTester(Tutorial, resourcePath).scoped { eval =>
9090
val Right(result) = eval.apply(Tutorial.core.scalaPBVersion): @unchecked
9191

92-
assertAll(
92+
assert(
9393
result.value == testScalaPbVersion,
9494
result.evalCount > 0
9595
)
@@ -107,7 +107,7 @@ object TutorialTests extends TestSuite {
107107

108108
val expectedSourcefiles = compiledSourcefiles.map(outPath / _)
109109

110-
assertAll(
110+
assert(
111111
result.value.path == eval.outPath / "core/compileScalaPB.dest",
112112
outputFiles.nonEmpty,
113113
outputFiles.forall(expectedSourcefiles.contains),
@@ -141,7 +141,7 @@ object TutorialTests extends TestSuite {
141141
os.rel / "IncludeProto.scala"
142142
).map(outPath / _)
143143

144-
assertAll(
144+
assert(
145145
result.value.path == eval.outPath / "core/compileScalaPB.dest",
146146
outputFiles.nonEmpty,
147147
outputFiles.forall(expectedSourcefiles.contains),

‎contrib/scoverage/test/src/mill/contrib/scoverage/HelloWorldTests.scala‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ trait HelloWorldTests extends utest.TestSuite {
7171
test("scoverageVersion") - UnitTester(HelloWorld, resourcePath).scoped { eval =>
7272
val Right(result) = eval.apply(HelloWorld.core.scoverageVersion): @unchecked
7373

74-
assertAll(
74+
assert(
7575
result.value == testScoverageVersion,
7676
result.evalCount > 0
7777
)
@@ -81,7 +81,7 @@ trait HelloWorldTests extends utest.TestSuite {
8181
val Right(result) =
8282
eval.apply(HelloWorld.core.scoverage.unmanagedClasspath): @unchecked
8383

84-
assertAll(
84+
assert(
8585
result.value.map(_.toString).iterator.exists(_.contains("unmanaged.xml")),
8686
result.evalCount > 0
8787
)
@@ -95,7 +95,7 @@ trait HelloWorldTests extends utest.TestSuite {
9595
mvn"org.scoverage::scalac-scoverage-runtime:${testScoverageVersion}"
9696
)
9797

98-
assertAll(
98+
assert(
9999
result.value == expected,
100100
result.evalCount > 0
101101
)
@@ -118,7 +118,7 @@ trait HelloWorldTests extends utest.TestSuite {
118118
mvn"org.scoverage:::scalac-scoverage-plugin:${testScoverageVersion}"
119119
)
120120
}
121-
assertAll(
121+
assert(
122122
result.value == expected,
123123
result.evalCount > 0
124124
)
@@ -129,7 +129,7 @@ trait HelloWorldTests extends utest.TestSuite {
129129
val resultPath = result.value.path.toIO.getPath.replace("""\""", "/")
130130
val expectedEnd = "/out/core/scoverage/data.dest"
131131

132-
assertAll(
132+
assert(
133133
resultPath.endsWith(expectedEnd),
134134
result.evalCount > 0
135135
)
@@ -196,12 +196,12 @@ trait HelloWorldTests extends utest.TestSuite {
196196
val runtimeExistsOnClasspath =
197197
result.value.map(_.toString).iterator.exists(_.contains("scalac-scoverage-runtime"))
198198
if (isScala3) {
199-
assertAll(
199+
assert(
200200
!runtimeExistsOnClasspath,
201201
result.evalCount > 0
202202
)
203203
} else {
204-
assertAll(
204+
assert(
205205
runtimeExistsOnClasspath,
206206
result.evalCount > 0
207207
)
@@ -214,12 +214,12 @@ trait HelloWorldTests extends utest.TestSuite {
214214
val runtimeExistsOnClasspath =
215215
result.value.map(_.toString).iterator.exists(_.contains("scalac-scoverage-runtime"))
216216
if (isScala3) {
217-
assertAll(
217+
assert(
218218
!runtimeExistsOnClasspath,
219219
result.evalCount > 0
220220
)
221221
} else {
222-
assertAll(
222+
assert(
223223
runtimeExistsOnClasspath,
224224
result.evalCount > 0
225225
)
@@ -232,12 +232,12 @@ trait HelloWorldTests extends utest.TestSuite {
232232
result.value.map(_.toString).iterator.exists(_.contains("scalac-scoverage-runtime"))
233233

234234
if (isScala3) {
235-
assertAll(
235+
assert(
236236
!runtimeExistsOnClasspath,
237237
result.evalCount > 0
238238
)
239239
} else {
240-
assertAll(
240+
assert(
241241
runtimeExistsOnClasspath,
242242
result.evalCount > 0
243243
)

‎contrib/testng/test/src/mill/testng/TestNGTests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ object TestNGTests extends TestSuite {
4444
def tests: Tests = Tests {
4545
test("demo") - UnitTester(demo, resourcePath).scoped { eval =>
4646
val Right(result) = eval.apply(demo.test.testFramework): @unchecked
47-
assertAll(
47+
assert(
4848
result.value == "mill.testng.TestNGFramework",
4949
result.evalCount > 0
5050
)

0 commit comments

Comments
 (0)