diff options
author | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-06 04:02:23 +0300 |
---|---|---|
committer | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-06 04:02:23 +0300 |
commit | 3b9d15f49fe043d42b2715dc5041f23ed7f56c5c (patch) | |
tree | 48c28a64a5adbdbfb21d1ee1bb43f1f696ff0ee4 /tests | |
parent | 45f016d96fe4bdc4c56d521509b88991f667c619 (diff) |
reverting changes to gsl::index
Diffstat (limited to 'tests')
-rw-r--r-- | tests/at_tests.cpp | 26 | ||||
-rw-r--r-- | tests/utils_tests.cpp | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/tests/at_tests.cpp b/tests/at_tests.cpp index 0580301..be2c7b8 100644 --- a/tests/at_tests.cpp +++ b/tests/at_tests.cpp @@ -33,7 +33,7 @@ TEST(at_tests, static_array) int a[4] = {1, 2, 3, 4}; const int(&c_a)[4] = a; - for (std::size_t i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { EXPECT_TRUE(&gsl::at(a, i) == &a[i]); EXPECT_TRUE(&gsl::at(c_a, i) == &a[i]); } @@ -43,7 +43,9 @@ TEST(at_tests, static_array) std::abort(); }); + EXPECT_DEATH(gsl::at(a, -1), deathstring); EXPECT_DEATH(gsl::at(a, 4), deathstring); + EXPECT_DEATH(gsl::at(c_a, -1), deathstring); EXPECT_DEATH(gsl::at(c_a, 4), deathstring); } @@ -52,7 +54,7 @@ TEST(at_tests, std_array) std::array<int, 4> a = {1, 2, 3, 4}; const std::array<int, 4>& c_a = a; - for (std::size_t i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { EXPECT_TRUE(&gsl::at(a, i) == &a[static_cast<std::size_t>(i)]); EXPECT_TRUE(&gsl::at(c_a, i) == &a[static_cast<std::size_t>(i)]); } @@ -62,7 +64,9 @@ TEST(at_tests, std_array) std::abort(); }); + EXPECT_DEATH(gsl::at(a, -1), deathstring); EXPECT_DEATH(gsl::at(a, 4), deathstring); + EXPECT_DEATH(gsl::at(c_a, -1), deathstring); EXPECT_DEATH(gsl::at(c_a, 4), deathstring); } @@ -71,7 +75,7 @@ TEST(at_tests, std_vector) std::vector<int> a = {1, 2, 3, 4}; const std::vector<int>& c_a = a; - for (std::size_t i = 0; i < 4; ++i) { + for (int i = 0; i < 4; ++i) { EXPECT_TRUE(&gsl::at(a, i) == &a[static_cast<std::size_t>(i)]); EXPECT_TRUE(&gsl::at(c_a, i) == &a[static_cast<std::size_t>(i)]); } @@ -81,7 +85,9 @@ TEST(at_tests, std_vector) std::abort(); }); + EXPECT_DEATH(gsl::at(a, -1), deathstring); EXPECT_DEATH(gsl::at(a, 4), deathstring); + EXPECT_DEATH(gsl::at(c_a, -1), deathstring); EXPECT_DEATH(gsl::at(c_a, 4), deathstring); } @@ -90,8 +96,8 @@ TEST(at_tests, InitializerList) const std::initializer_list<int> a = {1, 2, 3, 4}; for (int i = 0; i < 4; ++i) { - EXPECT_TRUE(gsl::at(a, static_cast<std::size_t>(i)) == i + 1); - EXPECT_TRUE(gsl::at({1, 2, 3, 4}, static_cast<std::size_t>(i)) == i + 1); + EXPECT_TRUE(gsl::at(a, i) == i + 1); + EXPECT_TRUE(gsl::at({1, 2, 3, 4}, i) == i + 1); } std::set_terminate([] { @@ -99,7 +105,9 @@ TEST(at_tests, InitializerList) std::abort(); }); + EXPECT_DEATH(gsl::at(a, -1), deathstring); EXPECT_DEATH(gsl::at(a, 4), deathstring); + EXPECT_DEATH(gsl::at({1, 2, 3, 4}, -1), deathstring); EXPECT_DEATH(gsl::at({1, 2, 3, 4}, 4), deathstring); } @@ -112,12 +120,12 @@ static constexpr bool test_constexpr() const std::array<int, 4>& c_a2 = a2; for (int i = 0; i < 4; ++i) { - if (&gsl::at(a1, static_cast<std::size_t>(i)) != &a1[i]) return false; - if (&gsl::at(c_a1, static_cast<std::size_t>(i)) != &a1[i]) return false; + if (&gsl::at(a1, i) != &a1[i]) return false; + if (&gsl::at(c_a1, i) != &a1[i]) return false; // requires C++17: // if (&gsl::at(a2, i) != &a2[static_cast<std::size_t>(i)]) return false; - if (&gsl::at(c_a2, static_cast<std::size_t>(i)) != &c_a2[static_cast<std::size_t>(i)]) return false; - if (gsl::at({1, 2, 3, 4}, static_cast<std::size_t>(i)) != i + 1) return false; + if (&gsl::at(c_a2, i) != &c_a2[static_cast<std::size_t>(i)]) return false; + if (gsl::at({1, 2, 3, 4}, i) != i + 1) return false; } return true; diff --git a/tests/utils_tests.cpp b/tests/utils_tests.cpp index 78bf59d..1fb0fd2 100644 --- a/tests/utils_tests.cpp +++ b/tests/utils_tests.cpp @@ -38,7 +38,7 @@ void g() { j += 1; } TEST(utils_tests, sanity_check_for_gsl_index_typedef) { - static_assert(std::is_same<gsl::index, std::size_t>::value, + static_assert(std::is_same<gsl::index, std::ptrdiff_t>::value, "gsl::index represents wrong arithmetic type"); } |