diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-11 23:27:47 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-11 23:27:47 -0500 |
commit | 958e50e5e2f8bc5447071554ad32ef47be1c33ad (patch) | |
tree | 78cbd44ae0880683a639070e1b376531109eb129 /test/test.scala | |
parent | 81259255d6b6bf3d1ef9c3aaadbeae47457f175d (diff) | |
download | cbt-958e50e5e2f8bc5447071554ad32ef47be1c33ad.tar.gz cbt-958e50e5e2f8bc5447071554ad32ef47be1c33ad.tar.bz2 cbt-958e50e5e2f8bc5447071554ad32ef47be1c33ad.zip |
re-enable usage page tests
Diffstat (limited to 'test/test.scala')
-rw-r--r-- | test/test.scala | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/test.scala b/test/test.scala index deaa46c..7c805c9 100644 --- a/test/test.scala +++ b/test/test.scala @@ -30,19 +30,18 @@ object Main{ logger.test(allArgs.toString) val pb = new ProcessBuilder( allArgs :_* ) pb.directory(cbtHome ++ ("/test/" ++ path)) - val p = pb.inheritIO.start - p.waitFor + val p = pb.start val berr = new BufferedReader(new InputStreamReader(p.getErrorStream)); val bout = new BufferedReader(new InputStreamReader(p.getInputStream)); - p.waitFor import collection.JavaConversions._ val err = Stream.continually(berr.readLine()).takeWhile(_ != null).mkString("\n") val out = Stream.continually(bout.readLine()).takeWhile(_ != null).mkString("\n") - Result(out, err, p.exitValue == 0) + p.waitFor + Result(p.exitValue == 0, out, err) } - case class Result(out: String, err: String, exit0: Boolean) - def assertSuccess(res: Result)(implicit logger: Logger) = { - assert(res.exit0, res.toString) + case class Result(exit0: Boolean, out: String, err: String) + def assertSuccess(res: Result, msg: => String)(implicit logger: Logger) = { + assert(res.exit0, msg + res.toString) } // tests @@ -50,24 +49,25 @@ object Main{ val usageString = "Methods provided by CBT" val res = runCbt(path, Seq()) logger.test(res.toString) - assertSuccess(res) - assert(res.out == "", "usage " + path +" "+ res.toString) - assert(res.err contains usageString, "usage " + path +" "+res.toString) + val debugToken = "usage " + path +" " + assertSuccess(res,debugToken) + assert(res.out == "", debugToken+ res.toString) + assert(res.err contains usageString, debugToken+res.toString) } def compile(path: String)(implicit logger: Logger) = { val res = runCbt(path, Seq("compile")) - assertSuccess(res) + val debugToken = "compile " + path +" " + assertSuccess(res,debugToken) // assert(res.err == "", res.err) // FIXME: enable this } logger.test( "Running tests " ++ args.toList.toString ) - //usage("nothing") + usage("nothing") compile("nothing") - //usage("multi-build") + usage("multi-build") compile("multi-build") - { val noContext = Context(cbtHome ++ "/test/nothing", Seq(), logger) val b = new Build(noContext){ |