From 7ead16fb5e8ee58576524cb5661c33533e6cd888 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 16 Jun 2019 18:50:06 -0700 Subject: utest 0.7.1 --- integration/test/src/AcyclicTests.scala | 4 ++-- integration/test/src/AmmoniteTests.scala | 2 +- integration/test/src/BetterFilesTests.scala | 2 +- integration/test/src/CaffeineTests.scala | 2 +- integration/test/src/DocAnnotationsTests.scala | 2 +- integration/test/src/JawnTests.scala | 4 ++-- integration/test/src/LargeProjectTests.scala | 2 +- integration/test/src/PlayJsonTests.scala | 8 ++++---- integration/test/src/UpickleTests.scala | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'integration') diff --git a/integration/test/src/AcyclicTests.scala b/integration/test/src/AcyclicTests.scala index 145c106d..e29dc16d 100644 --- a/integration/test/src/AcyclicTests.scala +++ b/integration/test/src/AcyclicTests.scala @@ -24,8 +24,8 @@ class AcyclicTests(fork: Boolean) assert(!brokenCompile) } - 'scala2118 - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8")) - 'scala2124 - check("2.12.4") + test("scala2118") - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8")) + test("scala2124") - check("2.12.4") } } diff --git a/integration/test/src/AmmoniteTests.scala b/integration/test/src/AmmoniteTests.scala index 5851a393..eb4d97cf 100644 --- a/integration/test/src/AmmoniteTests.scala +++ b/integration/test/src/AmmoniteTests.scala @@ -29,7 +29,7 @@ class AmmoniteTests(fork: Boolean) ) } - 'scala2124 - check("2.12.4") + test("scala2124") - check("2.12.4") } } diff --git a/integration/test/src/BetterFilesTests.scala b/integration/test/src/BetterFilesTests.scala index bdbaa2e3..4a816e96 100644 --- a/integration/test/src/BetterFilesTests.scala +++ b/integration/test/src/BetterFilesTests.scala @@ -6,7 +6,7 @@ class BetterFilesTests(fork: Boolean) extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "better-files", fork) { val tests = Tests{ initWorkspace() - 'test - { + test("test"){ assert(eval("core.test")) assert(eval("akka.test")) diff --git a/integration/test/src/CaffeineTests.scala b/integration/test/src/CaffeineTests.scala index 56c66b21..363d6d21 100644 --- a/integration/test/src/CaffeineTests.scala +++ b/integration/test/src/CaffeineTests.scala @@ -5,7 +5,7 @@ import utest._ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_REPO", "caffeine", fork) { val tests = Tests{ initWorkspace() - 'test - { + test("test"){ // Caffeine only can build using Java 9 or up. Java 8 results in weird // type inference issues during the compile if (mill.main.client.Util.isJava9OrAbove){ diff --git a/integration/test/src/DocAnnotationsTests.scala b/integration/test/src/DocAnnotationsTests.scala index 4d7ef11b..9fcf2f9f 100644 --- a/integration/test/src/DocAnnotationsTests.scala +++ b/integration/test/src/DocAnnotationsTests.scala @@ -8,7 +8,7 @@ class DocAnnotationsTests(fork: Boolean) extends ScriptTestSuite(fork) { def scriptSourcePath: os.Path = os.pwd / 'integration / 'test / 'resources / workspaceSlug val tests = Tests{ initWorkspace() - 'test - { + test("test"){ assert(eval("inspect", "core.test.ivyDeps")) val inheritedIvyDeps = ujson.read(meta("inspect"))("value").str assert( diff --git a/integration/test/src/JawnTests.scala b/integration/test/src/JawnTests.scala index eafd1009..5ba02629 100644 --- a/integration/test/src/JawnTests.scala +++ b/integration/test/src/JawnTests.scala @@ -25,7 +25,7 @@ class JawnTests(fork: Boolean) assert(!brokenCompile) } - 'scala21111 - check("2.11.11") - 'scala2123 - check("2.12.3") + test("scala21111") - check("2.11.11") + test("scala2123") - check("2.12.3") } } diff --git a/integration/test/src/LargeProjectTests.scala b/integration/test/src/LargeProjectTests.scala index e20bc932..f1eb113d 100644 --- a/integration/test/src/LargeProjectTests.scala +++ b/integration/test/src/LargeProjectTests.scala @@ -10,7 +10,7 @@ class LargeProjectTests(fork: Boolean) val tests = Tests{ initWorkspace() - 'test - { + test("test"){ assert(eval("foo.common.one.compile")) } diff --git a/integration/test/src/PlayJsonTests.scala b/integration/test/src/PlayJsonTests.scala index 262dcb36..857c0232 100644 --- a/integration/test/src/PlayJsonTests.scala +++ b/integration/test/src/PlayJsonTests.scala @@ -12,7 +12,7 @@ class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_ val tests = Tests{ initWorkspace() - 'jvm - { + test("jvm"){ assert(eval("playJsonJvm[2.12.4].test")) val jvmMeta = meta("playJsonJvm[2.12.4].test.test") @@ -26,7 +26,7 @@ class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_ jvmMeta.contains("JSON reads should::validate Dates") ) } - 'js - { + test("js"){ assert(eval("playJsonJs[2.12.4].test")) val jsMeta = meta("playJsonJs[2.12.4].test.test") @@ -40,7 +40,7 @@ class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_ jsMeta.contains("Complete JSON should create full object when lose precision when parsing BigDecimals") ) } - 'playJoda - { + test("playJoda"){ assert(eval("playJoda[2.12.4].test")) val metaFile = meta("playJoda[2.12.4].test.test") @@ -50,7 +50,7 @@ class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_ ) } - 'benchmarks - { + test("benchmarks"){ // "benchmarks[2.12.4].runJmh" -i 1 -wi 1 -f1 -t1 } } diff --git a/integration/test/src/UpickleTests.scala b/integration/test/src/UpickleTests.scala index 133188d3..46c97223 100644 --- a/integration/test/src/UpickleTests.scala +++ b/integration/test/src/UpickleTests.scala @@ -5,7 +5,7 @@ import utest._ class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) { val tests = Tests{ initWorkspace() - 'jvm21111 - { + test("jvm21111"){ mill.util.TestUtil.disableInJava9OrAbove({ assert(eval("upickleJvm[2.11.11].test")) val jvmMeta = meta("upickleJvm[2.11.11].test.test") @@ -13,13 +13,13 @@ class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REP assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) }) } - 'jvm2124 - { + test("jvm2124"){ assert(eval("upickleJvm[2.12.4].test")) val jvmMeta = meta("upickleJvm[2.12.4].test.test") assert(jvmMeta.contains("example.ExampleTests.simple")) assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) } - 'js - { + test("js"){ assert(eval("upickleJs[2.12.4].test")) val jsMeta = meta("upickleJs[2.12.4].test.test") assert(jsMeta .contains("example.ExampleTests.simple")) -- cgit v1.2.3