From 92c604f9f3019810af3ed1d5b8e670eb19a820e0 Mon Sep 17 00:00:00 2001
From: Norbert Lange <nolange79@gmail.com>
Date: Tue, 24 May 2022 21:13:16 +0200
Subject: [PATCH] Support wstring_view for String comparison Macros

Using the feature test macro since there are combinations
with Abseil which has an string_view equivalent but no
wstring_view.
---
 googletest/include/gtest/gtest.h  | 16 ++++++++++++++++
 googletest/test/gtest_unittest.cc | 10 ++++++++++
 2 files changed, 26 insertions(+)

diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index e9378f98..fd2d93d5 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -1517,6 +1517,22 @@ GTEST_ATTRIBUTE_UNUSED_ static inline AssertionResult CmpHelperSTRCASENE(
 }
 #endif  // GTEST_INTERNAL_HAS_STRING_VIEW
 
+#if __cpp_lib_string_view >= 201803L
+GTEST_ATTRIBUTE_UNUSED_ static inline AssertionResult CmpHelperSTREQ(
+    const char* s1_expression, const char* s2_expression,
+    const std::wstring_view& s1, const std::wstring_view& s2) {
+  return CmpHelperSTREQ(s1_expression, s2_expression, std::wstring(s1).c_str(),
+                        std::wstring(s2).c_str());
+}
+
+GTEST_ATTRIBUTE_UNUSED_ static inline AssertionResult CmpHelperSTRNE(
+    const char* s1_expression, const char* s2_expression,
+    const std::wstring_view& s1, const std::wstring_view& s2) {
+  return CmpHelperSTRNE(s1_expression, s2_expression, std::wstring(s1).c_str(),
+                        std::wstring(s2).c_str());
+}
+#endif
+
 }  // namespace internal
 
 // IsSubstring() and IsNotSubstring() are intended to be used as the
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index dca271c0..284579cb 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -2597,6 +2597,16 @@ TEST(StringAssertionTest, STRNE_Wide) {
   ASSERT_STRNE(L"abc\x8119", L"abc\x8120") << "This shouldn't happen";
 }
 
+#if __cpp_lib_string_view >= 201803L
+// Tests correct mapping to the C-String functions
+TEST(StringAssertionTest, StringView_Wide) {
+  using std::wstring_view;
+  ASSERT_STREQ(wstring_view(L"hi"), wstring_view(L"hi"));
+  ASSERT_STREQ(wstring_view(L"hi"), L"hi");
+  ASSERT_STRNE(L"hi", wstring_view(L"hi2"));
+}
+#endif
+
 // Tests for ::testing::IsSubstring().
 
 // Tests that IsSubstring() returns the correct result when the input