summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala14
-rw-r--r--contrib/buildinfo/test/src/BuildInfoTests.scala12
-rw-r--r--contrib/flyway/test/src/BuildTest.scala6
-rw-r--r--contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala14
-rw-r--r--contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala10
-rw-r--r--contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala10
-rw-r--r--contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala6
-rw-r--r--contrib/scalapblib/test/src/TutorialTests.scala10
-rw-r--r--contrib/scoverage/test/src/HelloWorldTests.scala12
-rw-r--r--contrib/tut/test/src/TutTests.scala8
-rw-r--r--contrib/twirllib/test/src/HelloWorldTests.scala8
11 files changed, 55 insertions, 55 deletions
diff --git a/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala b/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
index 0af93c46..921e23b7 100644
--- a/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
+++ b/contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala
@@ -64,7 +64,7 @@ object BloopTests extends TestSuite {
read[BloopFile](os.read(workdir / ".bloop" / jsonFile))
def tests: Tests = Tests {
- 'genBloopTests - {
+ test("genBloopTests"){
testEvaluator(testBloop.install())
val scalaModuleConfig = readBloopConf("scalaModule.json")
@@ -73,7 +73,7 @@ object BloopTests extends TestSuite {
val scalajsModuleConfig = readBloopConf("scalajsModule.json")
val scalanativeModuleConfig = readBloopConf("scalanativeModule.json")
- 'scalaModule - {
+ test("scalaModule"){
val p = scalaModuleConfig.project
val name = p.name
val sources = p.sources.map(Path(_))
@@ -103,7 +103,7 @@ object BloopTests extends TestSuite {
assert(artifacts.map(_.name).distinct == List("bloop-config_2.12"))
assert(artifacts.flatMap(_.classifier).contains("sources"))
}
- 'scalaModuleTest - {
+ test("scalaModuleTest"){
val p = testModuleConfig.project
val name = p.name
val sources = p.sources.map(Path(_))
@@ -116,16 +116,16 @@ object BloopTests extends TestSuite {
assert(dep == "scalaModule")
assert(mainModuleClasspath.forall(p.classpath.contains))
}
- 'configAccessTest - {
+ test("configAccessTest"){
val (accessedConfig, _) =
testEvaluator(build.scalaModule.bloop.config).asSuccess.get.value.right.get
assert(accessedConfig == scalaModuleConfig)
}
- 'noDepTest - {
+ test("noDepTest"){
val cp = scalaModule2Config.project.classpath.map(_.toString)
assert(cp.exists(_.contains("scala-library-2.12.8")))
}
- 'scalajsModule - {
+ test("scalajsModule"){
val p = scalajsModuleConfig.project
val name = p.name
val sources = p.sources.map(Path(_))
@@ -139,7 +139,7 @@ object BloopTests extends TestSuite {
assert(platform.config.kind == BloopConfig.ModuleKindJS.CommonJSModule)
assert(platform.config.mode == BloopConfig.LinkerMode.Release)
}
- 'scalanativeModule - {
+ test("scalanativeModule"){
val p = scalanativeModuleConfig.project
val name = p.name
val sources = p.sources.map(Path(_))
diff --git a/contrib/buildinfo/test/src/BuildInfoTests.scala b/contrib/buildinfo/test/src/BuildInfoTests.scala
index 9b840ed9..74b69b76 100644
--- a/contrib/buildinfo/test/src/BuildInfoTests.scala
+++ b/contrib/buildinfo/test/src/BuildInfoTests.scala
@@ -55,8 +55,8 @@ object BuildInfoTests extends TestSuite {
def tests: Tests = Tests {
- 'buildinfo - {
- 'createSourcefile - workspaceTest(BuildInfo){ eval =>
+ test("buildinfo"){
+ test("createSourcefile") - workspaceTest(BuildInfo){ eval =>
val expected =
s"""|
|object BuildInfo {
@@ -70,7 +70,7 @@ object BuildInfoTests extends TestSuite {
)
}
- 'notCreateEmptySourcefile - workspaceTest(EmptyBuildInfo){ eval =>
+ test("notCreateEmptySourcefile") - workspaceTest(EmptyBuildInfo){ eval =>
val Right(((result, _), evalCount)) = eval.apply(EmptyBuildInfo.generatedBuildInfo)
assert(
result.isEmpty &&
@@ -78,7 +78,7 @@ object BuildInfoTests extends TestSuite {
)
}
- 'supportCustomSettings - workspaceTest(BuildInfoSettings){ eval =>
+ test("supportCustomSettings") - workspaceTest(BuildInfoSettings){ eval =>
val expected =
s"""|package foo
|
@@ -93,12 +93,12 @@ object BuildInfoTests extends TestSuite {
)
}
- 'compile - workspaceTest(BuildInfo){ eval =>
+ test("compile") - workspaceTest(BuildInfo){ eval =>
val Right((result, evalCount)) = eval.apply(BuildInfo.compile)
assert(true)
}
- 'run - workspaceTest(BuildInfo){ eval =>
+ test("run") - workspaceTest(BuildInfo){ eval =>
val runResult = eval.outPath / "hello-mill"
val Right((result, evalCount)) = eval.apply(BuildInfo.run(runResult.toString))
assert(
diff --git a/contrib/flyway/test/src/BuildTest.scala b/contrib/flyway/test/src/BuildTest.scala
index 961e0522..d8c9d033 100644
--- a/contrib/flyway/test/src/BuildTest.scala
+++ b/contrib/flyway/test/src/BuildTest.scala
@@ -19,13 +19,13 @@ object BuildTest extends TestSuite {
}
def tests = Tests {
- 'clean - {
+ test("clean"){
val eval = new TestEvaluator(Build)
val Right((_, count)) = eval(Build.build.flywayClean())
assert(count > 0)
}
- 'migrate - {
+ test("migrate"){
val eval = new TestEvaluator(Build)
val Right((res, count)) = eval(Build.build.flywayMigrate())
assert(
@@ -39,7 +39,7 @@ object BuildTest extends TestSuite {
)
}
- 'info - {
+ test("info"){
val eval = new TestEvaluator(Build)
val Right((_, count)) = eval(Build.build.flywayInfo())
assert(count > 0)
diff --git a/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
index e862249d..60f4da99 100644
--- a/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala
@@ -32,8 +32,8 @@ object PlayModuleTests extends TestSuite {
}
def tests: Tests = Tests {
- 'playVersion - {
- 'fromBuild - workspaceTest(playmulti) { eval =>
+ test("playVersion"){
+ test("fromBuild") - workspaceTest(playmulti) { eval =>
val Right((result, evalCount)) = eval.apply(playmulti.core.playVersion)
assert(
result == "2.7.0",
@@ -41,8 +41,8 @@ object PlayModuleTests extends TestSuite {
)
}
}
- 'layout - {
- 'fromBuild - workspaceTest(playmulti) { eval =>
+ test("layout"){
+ test("fromBuild") - workspaceTest(playmulti) { eval =>
val Right((conf, _)) = eval.apply(playmulti.core.conf)
val Right((app, _)) = eval.apply(playmulti.core.app)
val Right((sources, _)) = eval.apply(playmulti.core.sources)
@@ -59,8 +59,8 @@ object PlayModuleTests extends TestSuite {
)
}
}
- 'dependencies - {
- 'fromBuild - workspaceTest(playmulti) { eval =>
+ test("dependencies"){
+ test("fromBuild") - workspaceTest(playmulti) { eval =>
val Right((deps, evalCount)) = eval.apply(playmulti.core.ivyDeps)
val expectedModules = Seq[String](
"play",
@@ -76,7 +76,7 @@ object PlayModuleTests extends TestSuite {
)
}
}
- 'compile - workspaceTest(playmulti) { eval =>
+ test("compile") - workspaceTest(playmulti) { eval =>
val eitherResult = eval.apply(playmulti.core.compile)
val Right((result, evalCount)) = eitherResult
val outputFiles = ls.rec(result.classes.path).filter(_.isFile)
diff --git a/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
index df69ca83..31cea0e0 100644
--- a/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala
@@ -29,8 +29,8 @@ object PlaySingleApiModuleTests extends TestSuite {
}
def tests: Tests = Tests {
- 'playVersion - {
- 'fromBuild - workspaceTest(playsingleapi) { eval =>
+ test("playVersion"){
+ test("fromBuild") - workspaceTest(playsingleapi) { eval =>
val Right((result, evalCount)) = eval.apply(playsingleapi.playVersion)
assert(
result == "2.7.0",
@@ -38,8 +38,8 @@ object PlaySingleApiModuleTests extends TestSuite {
)
}
}
- 'layout - {
- 'fromBuild - workspaceTest(playsingleapi) { eval =>
+ test("layout"){
+ test("fromBuild") - workspaceTest(playsingleapi) { eval =>
val Right((conf, _)) = eval.apply(playsingleapi.conf)
val Right((app, _)) = eval.apply(playsingleapi.app)
val Right((sources, _)) = eval.apply(playsingleapi.sources)
@@ -56,7 +56,7 @@ object PlaySingleApiModuleTests extends TestSuite {
)
}
}
- 'compile - workspaceTest(playsingleapi) { eval =>
+ test("compile") - workspaceTest(playsingleapi) { eval =>
val eitherResult = eval.apply(playsingleapi.compile)
val Right((result, evalCount)) = eitherResult
val outputFiles = ls.rec(result.classes.path).filter(_.isFile)
diff --git a/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala b/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
index e139ae16..d037f44d 100644
--- a/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala
@@ -29,8 +29,8 @@ object PlaySingleModuleTests extends TestSuite {
}
def tests: Tests = Tests {
- 'playVersion - {
- 'fromBuild - workspaceTest(playsingle) { eval =>
+ test("playVersion"){
+ test("fromBuild") - workspaceTest(playsingle) { eval =>
val Right((result, evalCount)) = eval.apply(playsingle.playVersion)
assert(
result == "2.7.0",
@@ -38,8 +38,8 @@ object PlaySingleModuleTests extends TestSuite {
)
}
}
- 'layout - {
- 'fromBuild - workspaceTest(playsingle) { eval =>
+ test("layout"){
+ test("fromBuild") - workspaceTest(playsingle) { eval =>
val Right((conf, _)) = eval.apply(playsingle.conf)
val Right((app, _)) = eval.apply(playsingle.app)
val Right((sources, _)) = eval.apply(playsingle.sources)
@@ -56,7 +56,7 @@ object PlaySingleModuleTests extends TestSuite {
)
}
}
- 'compile - workspaceTest(playsingle) { eval =>
+ test("compile") - workspaceTest(playsingle) { eval =>
val eitherResult = eval.apply(playsingle.compile)
val Right((result, evalCount)) = eitherResult
val outputFiles = ls.rec(result.classes.path).filter(_.isFile)
diff --git a/contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala b/contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala
index 1aeed019..dbab30ca 100644
--- a/contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala
+++ b/contrib/playlib/test/src/mill/playlib/RouterModuleTests.scala
@@ -46,9 +46,9 @@ object RouterModuleTests extends TestSuite {
}
def tests: Tests = Tests {
- 'playVersion - {
+ test("playVersion"){
- 'fromBuild - workspaceTest(HelloWorld) { eval =>
+ test("fromBuild") - workspaceTest(HelloWorld) { eval =>
val Right((result, evalCount)) = eval.apply(HelloWorld.core.playVersion)
assert(
@@ -57,7 +57,7 @@ object RouterModuleTests extends TestSuite {
)
}
}
- 'compileRouter - workspaceTest(HelloWorld) { eval =>
+ test("compileRouter") - workspaceTest(HelloWorld) { eval =>
val eitherResult = eval.apply(HelloWorld.core.compileRouter)
val Right((result, evalCount)) = eitherResult
val outputFiles = ls.rec(result.classes.path).filter(_.isFile)
diff --git a/contrib/scalapblib/test/src/TutorialTests.scala b/contrib/scalapblib/test/src/TutorialTests.scala
index fe0ce8d5..ae9aa7dd 100644
--- a/contrib/scalapblib/test/src/TutorialTests.scala
+++ b/contrib/scalapblib/test/src/TutorialTests.scala
@@ -48,9 +48,9 @@ object TutorialTests extends TestSuite {
)
def tests: Tests = Tests {
- 'scalapbVersion - {
+ test("scalapbVersion"){
- 'fromBuild - workspaceTest(Tutorial) { eval =>
+ test("fromBuild") - workspaceTest(Tutorial) { eval =>
val Right((result, evalCount)) = eval.apply(Tutorial.core.scalaPBVersion)
assert(
@@ -60,8 +60,8 @@ object TutorialTests extends TestSuite {
}
}
- 'compileScalaPB - {
- 'calledDirectly - workspaceTest(Tutorial) { eval =>
+ test("compileScalaPB"){
+ test("calledDirectly") - workspaceTest(Tutorial) { eval =>
val Right((result, evalCount)) = eval.apply(Tutorial.core.compileScalaPB)
val outPath = protobufOutPath(eval)
@@ -86,7 +86,7 @@ object TutorialTests extends TestSuite {
// This throws a NullPointerException in coursier somewhere
//
- // 'triggeredByScalaCompile - workspaceTest(Tutorial) { eval =>
+ // test("triggeredByScalaCompile") - workspaceTest(Tutorial) { eval =>
// val Right((_, evalCount)) = eval.apply(Tutorial.core.compile)
// val outPath = protobufOutPath(eval)
diff --git a/contrib/scoverage/test/src/HelloWorldTests.scala b/contrib/scoverage/test/src/HelloWorldTests.scala
index 3d5a5114..5084f5bb 100644
--- a/contrib/scoverage/test/src/HelloWorldTests.scala
+++ b/contrib/scoverage/test/src/HelloWorldTests.scala
@@ -63,8 +63,8 @@ object HelloWorldTests extends utest.TestSuite {
}
def tests: utest.Tests = utest.Tests {
- "HelloWorld" - {
- "core" - {
+ test("HelloWorld"){
+ test("core"){
"scoverageVersion" - workspaceTest(HelloWorld) { eval =>
val Right((result, evalCount)) = eval.apply(HelloWorld.core.scoverageVersion)
@@ -73,7 +73,7 @@ object HelloWorldTests extends utest.TestSuite {
evalCount > 0
)
}
- "scoverage" - {
+ test("scoverage"){
"ivyDeps" - workspaceTest(HelloWorld) { eval =>
val Right((result, evalCount)) =
eval.apply(HelloWorld.core.scoverage.ivyDeps)
@@ -111,7 +111,7 @@ object HelloWorldTests extends utest.TestSuite {
assert(evalCount > 0)
}
}
- "test" - {
+ test("test"){
"upstreamAssemblyClasspath" - workspaceTest(HelloWorld) { eval =>
val Right((result, evalCount)) = eval.apply(HelloWorld.core.scoverage.upstreamAssemblyClasspath)
@@ -139,8 +139,8 @@ object HelloWorldTests extends utest.TestSuite {
}
}
}
- "HelloWorldSbt" - {
- "scoverage" - {
+ test("HelloWorldSbt"){
+ test("scoverage"){
"htmlReport" - workspaceTest(HelloWorldSbt, sbtResourcePath) { eval =>
val Right((_, _)) = eval.apply(HelloWorldSbt.core.test.compile)
val Right((result, evalCount)) = eval.apply(HelloWorldSbt.core.scoverage.htmlReport)
diff --git a/contrib/tut/test/src/TutTests.scala b/contrib/tut/test/src/TutTests.scala
index 468654bb..e778c3d5 100644
--- a/contrib/tut/test/src/TutTests.scala
+++ b/contrib/tut/test/src/TutTests.scala
@@ -43,8 +43,8 @@ object TutTests extends TestSuite {
}
def tests: Tests = Tests {
- 'tut - {
- 'createOutputFile - workspaceTest(TutTest) { eval =>
+ test("tut"){
+ test("createOutputFile") - workspaceTest(TutTest) { eval =>
val expectedPath =
eval.outPath / 'tutTargetDirectory / 'dest / "TutExample.md"
@@ -65,7 +65,7 @@ object TutTests extends TestSuite {
)
}
- 'supportCustomSettings - workspaceTest(TutCustomTest) { eval =>
+ test("supportCustomSettings") - workspaceTest(TutCustomTest) { eval =>
val defaultPath =
eval.outPath / 'tutTargetDirectory / 'dest / "TutExample.md"
val expectedPath =
@@ -89,7 +89,7 @@ object TutTests extends TestSuite {
)
}
- 'supportUsingLibraries - workspaceTest(TutLibrariesTest, resourcePath = resourcePathWithLibraries) { eval =>
+ test("supportUsingLibraries") - workspaceTest(TutLibrariesTest, resourcePath = resourcePathWithLibraries) { eval =>
val expectedPath =
eval.outPath / 'tutTargetDirectory / 'dest / "TutWithLibraries.md"
diff --git a/contrib/twirllib/test/src/HelloWorldTests.scala b/contrib/twirllib/test/src/HelloWorldTests.scala
index 67344ea6..e10b9dc1 100644
--- a/contrib/twirllib/test/src/HelloWorldTests.scala
+++ b/contrib/twirllib/test/src/HelloWorldTests.scala
@@ -75,9 +75,9 @@ object HelloWorldTests extends TestSuite {
)
def tests: Tests = Tests {
- 'twirlVersion - {
+ test("twirlVersion"){
- 'fromBuild - workspaceTest(HelloWorld, "hello-world") { eval =>
+ test("fromBuild") - workspaceTest(HelloWorld, "hello-world") { eval =>
val Right((result, evalCount)) =
eval.apply(HelloWorld.core.twirlVersion)
@@ -87,7 +87,7 @@ object HelloWorldTests extends TestSuite {
)
}
}
- 'compileTwirl - workspaceTest(HelloWorld, "hello-world") { eval =>
+ test("compileTwirl") - workspaceTest(HelloWorld, "hello-world") { eval =>
val Right((result, evalCount)) = eval.apply(HelloWorld.core.compileTwirl)
val outputFiles = os.walk(result.classes.path).filter(_.last.endsWith(".scala"))
@@ -119,7 +119,7 @@ object HelloWorldTests extends TestSuite {
assert(unchangedEvalCount == 0)
}
- 'compileTwirlInclusiveDot - workspaceTest(HelloWorldWithInclusiveDot, "hello-world-inclusive-dot") { eval =>
+ test("compileTwirlInclusiveDot") - workspaceTest(HelloWorldWithInclusiveDot, "hello-world-inclusive-dot") { eval =>
val Right((result, evalCount)) = eval.apply(HelloWorldWithInclusiveDot.core.compileTwirl)
val outputFiles = os.walk(result.classes.path).filter(_.last.endsWith(".scala"))