removed string_view for string in tests

This commit is contained in:
Jordan Maples [MSFT]
2019-12-12 11:15:41 -08:00
parent 4f6f05d463
commit 5099e8fa3e
10 changed files with 183 additions and 185 deletions

View File

@@ -139,7 +139,7 @@ void fn(const Bounds&)
static_assert(Bounds::static_size == 60, "static bounds is wrong size");
}
constexpr std::string_view deathstring("Expected Death");
static const std::string deathstring("Expected Death");
} // namespace
TEST(multi_span_test, default_constructor)
@@ -262,18 +262,18 @@ TEST(multi_span_test, from_nullptr_length_constructor) {
{
auto workaround_macro = []() { const multi_span<int> s{nullptr, 1}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
auto const_workaround_macro = []() { const multi_span<const int> cs{nullptr, 1}; };
EXPECT_DEATH(const_workaround_macro(), deathstring.data());
EXPECT_DEATH(const_workaround_macro(), deathstring);
}
{
auto workaround_macro = []() { const multi_span<int, 0> s{nullptr, 1}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
auto const_workaround_macro = []() { const multi_span<const int, 0> s{nullptr, 1}; };
EXPECT_DEATH(const_workaround_macro(), deathstring.data());
EXPECT_DEATH(const_workaround_macro(), deathstring);
}
{
@@ -385,7 +385,7 @@ TEST(multi_span_test, from_pointer_length_constructor)
{
int* p = nullptr;
auto workaround_macro = [=]() { const multi_span<int> s{p, 2}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
}
}
@@ -429,25 +429,25 @@ TEST(multi_span_test, from_pointer_pointer_constructor)
{
auto workaround_macro = [&]() { const multi_span<int> s{&arr[1], &arr[0]}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
}
{
int* p = nullptr;
auto workaround_macro = [&]() { const multi_span<int> s{&arr[0], p}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
}
{
int* p = nullptr;
auto workaround_macro = [&]() { const multi_span<int> s{p, p}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
}
{
int* p = nullptr;
auto workaround_macro = [&]() { const multi_span<int> s{&arr[0], p}; };
EXPECT_DEATH(workaround_macro(), deathstring.data());
EXPECT_DEATH(workaround_macro(), deathstring);
}
}
@@ -605,7 +605,7 @@ TEST(multi_span_test, from_dynamic_array_constructor)
multi_span<double, dynamic_range, 3, 4> s(arr, 10);
EXPECT_TRUE(s.length() == 120);
EXPECT_TRUE(s.data() == &arr[0][0][0]);
EXPECT_DEATH(s[10][3][4], deathstring.data());
EXPECT_DEATH(s[10][3][4], deathstring);
}
{
@@ -838,7 +838,7 @@ TEST(multi_span_test, from_convertible_span_constructor)
});
auto f = [&]() { multi_span<int, 7, 4, 2> av1(nullptr); };
EXPECT_DEATH(f(), deathstring.data());
EXPECT_DEATH(f(), deathstring);
#endif
#ifdef CONFIRM_COMPILATION_ERRORS
@@ -944,7 +944,7 @@ TEST(multi_span_test, first)
std::abort();
});
EXPECT_DEATH(av.first(6).length(), deathstring.data());
EXPECT_DEATH(av.first(6).length(), deathstring);
}
{
@@ -992,7 +992,7 @@ TEST(multi_span_test, last)
std::abort();
});
EXPECT_DEATH(av.last(6).length(), deathstring.data());
EXPECT_DEATH(av.last(6).length(), deathstring);
}
{
@@ -1032,8 +1032,8 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE((av.subspan<0, 5>().bounds()) == static_bounds<5>());
EXPECT_TRUE((av.subspan<0, 5>().length()) == 5);
EXPECT_TRUE(av.subspan(0, 5).length() == 5);
EXPECT_DEATH(av.subspan(0, 6).length(), deathstring.data());
EXPECT_DEATH(av.subspan(1, 5).length(), deathstring.data());
EXPECT_DEATH(av.subspan(0, 6).length(), deathstring);
EXPECT_DEATH(av.subspan(1, 5).length(), deathstring);
}
{
@@ -1041,7 +1041,7 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE((av.subspan<5, 0>().bounds()) == static_bounds<0>());
EXPECT_TRUE((av.subspan<5, 0>().length()) == 0);
EXPECT_TRUE(av.subspan(5, 0).length() == 0);
EXPECT_DEATH(av.subspan(6, 0).length(), deathstring.data());
EXPECT_DEATH(av.subspan(6, 0).length(), deathstring);
}
{
@@ -1049,13 +1049,13 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE((av.subspan<0, 0>().bounds()) == static_bounds<0>());
EXPECT_TRUE((av.subspan<0, 0>().length()) == 0);
EXPECT_TRUE(av.subspan(0, 0).length() == 0);
EXPECT_DEATH((av.subspan<1, 0>().length()), deathstring.data());
EXPECT_DEATH((av.subspan<1, 0>().length()), deathstring);
}
{
multi_span<int> av;
EXPECT_TRUE(av.subspan(0).length() == 0);
EXPECT_DEATH(av.subspan(1).length(), deathstring.data());
EXPECT_DEATH(av.subspan(1).length(), deathstring);
}
{
@@ -1064,7 +1064,7 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE(av.subspan(1).length() == 4);
EXPECT_TRUE(av.subspan(4).length() == 1);
EXPECT_TRUE(av.subspan(5).length() == 0);
EXPECT_DEATH(av.subspan(6).length(), deathstring.data());
EXPECT_DEATH(av.subspan(6).length(), deathstring);
auto av2 = av.subspan(1);
for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
}
@@ -1075,7 +1075,7 @@ TEST(multi_span_test, subspan)
EXPECT_TRUE(av.subspan(1).length() == 4);
EXPECT_TRUE(av.subspan(4).length() == 1);
EXPECT_TRUE(av.subspan(5).length() == 0);
EXPECT_DEATH(av.subspan(6).length(), deathstring.data());
EXPECT_DEATH(av.subspan(6).length(), deathstring);
auto av2 = av.subspan(1);
for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
}
@@ -1113,7 +1113,7 @@ TEST(multi_span_test, extent)
multi_span<int> s;
EXPECT_TRUE(s.extent() == 0);
EXPECT_TRUE(s.extent(0) == 0);
EXPECT_DEATH(s.extent(1), deathstring.data());
EXPECT_DEATH(s.extent(1), deathstring);
#ifdef CONFIRM_COMPILATION_ERRORS
EXPECT_TRUE(s.extent<1>() == 0);
#endif
@@ -1123,7 +1123,7 @@ TEST(multi_span_test, extent)
multi_span<int, 0> s;
EXPECT_TRUE(s.extent() == 0);
EXPECT_TRUE(s.extent(0) == 0);
EXPECT_DEATH(s.extent(1), deathstring.data());
EXPECT_DEATH(s.extent(1), deathstring);
}
{
@@ -1135,7 +1135,7 @@ TEST(multi_span_test, extent)
EXPECT_TRUE(s.extent<1>() == 2);
EXPECT_TRUE(s.extent(0) == 1);
EXPECT_TRUE(s.extent(1) == 2);
EXPECT_DEATH(s.extent(3), deathstring.data());
EXPECT_DEATH(s.extent(3), deathstring);
}
{
@@ -1147,7 +1147,7 @@ TEST(multi_span_test, extent)
EXPECT_TRUE(s.extent<1>() == 2);
EXPECT_TRUE(s.extent(0) == 0);
EXPECT_TRUE(s.extent(1) == 2);
EXPECT_DEATH(s.extent(3), deathstring.data());
EXPECT_DEATH(s.extent(3), deathstring);
}
}
@@ -1163,7 +1163,7 @@ TEST(multi_span_test, operator_function_call)
{
multi_span<int> s = arr;
EXPECT_TRUE(s(0) == 1);
EXPECT_DEATH(s(5), deathstring.data());
EXPECT_DEATH(s(5), deathstring);
}
int arr2d[2][3] = {1, 2, 3, 4, 5, 6};
@@ -1322,17 +1322,17 @@ TEST(multi_span_test, bounds_checks)
});
// out of bounds
EXPECT_DEATH(av[1][3] = 3, deathstring.data());
EXPECT_DEATH((av[{1, 3}] = 3), deathstring.data());
EXPECT_DEATH(av[1][3] = 3, deathstring);
EXPECT_DEATH((av[{1, 3}] = 3), deathstring);
EXPECT_DEATH(av[10][2], deathstring.data());
EXPECT_DEATH((av[{10, 2}]), deathstring.data());
EXPECT_DEATH(av[10][2], deathstring);
EXPECT_DEATH((av[{10, 2}]), deathstring);
EXPECT_DEATH(av[-1][0], deathstring.data());
EXPECT_DEATH((av[{-1, 0}]), deathstring.data());
EXPECT_DEATH(av[-1][0], deathstring);
EXPECT_DEATH((av[{-1, 0}]), deathstring);
EXPECT_DEATH(av[0][-1], deathstring.data());
EXPECT_DEATH((av[{0, -1}]), deathstring.data());
EXPECT_DEATH(av[0][-1], deathstring);
EXPECT_DEATH((av[{0, -1}]), deathstring);
}
TEST(multi_span_test, span_parameter_test)
@@ -1459,9 +1459,9 @@ TEST(multi_span_test, empty_spans)
multi_span<int, 0> empty_av(nullptr);
EXPECT_TRUE(empty_av.bounds().index_bounds() == multi_span_index<1>{0});
EXPECT_DEATH(empty_av[0], deathstring.data());
EXPECT_DEATH(empty_av.begin()[0], deathstring.data());
EXPECT_DEATH(empty_av.cbegin()[0], deathstring.data());
EXPECT_DEATH(empty_av[0], deathstring);
EXPECT_DEATH(empty_av.begin()[0], deathstring);
EXPECT_DEATH(empty_av.cbegin()[0], deathstring);
for (auto& v : empty_av)
{
(void) v;
@@ -1472,9 +1472,9 @@ TEST(multi_span_test, empty_spans)
{
multi_span<int> empty_av = {};
EXPECT_TRUE(empty_av.bounds().index_bounds() == multi_span_index<1>{0});
EXPECT_DEATH(empty_av[0], deathstring.data());
EXPECT_DEATH(empty_av.begin()[0], deathstring.data());
EXPECT_DEATH(empty_av.cbegin()[0], deathstring.data());
EXPECT_DEATH(empty_av[0], deathstring);
EXPECT_DEATH(empty_av.begin()[0], deathstring);
EXPECT_DEATH(empty_av.cbegin()[0], deathstring);
for (auto& v : empty_av)
{
(void) v;
@@ -1709,7 +1709,7 @@ TEST(multi_span_test, span_structure_size)
std::abort();
});
EXPECT_DEATH(av1[10][3][4], deathstring.data());
EXPECT_DEATH(av1[10][3][4], deathstring);
multi_span<const double, dynamic_range, 6, 4> av2 =
as_multi_span(av1, dim(5), dim<6>(), dim<4>());
@@ -1802,13 +1802,13 @@ TEST(multi_span_test, fixed_size_conversions)
std::cerr << "Expected Death. fixed_size_conversions";
std::abort();
});
{
auto f = [&]() {
const multi_span<int, 4> av9 = {arr2, 2};
(void) av9;
};
EXPECT_DEATH(f(), deathstring.data());
EXPECT_DEATH(f(), deathstring);
}
// this should fail - we are trying to assign a small dynamic a_v to a fixed_size larger one
@@ -1817,7 +1817,7 @@ TEST(multi_span_test, fixed_size_conversions)
const multi_span<int, 4> av2 = av;
(void) av2;
};
EXPECT_DEATH(f(), deathstring.data());
EXPECT_DEATH(f(), deathstring);
}
TEST(multi_span_test, as_writeable_bytes)