F Add support for approving strings with Unicode characters #154

Co-Authored-By: Llewellyn Falco <[email protected]>

ApprovalTests/CMakeLists.txt

@@ -129,6 +129,7 @@ add_library(${PROJECT_NAME}
         utilities/MoreHelpMessages.h
         utilities/MoreHelpMessages.cpp
         utilities/StringMaker.h
+        utilities/StringMaker.cpp
         utilities/StringUtils.h
         utilities/StringUtils.cpp
         utilities/SystemUtils.h

ApprovalTests/utilities/StringMaker.cpp

@@ -0,0 +1,18 @@
+#include "StringMaker.h"
+
+#include <codecvt>
+
+namespace ApprovalTests
+{
+    std::string StringMaker::toString(const std::wstring& wstr)
+    {
+        static std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> utf8_converter;
+        return utf8_converter.to_bytes(wstr);
+    }
+
+    std::string StringMaker::toString(const wchar_t* wstr)
+    {
+        static std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> utf8_converter;
+        return utf8_converter.to_bytes(wstr);
+    }
+}

ApprovalTests/utilities/StringMaker.h

@@ -14,5 +14,9 @@ namespace ApprovalTests
             s << contents;
             return s.str();
         }
+
+        static std::string toString(const std::wstring& wstr);
+
+        static std::string toString(const wchar_t* wstr);
     };
 }

tests/DocTest_Tests/ApprovalsTests.cpp

@@ -36,6 +36,17 @@ TEST_CASE("TestNonCopyableStreamableObject")
     Approvals::verify(object, Options());
 }
 
+TEST_CASE("Test Unicode")
+{
+    Approvals::verify("I like unicode ☃");
+}
+
+TEST_CASE("Test wstring")
+{
+    std::wstring text = L"I like unicode ☃";
+    Approvals::verify(text);
+}
+
 // ==============================================================
 
 struct NonStreamablePoint

tests/DocTest_Tests/approval_tests/ApprovalsTests.Test_Unicode.approved.txt

@@ -0,0 +1 @@
+I like unicode ☃

tests/DocTest_Tests/approval_tests/ApprovalsTests.Test_wstring.approved.txt

@@ -0,0 +1 @@
+I like unicode ☃