From 0ce5630633df6f86a696ce431d332eb45cd17cd9 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 28 Dec 2019 02:36:53 -0500 Subject: [PATCH] refactor sbtProcess to use vararg This allows passing whitespace as part of an argument. --- .../src/test/scala/RunnerTest.scala | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/integration-test/src/test/scala/RunnerTest.scala b/integration-test/src/test/scala/RunnerTest.scala index f64685497..3fd609c69 100755 --- a/integration-test/src/test/scala/RunnerTest.scala +++ b/integration-test/src/test/scala/RunnerTest.scala @@ -13,109 +13,109 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions { if (isWindows) new File("target/universal/stage/bin/sbt.bat") else new File("target/universal/stage/bin/sbt") - def sbtProcess(arg: String) = sbtProcessWithOpts(arg, "", "") - def sbtProcessWithOpts(arg: String, javaOpts: String, sbtOpts: String) = - sbt.internal.Process(sbtScript.getAbsolutePath + " " + arg, new File("citest"), + def sbtProcess(args: String*) = sbtProcessWithOpts(args: _*)("", "") + def sbtProcessWithOpts(args: String*)(javaOpts: String, sbtOpts: String) = + sbt.internal.Process(Seq(sbtScript.getAbsolutePath) ++ args, new File("citest"), "JAVA_OPTS" -> javaOpts, "SBT_OPTS" -> sbtOpts) test("sbt runs") { assert(sbtScript.exists) - val out = sbtProcess("compile -v").! + val out = sbtProcess("compile", "-v").! assert(out == 0) () } test("sbt -no-colors") { - val out = sbtProcess("compile -no-colors -v").!!.linesIterator.toList + val out = sbtProcess("compile", "-no-colors", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.log.noformat=true")) () } test("sbt --no-colors") { - val out = sbtProcess("compile --no-colors -v").!!.linesIterator.toList + val out = sbtProcess("compile", "--no-colors", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.log.noformat=true")) () } test("sbt --color=false") { - val out = sbtProcess("compile --color=false -v").!!.linesIterator.toList + val out = sbtProcess("compile", "--color=false", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.color=false")) () } test("sbt --debug-inc") { - val out = sbtProcess("compile --debug-inc -v").!!.linesIterator.toList + val out = sbtProcess("compile", "--debug-inc", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dxsbt.inc.debug=true")) () } test("sbt --supershell=never") { - val out = sbtProcess("compile --supershell=never -v").!!.linesIterator.toList + val out = sbtProcess("compile", "--supershell=never", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.supershell=never")) () } test("sbt --timings") { - val out = sbtProcess("compile --timings -v").!!.linesIterator.toList + val out = sbtProcess("compile", "--timings", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.task.timings=true")) () } test("sbt -D arguments") { - val out = sbtProcess("-Dsbt.supershell=false compile -v").!!.linesIterator.toList + val out = sbtProcess("-Dsbt.supershell=false", "compile", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.supershell=false")) () } test("sbt --sbt-version") { - val out = sbtProcess("--sbt-version 1.3.0 compile -v").!!.linesIterator.toList + val out = sbtProcess("--sbt-version", "1.3.0", "compile", "-v").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.version=1.3.0")) () } test("sbt -mem 503") { - val out = sbtProcess("compile -mem 503 -v").!!.linesIterator.toList + val out = sbtProcess("compile", "-mem", "503", "-v").!!.linesIterator.toList assert(out.contains[String]("-Xmx503m")) () } test("sbt with -mem 503, -Xmx in JAVA_OPTS") { - val out = sbtProcessWithOpts("compile -mem 503 -v", "-Xmx1024m", "").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-mem", "503", "-v")("-Xmx1024m", "").!!.linesIterator.toList assert(out.contains[String]("-Xmx503m")) assert(!out.contains[String]("-Xmx1024m")) () } test("sbt with -mem 503, -Xmx in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -mem 503 -v", "", "-Xmx1024m").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-mem", "503", "-v")("", "-Xmx1024m").!!.linesIterator.toList assert(out.contains[String]("-Xmx503m")) assert(!out.contains[String]("-Xmx1024m")) () } test("sbt with -Xms2048M -Xmx2048M -Xss6M in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -v", "", "-Xms2048M -Xmx2048M -Xss6M").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "-Xms2048M -Xmx2048M -Xss6M").!!.linesIterator.toList assert(out.contains[String]("-Xss6M")) () } test("sbt with -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -v", "", "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080").!!.linesIterator.toList assert(out.contains[String]("-Dhttp.proxyHost=proxy")) assert(out.contains[String]("-Dhttp.proxyPort=8080")) () } test("sbt with -XX:ParallelGCThreads=16 -XX:PermSize=128M in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -v", "", "-XX:ParallelGCThreads=16 -XX:PermSize=128M").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "-XX:ParallelGCThreads=16 -XX:PermSize=128M").!!.linesIterator.toList assert(out.contains[String]("-XX:ParallelGCThreads=16")) assert(out.contains[String]("-XX:PermSize=128M")) () } test("sbt with -XX:+UseG1GC -XX:+PrintGC in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -v", "", "-XX:+UseG1GC -XX:+PrintGC").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "-XX:+UseG1GC -XX:+PrintGC").!!.linesIterator.toList assert(out.contains[String]("-XX:+UseG1GC")) assert(out.contains[String]("-XX:+PrintGC")) assert(!out.contains[String]("-XX:+UseG1GC=-XX:+PrintGC")) @@ -123,7 +123,7 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions { } test("sbt with -XX:-UseG1GC -XX:-PrintGC in SBT_OPTS") { - val out = sbtProcessWithOpts("compile -v", "", "-XX:-UseG1GC -XX:-PrintGC").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "-XX:-UseG1GC -XX:-PrintGC").!!.linesIterator.toList assert(out.contains[String]("-XX:-UseG1GC")) assert(out.contains[String]("-XX:-PrintGC")) assert(!out.contains[String]("-XX:-UseG1GC=-XX:-PrintGC")) @@ -132,43 +132,43 @@ object SbtRunnerTest extends SimpleTestSuite with PowerAssertions { test("sbt with --no-colors in SBT_OPTS") { if (isWindows) cancel("Test not supported on windows") - val out = sbtProcessWithOpts("compile -v", "", "--no-colors").!!.linesIterator.toList + val out = sbtProcessWithOpts("compile", "-v")("", "--no-colors").!!.linesIterator.toList assert(out.contains[String]("-Dsbt.log.noformat=true")) () } test("sbt -V|-version|--version should print sbtVersion") { - val out = sbtProcessWithOpts("-version", "", "").!!.trim + val out = sbtProcess("-version").!!.trim val expectedVersion = s"""|(?m)^sbt version in this project: $versionRegEx(\\r)? |sbt script version: $versionRegEx$$ |""".stripMargin.trim.replace("\n", "\\n") assert(out.matches(expectedVersion)) - val out2 = sbtProcessWithOpts("--version", "", "").!!.trim + val out2 = sbtProcess("--version").!!.trim assert(out2.matches(expectedVersion)) - val out3 = sbtProcessWithOpts("-V", "", "").!!.trim + val out3 = sbtProcess("-V").!!.trim assert(out3.matches(expectedVersion)) () } test("sbt --numeric-version should print sbt script version") { - val out = sbtProcessWithOpts("--numeric-version", "", "").!!.trim + val out = sbtProcess("--numeric-version").!!.trim val expectedVersion = "^"+versionRegEx+"$" assert(out.matches(expectedVersion)) () } test("sbt --script-version should print sbtVersion") { - val out = sbtProcessWithOpts("--script-version", "", "").!!.trim + val out = sbtProcess("--script-version").!!.trim val expectedVersion = "^"+versionRegEx+"$" assert(out.matches(expectedVersion)) () } test("sbt --sbt-jar should run") { - val out = sbtProcess("compile -v --sbt-jar ../target/universal/stage/bin/sbt-launch.jar").!!.linesIterator.toList + val out = sbtProcess("compile", "-v", "--sbt-jar", "../target/universal/stage/bin/sbt-launch.jar").!!.linesIterator.toList assert(out.contains[String]("../target/universal/stage/bin/sbt-launch.jar") || out.contains[String]("\"../target/universal/stage/bin/sbt-launch.jar\"") )