commit e6e44e787e6a2275aaa96af5ccb08f96ace5f1a8
author William A. Kennington III <wak@google.com> Thu Sep 22 17:54:07 2022 -0700
committer William A. Kennington III <wak@google.com> Fri Sep 23 14:37:28 2022 -0700
tree 28a92a037f4fee445d63e92ac82337e01aa3d21c
parent aa904741b2c68ba45fe1d854a38b00c6a92d9048

zstring_view: Fix coercion

This ensures that types are correctly coerced to zstring_views and not
implicitly converted.

Change-Id: Ic9340c5fbf5f5d0f8890406601202790f53e6eb6
Signed-off-by: William A. Kennington III <wak@google.com>

test/zstring_view.cpp

diff --git a/test/zstring_view.cpp b/test/zstring_view.cpp
index 1b7120d..8ed2f63 100644
--- a/test/zstring_view.cpp
+++ b/test/zstring_view.cpp
@@ -18,9 +18,12 @@
     auto s = "b"s;
     auto s2 = zstring_view(s);
     std::string_view sv = s1;
+    char mut[] = "aa";
+    auto s3 = zstring_view(mut);
 
     EXPECT_NE(sv, s2);
     EXPECT_NE(s1, s2);
+    EXPECT_EQ(s3, "aa");
 
     EXPECT_EQ("ac"_zsv, s1);
     EXPECT_EQ("ac", s1);
@@ -50,7 +53,21 @@
 TEST(ZstringView, ConstructError)
 {
     auto s = "hi\0"s;
+#ifdef NDEBUG
+    EXPECT_EQ("hi", zstring_view(s));
+#else
     EXPECT_THROW((zstring_view(s)), std::invalid_argument);
+#endif
+
+    char mut1[] = "aa\0";
+    char mut2[] = {'a', 'a'};
+#ifdef NDEBUG
+    EXPECT_EQ("aa\0", zstring_view(mut1));
+    EXPECT_EQ("a", zstring_view(mut2));
+#else
+    EXPECT_THROW((zstring_view(mut1)), std::invalid_argument);
+    EXPECT_THROW((zstring_view(mut2)), std::invalid_argument);
+#endif
 }
 
 TEST(ZstringView, Suffix)
@@ -65,6 +82,8 @@
 
 TEST(ZstringView, NoTypeCoercion)
 {
+    EXPECT_NE(""_zsv, "\0");
+    EXPECT_NE("\0", ""_zsv);
     EXPECT_NE(""_zsv, "\0"sv);
     EXPECT_NE("\0"sv, ""_zsv);
     EXPECT_LT(""_zsv, "\0"sv);