toString handles wchar_t raw strings
diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h
index 4b46883..e8e3829 100644
--- a/include/internal/catch_tostring.h
+++ b/include/internal/catch_tostring.h
@@ -154,6 +154,8 @@
std::string toString( std::wstring const& value );
std::string toString( const char* const value );
std::string toString( char* const value );
+std::string toString( const wchar_t* const value );
+std::string toString( wchar_t* const value );
std::string toString( int value );
std::string toString( unsigned long value );
std::string toString( unsigned int value );
diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp
index 825ceb5..f9369f1 100644
--- a/include/internal/catch_tostring.hpp
+++ b/include/internal/catch_tostring.hpp
@@ -84,6 +84,16 @@
return Catch::toString( static_cast<const char*>( value ) );
}
+std::string toString( const wchar_t* const value )
+{
+ return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
+}
+
+std::string toString( wchar_t* const value )
+{
+ return Catch::toString( static_cast<const wchar_t*>( value ) );
+}
+
std::string toString( int value ) {
std::ostringstream oss;
oss << value;
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index ad572ee..3271155 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -356,3 +356,27 @@
CHECK( s1 == s2 );
}
+
+TEST_CASE( "toString on const wchar_t const pointer returns the string contents", "[toString]" ) {
+ const wchar_t * const s = L"wide load";
+ auto result = Catch::toString( s );
+ CHECK( result == "\"wide load\"" );
+}
+
+TEST_CASE( "toString on const wchar_t pointer returns the string contents", "[toString]" ) {
+ const wchar_t * s = L"wide load";
+ auto result = Catch::toString( s );
+ CHECK( result == "\"wide load\"" );
+}
+
+TEST_CASE( "toString on wchar_t const pointer returns the string contents", "[toString]" ) {
+ wchar_t * const s = L"wide load";
+ auto result = Catch::toString( s );
+ CHECK( result == "\"wide load\"" );
+}
+
+TEST_CASE( "toString on wchar_t returns the string contents", "[toString]" ) {
+ wchar_t * s = L"wide load";
+ auto result = Catch::toString( s );
+ CHECK( result == "\"wide load\"" );
+}
\ No newline at end of file