From bc9dc386625021fec517f2dbf0644ccafe1e32c2 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 5 Nov 2018 03:00:04 +0800 Subject: WIP migrating over from `ammonite.ops` to `os` module. __.compile works, haven't run tests yet --- integration/test/src/mill/integration/AcyclicTests.scala | 9 ++++----- integration/test/src/mill/integration/AmmoniteTests.scala | 5 ++--- integration/test/src/mill/integration/BetterFilesTests.scala | 5 ++--- .../test/src/mill/integration/DocAnnotationsTests.scala | 3 +-- .../test/src/mill/integration/IntegrationTestSuite.scala | 11 +++++------ integration/test/src/mill/integration/JawnTests.scala | 9 ++++----- integration/test/src/mill/integration/PlayJsonTests.scala | 6 +++--- integration/test/src/mill/integration/UpickleTests.scala | 1 - 8 files changed, 21 insertions(+), 28 deletions(-) (limited to 'integration/test/src') diff --git a/integration/test/src/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala index c117f862..145c106d 100644 --- a/integration/test/src/mill/integration/AcyclicTests.scala +++ b/integration/test/src/mill/integration/AcyclicTests.scala @@ -1,6 +1,5 @@ package mill.integration -import ammonite.ops._ import utest._ class AcyclicTests(fork: Boolean) @@ -13,11 +12,11 @@ class AcyclicTests(fork: Boolean) assert( firstCompile, - ls.rec(workspacePath).exists(_.last == "GraphAnalysis.class"), - ls.rec(workspacePath).exists(_.last == "PluginPhase.class") + os.walk(workspacePath).exists(_.last == "GraphAnalysis.class"), + os.walk(workspacePath).exists(_.last == "PluginPhase.class") ) - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ - write.append(scalaFile, "\n}") + for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ + os.write.append(scalaFile, "\n}") } val brokenCompile = eval(s"acyclic[$scalaVersion].compile") diff --git a/integration/test/src/mill/integration/AmmoniteTests.scala b/integration/test/src/mill/integration/AmmoniteTests.scala index 3f04e84d..2f2c648d 100644 --- a/integration/test/src/mill/integration/AmmoniteTests.scala +++ b/integration/test/src/mill/integration/AmmoniteTests.scala @@ -1,6 +1,5 @@ package mill.integration -import ammonite.ops._ import utest._ class AmmoniteTests(fork: Boolean) @@ -25,8 +24,8 @@ class AmmoniteTests(fork: Boolean) assert( compileResult, - ls.rec(workspacePath / 'out / 'integration / scalaVersion / 'test / 'compile) - .exists(_.name == "ErrorTruncationTests.class") + os.walk(workspacePath / 'out / 'integration / scalaVersion / 'test / 'compile) + .exists(_.last == "ErrorTruncationTests.class") ) } diff --git a/integration/test/src/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala index 4f3116f7..bdbaa2e3 100644 --- a/integration/test/src/mill/integration/BetterFilesTests.scala +++ b/integration/test/src/mill/integration/BetterFilesTests.scala @@ -1,6 +1,5 @@ package mill.integration -import ammonite.ops._ import utest._ class BetterFilesTests(fork: Boolean) @@ -17,8 +16,8 @@ class BetterFilesTests(fork: Boolean) assert(coreTestMeta.contains("better.files.FileSpec")) assert(coreTestMeta.contains("files should handle BOM")) - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ - write.append(scalaFile, "\n}") + 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/DocAnnotationsTests.scala b/integration/test/src/mill/integration/DocAnnotationsTests.scala index 75579689..4d7ef11b 100644 --- a/integration/test/src/mill/integration/DocAnnotationsTests.scala +++ b/integration/test/src/mill/integration/DocAnnotationsTests.scala @@ -1,12 +1,11 @@ package mill.integration -import ammonite.ops.{Path, pwd} import mill.util.ScriptTestSuite import utest._ class DocAnnotationsTests(fork: Boolean) extends ScriptTestSuite(fork) { def workspaceSlug: String = "docannotations" - def scriptSourcePath: Path = pwd / 'integration / 'test / 'resources / workspaceSlug + def scriptSourcePath: os.Path = os.pwd / 'integration / 'test / 'resources / workspaceSlug val tests = Tests{ initWorkspace() 'test - { diff --git a/integration/test/src/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala index 721557c0..ca041eea 100644 --- a/integration/test/src/mill/integration/IntegrationTestSuite.scala +++ b/integration/test/src/mill/integration/IntegrationTestSuite.scala @@ -1,29 +1,28 @@ package mill.integration -import ammonite.ops._ import mill.util.ScriptTestSuite import utest._ abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String, fork: Boolean) extends ScriptTestSuite(fork){ - val buildFilePath = pwd / 'integration / 'test / 'resources / workspaceSlug + 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) = ls(Path(path)) + val Seq(wrapper) = os.list(os.Path(path)) wrapper } - def buildFiles: Seq[Path] = ls.rec(buildFilePath) + def buildFiles: Seq[os.Path] = os.walk(buildFilePath) override def initWorkspace() = { super.initWorkspace() buildFiles.foreach { file => - cp.over(file, workspacePath / file.name) + os.copy.over(file, workspacePath / file.last) } - assert(!ls.rec(workspacePath).exists(_.ext == "class")) + 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 index da584e01..eafd1009 100644 --- a/integration/test/src/mill/integration/JawnTests.scala +++ b/integration/test/src/mill/integration/JawnTests.scala @@ -1,6 +1,5 @@ package mill.integration -import ammonite.ops._ import utest._ class JawnTests(fork: Boolean) @@ -13,12 +12,12 @@ class JawnTests(fork: Boolean) assert( firstCompile, - ls.rec(workspacePath).exists(_.last == "AsyncParser.class"), - ls.rec(workspacePath).exists(_.last == "CharBuilderSpec.class") + os.walk(workspacePath).exists(_.last == "AsyncParser.class"), + os.walk(workspacePath).exists(_.last == "CharBuilderSpec.class") ) - for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ - write.append(scalaFile, "\n}") + for(scalaFile <- os.walk(workspacePath).filter(_.ext == "scala")){ + os.write.append(scalaFile, "\n}") } val brokenCompile = eval(s"jawn[$scalaVersion].parser.test") diff --git a/integration/test/src/mill/integration/PlayJsonTests.scala b/integration/test/src/mill/integration/PlayJsonTests.scala index c78a256e..262dcb36 100644 --- a/integration/test/src/mill/integration/PlayJsonTests.scala +++ b/integration/test/src/mill/integration/PlayJsonTests.scala @@ -1,12 +1,12 @@ package mill.integration -import ammonite.ops._ + import utest._ class PlayJsonTests(fork: Boolean) extends IntegrationTestSuite("MILL_PLAY_JSON_REPO", "play-json", fork) { - override def buildFiles: Seq[Path] = { - ls(buildFilePath).filter(_.ext == "sc") + override def buildFiles: Seq[os.Path] = { + os.list(buildFilePath).filter(_.ext == "sc") } val tests = Tests{ diff --git a/integration/test/src/mill/integration/UpickleTests.scala b/integration/test/src/mill/integration/UpickleTests.scala index 1b83c60f..133188d3 100644 --- a/integration/test/src/mill/integration/UpickleTests.scala +++ b/integration/test/src/mill/integration/UpickleTests.scala @@ -1,6 +1,5 @@ package mill.integration -import ammonite.ops._ import utest._ class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) { -- cgit v1.2.3