From 9ba4cb69331386dfde9bac69dc2d5b22401face3 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Wed, 12 Dec 2018 16:56:02 -0800 Subject: collapse boilerplate folder structure within src/ folders (#505) * collapse boilerplate folder structure within src/ folders * . --- integration/test/src/AcyclicTests.scala | 31 ++++++++++++ integration/test/src/AmmoniteTests.scala | 35 +++++++++++++ integration/test/src/BetterFilesTests.scala | 26 ++++++++++ integration/test/src/CaffeineTests.scala | 34 +++++++++++++ integration/test/src/DocAnnotationsTests.scala | 33 +++++++++++++ integration/test/src/IntegrationTestSuite.scala | 28 +++++++++++ integration/test/src/JawnTests.scala | 31 ++++++++++++ integration/test/src/PlayJsonTests.scala | 57 ++++++++++++++++++++++ integration/test/src/UpickleTests.scala | 30 ++++++++++++ integration/test/src/forked/Tests.scala | 10 ++++ integration/test/src/local/Tests.scala | 10 ++++ .../test/src/mill/integration/AcyclicTests.scala | 31 ------------ .../test/src/mill/integration/AmmoniteTests.scala | 35 ------------- .../src/mill/integration/BetterFilesTests.scala | 26 ---------- .../test/src/mill/integration/CaffeineTests.scala | 34 ------------- .../src/mill/integration/DocAnnotationsTests.scala | 33 ------------- .../mill/integration/IntegrationTestSuite.scala | 28 ----------- .../test/src/mill/integration/JawnTests.scala | 31 ------------ .../test/src/mill/integration/PlayJsonTests.scala | 57 ---------------------- .../test/src/mill/integration/UpickleTests.scala | 30 ------------ .../test/src/mill/integration/forked/Tests.scala | 10 ---- .../test/src/mill/integration/local/Tests.scala | 10 ---- 22 files changed, 325 insertions(+), 325 deletions(-) create mode 100644 integration/test/src/AcyclicTests.scala create mode 100644 integration/test/src/AmmoniteTests.scala create mode 100644 integration/test/src/BetterFilesTests.scala create mode 100644 integration/test/src/CaffeineTests.scala create mode 100644 integration/test/src/DocAnnotationsTests.scala create mode 100644 integration/test/src/IntegrationTestSuite.scala create mode 100644 integration/test/src/JawnTests.scala create mode 100644 integration/test/src/PlayJsonTests.scala create mode 100644 integration/test/src/UpickleTests.scala create mode 100644 integration/test/src/forked/Tests.scala create mode 100644 integration/test/src/local/Tests.scala delete mode 100644 integration/test/src/mill/integration/AcyclicTests.scala delete mode 100644 integration/test/src/mill/integration/AmmoniteTests.scala delete mode 100644 integration/test/src/mill/integration/BetterFilesTests.scala delete mode 100644 integration/test/src/mill/integration/CaffeineTests.scala delete mode 100644 integration/test/src/mill/integration/DocAnnotationsTests.scala delete mode 100644 integration/test/src/mill/integration/IntegrationTestSuite.scala delete mode 100644 integration/test/src/mill/integration/JawnTests.scala delete mode 100644 integration/test/src/mill/integration/PlayJsonTests.scala delete mode 100644 integration/test/src/mill/integration/UpickleTests.scala delete mode 100644 integration/test/src/mill/integration/forked/Tests.scala delete mode 100644 integration/test/src/mill/integration/local/Tests.scala (limited to 'integration') diff --git a/integration/test/src/AcyclicTests.scala b/integration/test/src/AcyclicTests.scala new file mode 100644 index 00000000..145c106d --- /dev/null +++ b/integration/test/src/AcyclicTests.scala @@ -0,0 +1,31 @@ +package mill.integration + +import utest._ + +class AcyclicTests(fork: Boolean) + extends IntegrationTestSuite("MILL_ACYCLIC_REPO", "acyclic", fork) { + val tests = Tests{ + initWorkspace() + + def check(scalaVersion: String) = { + val firstCompile = eval(s"acyclic[$scalaVersion].compile") + + assert( + firstCompile, + os.walk(workspacePath).exists(_.last == "GraphAnalysis.class"), + os.walk(workspacePath).exists(_.last == "PluginPhase.class") + ) + for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ + os.write.append(scalaFile, "\n}") + } + + val brokenCompile = eval(s"acyclic[$scalaVersion].compile") + + assert(!brokenCompile) + } + + 'scala2118 - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8")) + 'scala2124 - check("2.12.4") + + } +} diff --git a/integration/test/src/AmmoniteTests.scala b/integration/test/src/AmmoniteTests.scala new file mode 100644 index 00000000..5851a393 --- /dev/null +++ b/integration/test/src/AmmoniteTests.scala @@ -0,0 +1,35 @@ +package mill.integration + +import utest._ + +class AmmoniteTests(fork: Boolean) + extends IntegrationTestSuite("MILL_AMMONITE_REPO", "ammonite", fork) { + val tests = Tests{ + initWorkspace() + + def check(scalaVersion: String) = { + val replTests = eval( + s"amm.repl[$scalaVersion].test", "{ammonite.unit,ammonite.session.ProjectTests.guava}" + ) + val replTestMeta = meta(s"amm.repl[$scalaVersion].test.test") + assert( + replTests, + replTestMeta.contains("ammonite.session.ProjectTests.guava"), + replTestMeta.contains("ammonite.unit.SourceTests.objectInfo.thirdPartyJava") + ) + + val compileResult = eval( + "all", s"{shell,sshd,amm,integration}[$scalaVersion].test.compile" + ) + + assert( + compileResult, + os.walk(workspacePath / 'out / 'integration / scalaVersion / 'test / 'compile) + .exists(_.last == "ErrorTruncationTests.class") + ) + } + + 'scala2124 - check("2.12.4") + + } +} diff --git a/integration/test/src/BetterFilesTests.scala b/integration/test/src/BetterFilesTests.scala new file mode 100644 index 00000000..bdbaa2e3 --- /dev/null +++ b/integration/test/src/BetterFilesTests.scala @@ -0,0 +1,26 @@ +package mill.integration + +import utest._ + +class BetterFilesTests(fork: Boolean) + extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "better-files", fork) { + val tests = Tests{ + initWorkspace() + 'test - { + + assert(eval("core.test")) + assert(eval("akka.test")) + assert(eval("benchmarks.test.compile")) + + val coreTestMeta = meta("core.test.test") + assert(coreTestMeta.contains("better.files.FileSpec")) + assert(coreTestMeta.contains("files should handle BOM")) + + for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ + os.write.append(scalaFile, "\n}") + } + assert(!eval("akka.test")) + } + + } +} diff --git a/integration/test/src/CaffeineTests.scala b/integration/test/src/CaffeineTests.scala new file mode 100644 index 00000000..56c66b21 --- /dev/null +++ b/integration/test/src/CaffeineTests.scala @@ -0,0 +1,34 @@ +package mill.integration + +import utest._ + +class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_REPO", "caffeine", fork) { + val tests = Tests{ + initWorkspace() + '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){ + assert(eval("caffeine.test.compile")) + + val suites = Seq( + "com.github.benmanes.caffeine.SingleConsumerQueueTest", + "com.github.benmanes.caffeine.cache.AsyncTest", + "com.github.benmanes.caffeine.cache.CaffeineTest", + "com.github.benmanes.caffeine.cache.TimerWheelTest" + ) + assert(eval( + "caffeine.test", + "-testclass", suites.mkString(",") + )) + assert(eval("guava.test.compile")) + assert(eval("guava.test")) + + assert(eval("jcache.test.compile")) + assert(eval("simulator.test.compile")) + + } + } + + } +} diff --git a/integration/test/src/DocAnnotationsTests.scala b/integration/test/src/DocAnnotationsTests.scala new file mode 100644 index 00000000..4d7ef11b --- /dev/null +++ b/integration/test/src/DocAnnotationsTests.scala @@ -0,0 +1,33 @@ +package mill.integration + +import mill.util.ScriptTestSuite +import utest._ + +class DocAnnotationsTests(fork: Boolean) extends ScriptTestSuite(fork) { + def workspaceSlug: String = "docannotations" + def scriptSourcePath: os.Path = os.pwd / 'integration / 'test / 'resources / workspaceSlug + val tests = Tests{ + initWorkspace() + 'test - { + assert(eval("inspect", "core.test.ivyDeps")) + val inheritedIvyDeps = ujson.read(meta("inspect"))("value").str + assert( + inheritedIvyDeps.contains("core.test.ivyDeps"), + inheritedIvyDeps.contains("Overriden ivyDeps Docs!!!"), + inheritedIvyDeps.contains("Any ivy dependencies you want to add to this Module"), + ) + + assert(eval("inspect", "core.task")) + val task = ujson.read(meta("inspect"))("value").str + assert( + task.contains("Core Task Docz!") + ) + + assert(eval("inspect", "inspect")) + val doc = ujson.read(meta("inspect"))("value").str + assert( + doc.contains("Displays metadata about the given task without actually running it.") + ) + } + } +} diff --git a/integration/test/src/IntegrationTestSuite.scala b/integration/test/src/IntegrationTestSuite.scala new file mode 100644 index 00000000..ca041eea --- /dev/null +++ b/integration/test/src/IntegrationTestSuite.scala @@ -0,0 +1,28 @@ +package mill.integration + +import mill.util.ScriptTestSuite +import utest._ + +abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String, fork: Boolean) + extends ScriptTestSuite(fork){ + val buildFilePath = os.pwd / 'integration / 'test / 'resources / workspaceSlug + def scriptSourcePath = { + // The unzipped git repo snapshots we get from github come with a + // wrapper-folder inside the zip file, so copy the wrapper folder to the + // destination instead of the folder containing the wrapper. + + val path = sys.props(repoKey) + val Seq(wrapper) = os.list(os.Path(path)) + wrapper + } + + def buildFiles: Seq[os.Path] = os.walk(buildFilePath) + + override def initWorkspace() = { + super.initWorkspace() + buildFiles.foreach { file => + os.copy.over(file, workspacePath / file.last) + } + assert(!os.walk(workspacePath).exists(_.ext == "class")) + } +} diff --git a/integration/test/src/JawnTests.scala b/integration/test/src/JawnTests.scala new file mode 100644 index 00000000..eafd1009 --- /dev/null +++ b/integration/test/src/JawnTests.scala @@ -0,0 +1,31 @@ +package mill.integration + +import utest._ + +class JawnTests(fork: Boolean) + extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn", fork) { + val tests = Tests{ + initWorkspace() + + def check(scalaVersion: String) = { + val firstCompile = eval(s"jawn[$scalaVersion].parser.test") + + assert( + firstCompile, + os.walk(workspacePath).exists(_.last == "AsyncParser.class"), + os.walk(workspacePath).exists(_.last == "CharBuilderSpec.class") + ) + + for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ + os.write.append(scalaFile, "\n}") + } + + val brokenCompile = eval(s"jawn[$scalaVersion].parser.test") + + assert(!brokenCompile) + } + + 'scala21111 - check("2.11.11") + 'scala2123 - check("2.12.3") + } +} diff --git a/integration/test/src/PlayJsonTests.scala b/integration/test/src/PlayJsonTests.scala new file mode 100644 index 00000000..262dcb36 --- /dev/null +++ b/integration/test/src/PlayJsonTests.scala @@ -0,0 +1,57 @@ +package mill.integration + + +import utest._ + +class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_REPO", "play-json", fork) { + + override def buildFiles: Seq[os.Path] = { + os.list(buildFilePath).filter(_.ext == "sc") + } + + val tests = Tests{ + initWorkspace() + + 'jvm - { + assert(eval("playJsonJvm[2.12.4].test")) + val jvmMeta = meta("playJsonJvm[2.12.4].test.test") + + assert( + jvmMeta.contains("play.api.libs.json.JsonSharedSpec"), + jvmMeta.contains("JSON should support basic array operations") + ) + + assert( + jvmMeta.contains("play.api.libs.json.JsonValidSpec"), + jvmMeta.contains("JSON reads should::validate Dates") + ) + } + 'js - { + assert(eval("playJsonJs[2.12.4].test")) + val jsMeta = meta("playJsonJs[2.12.4].test.test") + + assert( + jsMeta.contains("play.api.libs.json.JsonSharedSpec"), + jsMeta.contains("JSON should support basic array operations") + ) + + assert( + jsMeta.contains("play.api.libs.json.JsonSpec"), + jsMeta.contains("Complete JSON should create full object when lose precision when parsing BigDecimals") + ) + } + 'playJoda - { + assert(eval("playJoda[2.12.4].test")) + val metaFile = meta("playJoda[2.12.4].test.test") + + assert( + metaFile.contains("play.api.libs.json.JsonJodaValidSpec"), + metaFile.contains("JSON reads should::validate Dates") + ) + } + + '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 new file mode 100644 index 00000000..133188d3 --- /dev/null +++ b/integration/test/src/UpickleTests.scala @@ -0,0 +1,30 @@ +package mill.integration + +import utest._ + +class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) { + val tests = Tests{ + initWorkspace() + 'jvm21111 - { + mill.util.TestUtil.disableInJava9OrAbove({ + assert(eval("upickleJvm[2.11.11].test")) + val jvmMeta = meta("upickleJvm[2.11.11].test.test") + assert(jvmMeta.contains("example.ExampleTests.simple")) + assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) + }) + } + '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 - { + assert(eval("upickleJs[2.12.4].test")) + val jsMeta = meta("upickleJs[2.12.4].test.test") + assert(jsMeta .contains("example.ExampleTests.simple")) + assert(jsMeta .contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) + } + + } +} diff --git a/integration/test/src/forked/Tests.scala b/integration/test/src/forked/Tests.scala new file mode 100644 index 00000000..41844b58 --- /dev/null +++ b/integration/test/src/forked/Tests.scala @@ -0,0 +1,10 @@ +package mill.integration.forked + +object AcyclicTests extends mill.integration.AcyclicTests(fork = true) +object AmmoniteTests extends mill.integration.AmmoniteTests(fork = true) +object BetterFilesTests extends mill.integration.BetterFilesTests(fork = true) +object JawnTests extends mill.integration.JawnTests(fork = true) +object UpickleTests extends mill.integration.UpickleTests(fork = true) +object PlayJsonTests extends mill.integration.PlayJsonTests(fork = true) +object CaffeineTests extends mill.integration.CaffeineTests(fork = true) +object DocAnnotationsTests extends mill.integration.DocAnnotationsTests(fork = true) diff --git a/integration/test/src/local/Tests.scala b/integration/test/src/local/Tests.scala new file mode 100644 index 00000000..e95aac54 --- /dev/null +++ b/integration/test/src/local/Tests.scala @@ -0,0 +1,10 @@ +package mill.integration.local + +object AcyclicTests extends mill.integration.AcyclicTests(fork = false) +object AmmoniteTests extends mill.integration.AmmoniteTests(fork = false) +object BetterFilesTests extends mill.integration.BetterFilesTests(fork = false) +object JawnTests extends mill.integration.JawnTests(fork = false) +object UpickleTests extends mill.integration.UpickleTests(fork = false) +object PlayJsonTests extends mill.integration.PlayJsonTests(fork = false) +object CaffeineTests extends mill.integration.CaffeineTests(fork = false) +object DocAnnotationsTests extends mill.integration.DocAnnotationsTests(fork = false) \ No newline at end of file diff --git a/integration/test/src/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala deleted file mode 100644 index 145c106d..00000000 --- a/integration/test/src/mill/integration/AcyclicTests.scala +++ /dev/null @@ -1,31 +0,0 @@ -package mill.integration - -import utest._ - -class AcyclicTests(fork: Boolean) - extends IntegrationTestSuite("MILL_ACYCLIC_REPO", "acyclic", fork) { - val tests = Tests{ - initWorkspace() - - def check(scalaVersion: String) = { - val firstCompile = eval(s"acyclic[$scalaVersion].compile") - - assert( - firstCompile, - os.walk(workspacePath).exists(_.last == "GraphAnalysis.class"), - os.walk(workspacePath).exists(_.last == "PluginPhase.class") - ) - for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ - os.write.append(scalaFile, "\n}") - } - - val brokenCompile = eval(s"acyclic[$scalaVersion].compile") - - assert(!brokenCompile) - } - - 'scala2118 - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8")) - 'scala2124 - check("2.12.4") - - } -} diff --git a/integration/test/src/mill/integration/AmmoniteTests.scala b/integration/test/src/mill/integration/AmmoniteTests.scala deleted file mode 100644 index 5851a393..00000000 --- a/integration/test/src/mill/integration/AmmoniteTests.scala +++ /dev/null @@ -1,35 +0,0 @@ -package mill.integration - -import utest._ - -class AmmoniteTests(fork: Boolean) - extends IntegrationTestSuite("MILL_AMMONITE_REPO", "ammonite", fork) { - val tests = Tests{ - initWorkspace() - - def check(scalaVersion: String) = { - val replTests = eval( - s"amm.repl[$scalaVersion].test", "{ammonite.unit,ammonite.session.ProjectTests.guava}" - ) - val replTestMeta = meta(s"amm.repl[$scalaVersion].test.test") - assert( - replTests, - replTestMeta.contains("ammonite.session.ProjectTests.guava"), - replTestMeta.contains("ammonite.unit.SourceTests.objectInfo.thirdPartyJava") - ) - - val compileResult = eval( - "all", s"{shell,sshd,amm,integration}[$scalaVersion].test.compile" - ) - - assert( - compileResult, - os.walk(workspacePath / 'out / 'integration / scalaVersion / 'test / 'compile) - .exists(_.last == "ErrorTruncationTests.class") - ) - } - - 'scala2124 - check("2.12.4") - - } -} diff --git a/integration/test/src/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala deleted file mode 100644 index bdbaa2e3..00000000 --- a/integration/test/src/mill/integration/BetterFilesTests.scala +++ /dev/null @@ -1,26 +0,0 @@ -package mill.integration - -import utest._ - -class BetterFilesTests(fork: Boolean) - extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "better-files", fork) { - val tests = Tests{ - initWorkspace() - 'test - { - - assert(eval("core.test")) - assert(eval("akka.test")) - assert(eval("benchmarks.test.compile")) - - val coreTestMeta = meta("core.test.test") - assert(coreTestMeta.contains("better.files.FileSpec")) - assert(coreTestMeta.contains("files should handle BOM")) - - for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ - os.write.append(scalaFile, "\n}") - } - assert(!eval("akka.test")) - } - - } -} diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala deleted file mode 100644 index 56c66b21..00000000 --- a/integration/test/src/mill/integration/CaffeineTests.scala +++ /dev/null @@ -1,34 +0,0 @@ -package mill.integration - -import utest._ - -class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_REPO", "caffeine", fork) { - val tests = Tests{ - initWorkspace() - '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){ - assert(eval("caffeine.test.compile")) - - val suites = Seq( - "com.github.benmanes.caffeine.SingleConsumerQueueTest", - "com.github.benmanes.caffeine.cache.AsyncTest", - "com.github.benmanes.caffeine.cache.CaffeineTest", - "com.github.benmanes.caffeine.cache.TimerWheelTest" - ) - assert(eval( - "caffeine.test", - "-testclass", suites.mkString(",") - )) - assert(eval("guava.test.compile")) - assert(eval("guava.test")) - - assert(eval("jcache.test.compile")) - assert(eval("simulator.test.compile")) - - } - } - - } -} diff --git a/integration/test/src/mill/integration/DocAnnotationsTests.scala b/integration/test/src/mill/integration/DocAnnotationsTests.scala deleted file mode 100644 index 4d7ef11b..00000000 --- a/integration/test/src/mill/integration/DocAnnotationsTests.scala +++ /dev/null @@ -1,33 +0,0 @@ -package mill.integration - -import mill.util.ScriptTestSuite -import utest._ - -class DocAnnotationsTests(fork: Boolean) extends ScriptTestSuite(fork) { - def workspaceSlug: String = "docannotations" - def scriptSourcePath: os.Path = os.pwd / 'integration / 'test / 'resources / workspaceSlug - val tests = Tests{ - initWorkspace() - 'test - { - assert(eval("inspect", "core.test.ivyDeps")) - val inheritedIvyDeps = ujson.read(meta("inspect"))("value").str - assert( - inheritedIvyDeps.contains("core.test.ivyDeps"), - inheritedIvyDeps.contains("Overriden ivyDeps Docs!!!"), - inheritedIvyDeps.contains("Any ivy dependencies you want to add to this Module"), - ) - - assert(eval("inspect", "core.task")) - val task = ujson.read(meta("inspect"))("value").str - assert( - task.contains("Core Task Docz!") - ) - - assert(eval("inspect", "inspect")) - val doc = ujson.read(meta("inspect"))("value").str - assert( - doc.contains("Displays metadata about the given task without actually running it.") - ) - } - } -} diff --git a/integration/test/src/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala deleted file mode 100644 index ca041eea..00000000 --- a/integration/test/src/mill/integration/IntegrationTestSuite.scala +++ /dev/null @@ -1,28 +0,0 @@ -package mill.integration - -import mill.util.ScriptTestSuite -import utest._ - -abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String, fork: Boolean) - extends ScriptTestSuite(fork){ - val buildFilePath = os.pwd / 'integration / 'test / 'resources / workspaceSlug - def scriptSourcePath = { - // The unzipped git repo snapshots we get from github come with a - // wrapper-folder inside the zip file, so copy the wrapper folder to the - // destination instead of the folder containing the wrapper. - - val path = sys.props(repoKey) - val Seq(wrapper) = os.list(os.Path(path)) - wrapper - } - - def buildFiles: Seq[os.Path] = os.walk(buildFilePath) - - override def initWorkspace() = { - super.initWorkspace() - buildFiles.foreach { file => - os.copy.over(file, workspacePath / file.last) - } - assert(!os.walk(workspacePath).exists(_.ext == "class")) - } -} diff --git a/integration/test/src/mill/integration/JawnTests.scala b/integration/test/src/mill/integration/JawnTests.scala deleted file mode 100644 index eafd1009..00000000 --- a/integration/test/src/mill/integration/JawnTests.scala +++ /dev/null @@ -1,31 +0,0 @@ -package mill.integration - -import utest._ - -class JawnTests(fork: Boolean) - extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn", fork) { - val tests = Tests{ - initWorkspace() - - def check(scalaVersion: String) = { - val firstCompile = eval(s"jawn[$scalaVersion].parser.test") - - assert( - firstCompile, - os.walk(workspacePath).exists(_.last == "AsyncParser.class"), - os.walk(workspacePath).exists(_.last == "CharBuilderSpec.class") - ) - - for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ - os.write.append(scalaFile, "\n}") - } - - val brokenCompile = eval(s"jawn[$scalaVersion].parser.test") - - assert(!brokenCompile) - } - - 'scala21111 - check("2.11.11") - 'scala2123 - check("2.12.3") - } -} diff --git a/integration/test/src/mill/integration/PlayJsonTests.scala b/integration/test/src/mill/integration/PlayJsonTests.scala deleted file mode 100644 index 262dcb36..00000000 --- a/integration/test/src/mill/integration/PlayJsonTests.scala +++ /dev/null @@ -1,57 +0,0 @@ -package mill.integration - - -import utest._ - -class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_REPO", "play-json", fork) { - - override def buildFiles: Seq[os.Path] = { - os.list(buildFilePath).filter(_.ext == "sc") - } - - val tests = Tests{ - initWorkspace() - - 'jvm - { - assert(eval("playJsonJvm[2.12.4].test")) - val jvmMeta = meta("playJsonJvm[2.12.4].test.test") - - assert( - jvmMeta.contains("play.api.libs.json.JsonSharedSpec"), - jvmMeta.contains("JSON should support basic array operations") - ) - - assert( - jvmMeta.contains("play.api.libs.json.JsonValidSpec"), - jvmMeta.contains("JSON reads should::validate Dates") - ) - } - 'js - { - assert(eval("playJsonJs[2.12.4].test")) - val jsMeta = meta("playJsonJs[2.12.4].test.test") - - assert( - jsMeta.contains("play.api.libs.json.JsonSharedSpec"), - jsMeta.contains("JSON should support basic array operations") - ) - - assert( - jsMeta.contains("play.api.libs.json.JsonSpec"), - jsMeta.contains("Complete JSON should create full object when lose precision when parsing BigDecimals") - ) - } - 'playJoda - { - assert(eval("playJoda[2.12.4].test")) - val metaFile = meta("playJoda[2.12.4].test.test") - - assert( - metaFile.contains("play.api.libs.json.JsonJodaValidSpec"), - metaFile.contains("JSON reads should::validate Dates") - ) - } - - 'benchmarks - { -// "benchmarks[2.12.4].runJmh" -i 1 -wi 1 -f1 -t1 - } - } -} diff --git a/integration/test/src/mill/integration/UpickleTests.scala b/integration/test/src/mill/integration/UpickleTests.scala deleted file mode 100644 index 133188d3..00000000 --- a/integration/test/src/mill/integration/UpickleTests.scala +++ /dev/null @@ -1,30 +0,0 @@ -package mill.integration - -import utest._ - -class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) { - val tests = Tests{ - initWorkspace() - 'jvm21111 - { - mill.util.TestUtil.disableInJava9OrAbove({ - assert(eval("upickleJvm[2.11.11].test")) - val jvmMeta = meta("upickleJvm[2.11.11].test.test") - assert(jvmMeta.contains("example.ExampleTests.simple")) - assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) - }) - } - '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 - { - assert(eval("upickleJs[2.12.4].test")) - val jsMeta = meta("upickleJs[2.12.4].test.test") - assert(jsMeta .contains("example.ExampleTests.simple")) - assert(jsMeta .contains("upickle.MacroTests.commonCustomStructures.simpleAdt")) - } - - } -} diff --git a/integration/test/src/mill/integration/forked/Tests.scala b/integration/test/src/mill/integration/forked/Tests.scala deleted file mode 100644 index 41844b58..00000000 --- a/integration/test/src/mill/integration/forked/Tests.scala +++ /dev/null @@ -1,10 +0,0 @@ -package mill.integration.forked - -object AcyclicTests extends mill.integration.AcyclicTests(fork = true) -object AmmoniteTests extends mill.integration.AmmoniteTests(fork = true) -object BetterFilesTests extends mill.integration.BetterFilesTests(fork = true) -object JawnTests extends mill.integration.JawnTests(fork = true) -object UpickleTests extends mill.integration.UpickleTests(fork = true) -object PlayJsonTests extends mill.integration.PlayJsonTests(fork = true) -object CaffeineTests extends mill.integration.CaffeineTests(fork = true) -object DocAnnotationsTests extends mill.integration.DocAnnotationsTests(fork = true) diff --git a/integration/test/src/mill/integration/local/Tests.scala b/integration/test/src/mill/integration/local/Tests.scala deleted file mode 100644 index e95aac54..00000000 --- a/integration/test/src/mill/integration/local/Tests.scala +++ /dev/null @@ -1,10 +0,0 @@ -package mill.integration.local - -object AcyclicTests extends mill.integration.AcyclicTests(fork = false) -object AmmoniteTests extends mill.integration.AmmoniteTests(fork = false) -object BetterFilesTests extends mill.integration.BetterFilesTests(fork = false) -object JawnTests extends mill.integration.JawnTests(fork = false) -object UpickleTests extends mill.integration.UpickleTests(fork = false) -object PlayJsonTests extends mill.integration.PlayJsonTests(fork = false) -object CaffeineTests extends mill.integration.CaffeineTests(fork = false) -object DocAnnotationsTests extends mill.integration.DocAnnotationsTests(fork = false) \ No newline at end of file -- cgit v1.2.3