Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Added newlines to warn & info - and always output cout & cerr

Commit
b87bff21cd6b5bb095bddc9db2b99ffae65681d8
Author
Phil Nash ·
Parents
c27e6dc8383b

Files · Download .tar.gz

Changes

 catch_reporter_basic.hpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/catch_reporter_basic.hpp b/catch_reporter_basic.hpp
index 23374583..72843f2f 100644
--- a/catch_reporter_basic.hpp
+++ b/catch_reporter_basic.hpp
@@ -195,10 +195,10 @@ namespace Catch
                     m_config.stream() << " exception with message: '" << resultInfo.getMessage() << "'";
                     break;
                 case ResultWas::Info:
-                    m_config.stream() << "info: '" << resultInfo.getMessage() << "'";
+                    m_config.stream() << "info:\n'" << resultInfo.getMessage() << "'";
                     break;
                 case ResultWas::Warning:
-                    m_config.stream() << "warning: '" << resultInfo.getMessage() << "'";
+                    m_config.stream() << "warning:\n'" << resultInfo.getMessage() << "'";
                     break;
                 case ResultWas::ExplicitFailure:
                     m_config.stream() << "failed with message: '" << resultInfo.getMessage() << "'";
@@ -224,14 +224,14 @@ namespace Catch
             const std::string& stdErr
         )
         {
-            if( m_testSpan.emitted )
-            {
-                if( !stdOut.empty() )
-                    m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
+            if( !stdOut.empty() )
+                m_config.stream() << "[stdout: " << trim( stdOut ) << "]\n";
 
-                if( !stdErr.empty() )
-                    m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
+            if( !stdErr.empty() )
+                m_config.stream() << "[stderr: " << trim( stdErr ) << "]\n";
                 
+            if( m_testSpan.emitted )
+            {
                 m_config.stream() << "[Finished: " << testInfo.getName() << " ";
                 ReportCounts( succeeded, failed );
                 m_config.stream() << "]" << std::endl;