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

Fixed null string reporting issue

Commit
8087f5738cd4021ed4bf3f33f923a9c7402a5d51
Author
Phil Nash ·
Parents
331188f6b3db

Files · Download .tar.gz

Changes

 Test/MiscTests.cpp         | 11 +++++++++++
 internal/catch_capture.hpp | 14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Test/MiscTests.cpp b/Test/MiscTests.cpp
index 52d00141..afe42baf 100644
--- a/Test/MiscTests.cpp
+++ b/Test/MiscTests.cpp
@@ -105,3 +105,14 @@ TEST_CASE( "./succeeding/Misc/stdout,stderr", "Sends stuff to stdout and stderr"
     
     std::cerr << "An error";
 }
+
+const char* makeString( bool makeNull ) 
+{
+    return makeNull ? NULL : "valid string";
+}
+
+TEST_CASE( "./succeeding/Misc/null strings", "" )
+{
+    REQUIRE( makeString( false ) != static_cast<char*>(NULL));
+    REQUIRE( makeString( true ) == static_cast<char*>(NULL));
+}
diff --git a/internal/catch_capture.hpp b/internal/catch_capture.hpp
index 047a1ac8..213c609f 100644
--- a/internal/catch_capture.hpp
+++ b/internal/catch_capture.hpp
@@ -105,16 +105,24 @@ inline std::string toString
 {
     return value;
 }
-
 ///////////////////////////////////////////////////////////////////////////////
 inline std::string toString
 (
-    const char* value
+    const char* const value
 )
 {
-    return value;
+    return value ? "'" + std::string( value ) + "'" : std::string( "{null string}" );
 }    
 
+///////////////////////////////////////////////////////////////////////////////
+inline std::string toString
+(
+    char* const value
+)
+{
+    return toString( static_cast<const char* const>( value ) );
+}        
+
 ///////////////////////////////////////////////////////////////////////////////
 inline std::string toString
 (