Simplified test case registration and started using StringRefs

1 files changed, 10 insertions, 4 deletions

diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp
index 4ee4f7dd..3c4e292d 100644
--- a/include/internal/catch_stringref.cpp
+++ b/include/internal/catch_stringref.cpp
@@ -12,13 +12,17 @@
 
 #include <cstring>
 #include <ostream>
+#include <cassert>
 
 namespace Catch {
-    
-    StringRef StringRef::s_emptyStringRef = "";
+
+    auto getEmptyStringRef() -> StringRef {
+        static StringRef s_emptyStringRef("");
+        return s_emptyStringRef;
+    }
     
     StringRef::StringRef() noexcept
-    :   StringRef( s_emptyStringRef )
+    :   StringRef( getEmptyStringRef() )
     {}
     
     StringRef::StringRef( StringRef const& other ) noexcept
@@ -41,7 +45,9 @@ namespace Catch {
     StringRef::StringRef( char const* rawChars ) noexcept
     :   m_start( rawChars ),
         m_size( static_cast<size_type>( std::strlen( rawChars ) ) )
-    {}
+    {
+        assert( rawChars != nullptr );
+    }
     
     StringRef::StringRef( char const* rawChars, size_type size ) noexcept
     :   m_start( rawChars ),