Merge branch 'master' of github.com:janet-lang/spork

2 files changed, 19 insertions, 10 deletions

diff --git a/test/suite0.janet b/test/suite0.janet
index a7eab5a..b2461ee 100644
--- a/test/suite0.janet
+++ b/test/suite0.janet
@@ -33,21 +33,20 @@
   (def res
     (capture-stdout
       (fmt/format-print "( )")))
-  (assert (= [nil "()\n"]) "format-print empty form with whitespace"))
+  (assert (= res [nil "()\n"]) "format-print empty form with whitespace"))
 
 (do
   (def res
     (capture-stdout
       (fmt/format-print "# a comment")))
-  (assert (= [nil "# a comment\n\n"]) "format-print only comment"))
+  (assert (= res [nil "# a comment\n\n"]) "format-print only comment"))
 
 (do
   (def res
     (capture-stdout
       (try
         (fmt/format-print "print )")
-        ([err]
-         (print "error")))))
-  (assert (= [nil "error\n"]) "format-print errors with unbalanced parenthesis"))
+        ([err] (print "error")))))
+  (assert (= res [nil "error\n"]) "format-print errors with unbalanced parenthesis"))
 
 (end-suite)
diff --git a/test/suite7.janet b/test/suite7.janet
index 3909a30..86c8d9c 100644
--- a/test/suite7.janet
+++ b/test/suite7.janet
@@ -14,7 +14,11 @@
 (assert (test/assert-no-error "assert-no-error" "Good"))
 
 # test/capture-stdout
-(test/assert (= [true "Output\n"] (test/capture-stdout (do (print "Output") true))) "capture output")
+(test/assert (= [true "Output\n"] (test/capture-stdout (print "Output") true)) "capture stdout")
+
+# test/capture-stderr
+(test/assert (= [true "Output\n"]
+                (test/capture-stderr (eprint "Output") true)) "capture stderr")
 
 # test/timeit
 (do
@@ -39,10 +43,9 @@
 (test/assert
   (= [nil "\nRunning test suite 666 tests...\n\n\e[32m\xE2\x9C\x94\e[0m\n\nTest suite 666 finished in 0.000 soconds\n13 of 13 tests passed.\n\n"])
   (test/capture-stdout
-    (do
-      (test/start-suite 666)
-      (test/assert true "true")
-      (test/end-suite))))
+    (test/start-suite 666)
+    (test/assert true "true")
+    (test/end-suite)))
 
 # test/suppress-stdout
 (test/assert
@@ -51,4 +54,11 @@
        (test/suppress-stdout (print "Hello world!"))))
   "suppress-stdout")
 
+# test/suppress-stdout
+(test/assert
+  (= [nil ""]
+     (test/capture-stderr
+       (test/suppress-stderr (print "Hello world!"))))
+  "suppress-stderr")
+
 (test/end-suite)