removed string_view for string in tests

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 7746c0a..c60383a 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -75,7 +75,7 @@ struct AddressOverloaded
         return {};
     }
 };
-constexpr std::string_view deathstring("Expected Death");
+static const std::string deathstring("Expected Death");
 } // namespace
 
 TEST(span_test, constructors)
@@ -139,21 +139,21 @@ TEST(span_test, from_nullptr_size_constructor)
         auto workaround_macro = []() {
             const span<int, 1> s{nullptr, narrow_cast<span<int>::index_type>(0)};
         };
-        EXPECT_DEATH(workaround_macro(), deathstring.data());
+        EXPECT_DEATH(workaround_macro(), deathstring);
     }
     {
         auto workaround_macro = []() { const span<int> s{nullptr, 1}; };
-        EXPECT_DEATH(workaround_macro(), deathstring.data());
+        EXPECT_DEATH(workaround_macro(), deathstring);
 
         auto const_workaround_macro = []() { const span<const int> s{nullptr, 1}; };
-        EXPECT_DEATH(const_workaround_macro(), deathstring.data());
+        EXPECT_DEATH(const_workaround_macro(), deathstring);
     }
     {
         auto workaround_macro = []() { const span<int, 0> s{nullptr, 1}; };
-        EXPECT_DEATH(workaround_macro(), deathstring.data());
+        EXPECT_DEATH(workaround_macro(), deathstring);
 
         auto const_workaround_macro = []() { const span<const int, 0> s{nullptr, 1}; };
-        EXPECT_DEATH(const_workaround_macro(), deathstring.data());
+        EXPECT_DEATH(const_workaround_macro(), deathstring);
     }
     {
         span<int*> s{nullptr, narrow_cast<span<int>::index_type>(0)};
@@ -223,7 +223,7 @@ TEST(span_test, from_pointer_length_constructor)
     {
         int* p = nullptr;
         auto workaround_macro = [=]() { const span<int> s{p, 2}; };
-        EXPECT_DEATH(workaround_macro(), deathstring.data());
+        EXPECT_DEATH(workaround_macro(), deathstring);
     }
 
     {
@@ -244,7 +244,7 @@ TEST(span_test, from_pointer_length_constructor)
     {
         int* p = nullptr;
         auto workaround_macro = [=]() { make_span(p, 2); };
-        EXPECT_DEATH(workaround_macro(), deathstring.data());
+        EXPECT_DEATH(workaround_macro(), deathstring);
     }
 }
 
@@ -282,14 +282,14 @@ TEST(span_test, from_pointer_pointer_construction)
     // this will fail the std::distance() precondition, which asserts on MSVC debug builds
     //{
     //    auto workaround_macro = [&]() { span<int> s{&arr[1], &arr[0]}; };
-    //    EXPECT_DEATH(workaround_macro(), deathstring.data());
+    //    EXPECT_DEATH(workaround_macro(), deathstring);
     //}
 
     // this will fail the std::distance() precondition, which asserts on MSVC debug builds
     //{
     //    int* p = nullptr;
     //    auto workaround_macro = [&]() { span<int> s{&arr[0], p}; };
-    //    EXPECT_DEATH(workaround_macro(), deathstring.data());
+    //    EXPECT_DEATH(workaround_macro(), deathstring);
     //}
 
     {
@@ -310,7 +310,7 @@ TEST(span_test, from_pointer_pointer_construction)
     //{
     //    int* p = nullptr;
     //    auto workaround_macro = [&]() { span<int> s{&arr[0], p}; };
-    //    EXPECT_DEATH(workaround_macro(), deathstring.data());
+    //    EXPECT_DEATH(workaround_macro(), deathstring);
     //}
 
     {
@@ -862,7 +862,7 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE(av.first<6>().size() == 6);
          EXPECT_TRUE(av.first<-1>().size() == -1);
  #endif
-         EXPECT_DEATH(av.first(6).size(), deathstring.data());
+         EXPECT_DEATH(av.first(6).size(), deathstring);
      }
 
      {
@@ -903,7 +903,7 @@ TEST(span_test, from_array_constructor)
  #ifdef CONFIRM_COMPILATION_ERRORS
          EXPECT_TRUE(av.last<6>().size() == 6);
  #endif
-         EXPECT_DEATH(av.last(6).size(), deathstring.data());
+         EXPECT_DEATH(av.last(6).size(), deathstring);
      }
 
      {
@@ -942,8 +942,8 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE(decltype(av.subspan<0, 5>())::extent == 5);
          EXPECT_TRUE(av.subspan(0, 5).size() == 5);
 
-         EXPECT_DEATH(av.subspan(0, 6).size(), deathstring.data());
-         EXPECT_DEATH(av.subspan(1, 5).size(), deathstring.data());
+         EXPECT_DEATH(av.subspan(0, 6).size(), deathstring);
+         EXPECT_DEATH(av.subspan(1, 5).size(), deathstring);
      }
 
      {
@@ -952,7 +952,7 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE(decltype(av.subspan<4, 0>())::extent == 0);
          EXPECT_TRUE(av.subspan(4, 0).size() == 0);
          EXPECT_TRUE(av.subspan(5, 0).size() == 0);
-         EXPECT_DEATH(av.subspan(6, 0).size(), deathstring.data());
+         EXPECT_DEATH(av.subspan(6, 0).size(), deathstring);
      }
 
      {
@@ -966,13 +966,13 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE((av.subspan<0, 0>().size()) == 0);
          EXPECT_TRUE(decltype(av.subspan<0, 0>())::extent == 0);
          EXPECT_TRUE(av.subspan(0, 0).size() == 0);
-         EXPECT_DEATH((av.subspan<1, 0>().size()), deathstring.data());
+         EXPECT_DEATH((av.subspan<1, 0>().size()), deathstring);
      }
 
      {
          span<int> av;
          EXPECT_TRUE(av.subspan(0).size() == 0);
-         EXPECT_DEATH(av.subspan(1).size(), deathstring.data());
+         EXPECT_DEATH(av.subspan(1).size(), deathstring);
      }
 
      {
@@ -981,7 +981,7 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE(av.subspan(1).size() == 4);
          EXPECT_TRUE(av.subspan(4).size() == 1);
          EXPECT_TRUE(av.subspan(5).size() == 0);
-         EXPECT_DEATH(av.subspan(6).size(), deathstring.data());
+         EXPECT_DEATH(av.subspan(6).size(), deathstring);
          const auto av2 = av.subspan(1);
          for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
      }
@@ -992,7 +992,7 @@ TEST(span_test, from_array_constructor)
          EXPECT_TRUE(av.subspan(1).size() == 4);
          EXPECT_TRUE(av.subspan(4).size() == 1);
          EXPECT_TRUE(av.subspan(5).size() == 0);
-         EXPECT_DEATH(av.subspan(6).size(), deathstring.data());
+         EXPECT_DEATH(av.subspan(6).size(), deathstring);
          const auto av2 = av.subspan(1);
          for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
      }
@@ -1009,7 +1009,7 @@ TEST(span_test, from_array_constructor)
      {
          span<int> s = arr;
          EXPECT_TRUE(s.at(0) == 1);
-         EXPECT_DEATH(s.at(5), deathstring.data());
+         EXPECT_DEATH(s.at(5), deathstring);
      }
 
      {
@@ -1017,7 +1017,7 @@ TEST(span_test, from_array_constructor)
          span<int, 2> s = arr2d;
          EXPECT_TRUE(s.at(0) == 1);
          EXPECT_TRUE(s.at(1) == 6);
-         EXPECT_DEATH(s.at(2), deathstring.data());
+         EXPECT_DEATH(s.at(2), deathstring);
      }
  }
 
@@ -1032,7 +1032,7 @@ TEST(span_test, from_array_constructor)
      {
          span<int> s = arr;
          EXPECT_TRUE(s(0) == 1);
-         EXPECT_DEATH(s(5), deathstring.data());
+         EXPECT_DEATH(s(5), deathstring);
      }
 
      {
@@ -1040,7 +1040,7 @@ TEST(span_test, from_array_constructor)
          span<int, 2> s = arr2d;
          EXPECT_TRUE(s(0) == 1);
          EXPECT_TRUE(s(1) == 6);
-         EXPECT_DEATH(s(2), deathstring.data());
+         EXPECT_DEATH(s(2), deathstring);
      }
  }
 
@@ -1157,7 +1157,7 @@ TEST(span_test, from_array_constructor)
 
          auto beyond = s.end();
          EXPECT_TRUE(it != beyond);
-         EXPECT_DEATH(*beyond, deathstring.data());
+         EXPECT_DEATH(*beyond, deathstring);
 
          EXPECT_TRUE(beyond - first == 4);
          EXPECT_TRUE(first - first == 0);
@@ -1215,7 +1215,7 @@ TEST(span_test, from_array_constructor)
 
          auto beyond = s.cend();
          EXPECT_TRUE(it != beyond);
-         EXPECT_DEATH(*beyond, deathstring.data());
+         EXPECT_DEATH(*beyond, deathstring);
 
          EXPECT_TRUE(beyond - first == 4);
          EXPECT_TRUE(first - first == 0);
@@ -1259,7 +1259,7 @@ TEST(span_test, from_array_constructor)
 
          auto beyond = s.rend();
          EXPECT_TRUE(it != beyond);
-         EXPECT_DEATH(auto _ = *beyond , deathstring.data());
+         EXPECT_DEATH(auto _ = *beyond , deathstring);
 
          EXPECT_TRUE(beyond - first == 4);
          EXPECT_TRUE(first - first == 0);
@@ -1304,7 +1304,7 @@ TEST(span_test, from_array_constructor)
 
          auto beyond = s.crend();
          EXPECT_TRUE(it != beyond);
-         EXPECT_DEATH(auto _ = *beyond, deathstring.data());
+         EXPECT_DEATH(auto _ = *beyond, deathstring);
 
          EXPECT_TRUE(beyond - first == 4);
          EXPECT_TRUE(first - first == 0);
@@ -1552,7 +1552,7 @@ TEST(span_test, from_array_constructor)
              const span<int, 2> s2 = s;
              static_cast<void>(s2);
          };
-         EXPECT_DEATH(f(), deathstring.data());
+         EXPECT_DEATH(f(), deathstring);
      }
 
      // but doing so explicitly is ok
@@ -1591,7 +1591,7 @@ TEST(span_test, from_array_constructor)
              const span<int, 4> _s4 = {arr2, 2};
              static_cast<void>(_s4);
          };
-         EXPECT_DEATH(f(), deathstring.data());
+         EXPECT_DEATH(f(), deathstring);
      }
 
      // this should fail - we are trying to assign a small dynamic span to a fixed_size larger one
@@ -1599,7 +1599,7 @@ TEST(span_test, from_array_constructor)
          const span<int, 4> _s4 = av;
          static_cast<void>(_s4);
      };
-     EXPECT_DEATH(f(), deathstring.data());
+     EXPECT_DEATH(f(), deathstring);
  }
 
  TEST(span_test, interop_with_std_regex)