From ba189b841194f1eb5f755b7af4efe550d8abf9e5 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Wed, 9 Nov 2016 23:52:45 -0500
Subject: fix wrong assumption: stderr contains compiler info output also
 improve failure output

---
 test/test.scala | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/test/test.scala b/test/test.scala
index 5c8ec8f..0eb0bef 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -263,72 +263,62 @@ object Main{
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("with","""def dummy = "1.2.3" """, "dummy"))
       assert(res.exit0)
-      assert(res.out == "1.2.3\n", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out == "1.2.3\n", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("with","""def dummy = "1.2.3" """, "dummy"))
       assert(res.exit0)
-      assert(res.out == "1.2.3\n", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out == "1.2.3\n", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("eval",""" scalaVersion; 1 + 1 """))
       assert(res.exit0)
-      assert(res.out == "2\n", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out == "2\n", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("foo"))
       assert(res.exit0)
-      assert(res.out == "Build\n", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out == "Build\n", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("bar"))
       assert(res.exit0)
       assert(res.out startsWith "Bar: DynamicBuild", res.out)
-      assert(res.out startsWith "", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out startsWith "", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("baz"))
       assert(res.exit0)
-      assert(res.out startsWith "Bar: DynamicBuild", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out startsWith "Bar: DynamicBuild", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("bam"))
       assert(res.exit0)
-      assert(res.out startsWith "Baz: DynamicBuild", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out startsWith "Baz: DynamicBuild", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("foo2"))
       assert(res.exit0)
-      assert(res.out == "Build\n", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out == "Build\n", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("bar2"))
       assert(res.exit0)
-      assert(res.out startsWith "Bar2: Some(DynamicBuild", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out startsWith "Bar2: Some(DynamicBuild", res.out ++ res.err)
     }
 
     {
       val res = runCbt("../examples/dynamic-overrides-example", Seq("baz2"))
       assert(res.exit0)
-      assert(res.out startsWith "Bar2: Some(DynamicBuild", res.out)
-      assert(res.err.isEmpty)
+      assert(res.out startsWith "Bar2: Some(DynamicBuild", res.out ++ res.err)
     }
 
     {
-- 
cgit v1.2.3