testrunner: make sure all redirected output is being consumed

Author: firewave

test/fixture.cpp

@@ -34,6 +34,7 @@
 
 #include "xml.h"
 
+// TODO: make sure the output has been consumed in the test
 std::ostringstream errout;
 std::ostringstream output;
 

test/redirect.h

@@ -19,6 +19,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
 /**
@@ -43,31 +44,35 @@ class RedirectOutputError {
     }
 
     /** Revert cout and cerr behaviour */
-    ~RedirectOutputError() {
+    ~RedirectOutputError() noexcept(false) {
         std::cout.rdbuf(_oldCout); // restore cout's original streambuf
         std::cerr.rdbuf(_oldCerr); // restore cerrs's original streambuf
-    }
 
-    /** Return what would be printed to cout. See also clearOutput() */
-    std::string getOutput() const {
-        return _out.str();
+        {
+            const std::string s = _out.str();
+            if (!s.empty())
+                throw std::runtime_error("unconsumed stdout: " + s);
+        }
+
+        {
+            const std::string s = _err.str();
+            if (!s.empty())
+                throw std::runtime_error("consumed stderr: " + s);
+        }
     }
 
-    /** Normally called after getOutput() to prevent same text to be returned
-       twice. */
-    void clearOutput() {
+    /** Return what would be printed to cout. */
+    std::string getOutput() {
+        std::string s = _out.str();
         _out.str("");
+        return s;
     }
 
-    /** Return what would be printed to cerr. See also clearErrout() */
-    std::string getErrout() const {
-        return _err.str();
-    }
-
-    /** Normally called after getErrout() to prevent same text to be returned
-       twice. */
-    void clearErrout() {
+    /** Return what would be printed to cerr. */
+    std::string getErrout() {
+        std::string s = _err.str();
         _err.str("");
+        return s;
     }
 
 private:
@@ -105,9 +110,7 @@ class SuppressOutput {
 
 #define REDIRECT RedirectOutputError redir
 #define GET_REDIRECT_OUTPUT redir.getOutput()
-#define CLEAR_REDIRECT_OUTPUT redir.clearOutput()
 #define GET_REDIRECT_ERROUT redir.getErrout()
-#define CLEAR_REDIRECT_ERROUT redir.clearErrout()
 
 #define SUPPRESS SuppressOutput supprout