diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 03:00:04 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 21:14:58 +0800 |
commit | bc9dc386625021fec517f2dbf0644ccafe1e32c2 (patch) | |
tree | 12db6817470708c7aa274aa231ef35eb79f2123a /scalajslib/test | |
parent | 8afe79afe33be68f59f89b8410984e508c3e8d08 (diff) | |
download | mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.tar.gz mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.tar.bz2 mill-bc9dc386625021fec517f2dbf0644ccafe1e32c2.zip |
WIP migrating over from `ammonite.ops` to `os` module.
__.compile works, haven't run tests yet
Diffstat (limited to 'scalajslib/test')
4 files changed, 18 insertions, 24 deletions
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala index cfdcdd1f..7b1027e8 100644 --- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala +++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala @@ -1,8 +1,6 @@ package mill.scalajslib import java.util.jar.JarFile - -import ammonite.ops._ import mill._ import mill.define.Discover import mill.eval.{Evaluator, Result} @@ -71,7 +69,7 @@ object HelloJSWorldTests extends TestSuite { override lazy val millDiscover = Discover[this.type] } - val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world" + val millSourcePath = os.pwd / 'scalajslib / 'test / 'resources / "hello-js-world" val helloWorldEvaluator = TestEvaluator.static(HelloJSWorld) @@ -87,7 +85,7 @@ object HelloJSWorldTests extends TestSuite { helloWorldEvaluator(HelloJSWorld.helloJsWorld(scalaVersion, scalaJSVersion).compile) val outPath = result.classes.path - val outputFiles = ls.rec(outPath) + val outputFiles = os.walk(outPath) val expectedClassfiles = compileClassfiles(outPath) assert( outputFiles.toSet == expectedClassfiles, @@ -213,7 +211,7 @@ object HelloJSWorldTests extends TestSuite { helloWorldEvaluator.outPath, task.ctx.segments ) - val log = read(paths.log) + val log = os.read(paths.log) assert( evalCount > 0, log.contains("node"), @@ -229,7 +227,7 @@ object HelloJSWorldTests extends TestSuite { } } - def compileClassfiles(parentDir: Path) = Set( + def compileClassfiles(parentDir: os.Path) = Set( parentDir / "ArgsParser$.class", parentDir / "ArgsParser$.sjsir", parentDir / "ArgsParser.class", @@ -241,9 +239,9 @@ object HelloJSWorldTests extends TestSuite { ) def prepareWorkspace(): Unit = { - rm(workspacePath) - mkdir(workspacePath / up) - cp(millSourcePath, workspacePath) + os.remove.all(workspacePath) + os.makeDir.all(workspacePath / os.up) + os.copy(millSourcePath, workspacePath) } } diff --git a/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala b/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala index 37429038..751c7537 100644 --- a/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala +++ b/scalajslib/test/src/mill/scalajslib/MultiModuleTests.scala @@ -1,6 +1,5 @@ package mill.scalajslib -import ammonite.ops._ import mill._ import mill.define.Discover import mill.eval.Evaluator @@ -10,7 +9,7 @@ import utest._ object MultiModuleTests extends TestSuite { val workspacePath = TestUtil.getOutPathStatic() / "multi-module" - val sourcePath = pwd / 'scalajslib / 'test / 'resources / "multi-module" + val sourcePath = os.pwd / 'scalajslib / 'test / 'resources / "multi-module" object MultiModule extends TestUtil.BaseModule { trait BaseModule extends ScalaJSModule { @@ -76,7 +75,7 @@ object MultiModuleTests extends TestSuite { evaluator.outPath, command.ctx.segments ) - val log = read(paths.log) + val log = os.read(paths.log) assert( evalCount > 0, log.contains("node"), @@ -86,9 +85,9 @@ object MultiModuleTests extends TestSuite { } def prepareWorkspace(): Unit = { - rm(workspacePath) - mkdir(workspacePath / up) - cp(sourcePath, workspacePath) + os.remove.all(workspacePath) + os.makeDir.all(workspacePath / os.up) + os.copy(sourcePath, workspacePath) } } diff --git a/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala b/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala index 5aef8dad..27ea0a13 100644 --- a/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala +++ b/scalajslib/test/src/mill/scalajslib/NodeJSConfigTests.scala @@ -1,6 +1,5 @@ package mill.scalajslib -import ammonite.ops._ import mill._ import mill.define.Discover import mill.eval.Evaluator @@ -53,7 +52,7 @@ object NodeJSConfigTests extends TestSuite { override lazy val millDiscover = Discover[this.type] } - val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world" + val millSourcePath = os.pwd / 'scalajslib / 'test / 'resources / "hello-js-world" val helloWorldEvaluator = TestEvaluator.static(HelloJSWorld) @@ -68,7 +67,7 @@ object NodeJSConfigTests extends TestSuite { helloWorldEvaluator.outPath, command.ctx.segments ) - val log = read(paths.log) + val log = os.read(paths.log) assert( nodeArgs.forall(log.contains), notNodeArgs.forall(!log.contains(_)) @@ -96,9 +95,9 @@ object NodeJSConfigTests extends TestSuite { } def prepareWorkspace(): Unit = { - rm(workspacePath) - mkdir(workspacePath / up) - cp(millSourcePath, workspacePath) + os.remove.all(workspacePath) + os.makeDir.all(workspacePath / os.up) + os.copy(millSourcePath, workspacePath) } } diff --git a/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala b/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala index 859d2d56..68f2f7ee 100644 --- a/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala +++ b/scalajslib/test/src/mill/scalajslib/ScalaJsUtils.scala @@ -3,10 +3,8 @@ package mill.scalajslib import java.io.{FileReader, StringWriter} import javax.script.{ScriptContext, ScriptEngineManager} -import ammonite.ops.Path - object ScalaJsUtils { - def runJS(path: Path): String = { + def runJS(path: os.Path): String = { val engineManager = new ScriptEngineManager(null) val engine = engineManager.getEngineByName("nashorn") val console = new Console |