diff options
author | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-05 03:53:43 +0300 |
---|---|---|
committer | Jordan Maples [MSFT] <49793787+JordanMaples@users.noreply.github.com> | 2020-02-05 03:53:43 +0300 |
commit | d7e16111377e5bf0ca9b766f4445fe4754542ed9 (patch) | |
tree | f16a7f75f7fd99f7ea1224c2da7a25e44657a40e /tests | |
parent | 5a1e4f39537330c579662a76a9a9b5c8580ad708 (diff) |
gsl::index ptrdiff_t -> size_t. remove span::at span::operator().
Diffstat (limited to 'tests')
-rw-r--r-- | tests/at_tests.cpp | 26 | ||||
-rw-r--r-- | tests/span_tests.cpp | 60 | ||||
-rw-r--r-- | tests/utils_tests.cpp | 3 |
3 files changed, 14 insertions, 75 deletions
diff --git a/tests/at_tests.cpp b/tests/at_tests.cpp index be2c7b8..0580301 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 (int i = 0; i < 4; ++i) { + for (std::size_t i = 0; i < 4; ++i) { EXPECT_TRUE(&gsl::at(a, i) == &a[i]); EXPECT_TRUE(&gsl::at(c_a, i) == &a[i]); } @@ -43,9 +43,7 @@ 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); } @@ -54,7 +52,7 @@ TEST(at_tests, std_array) std::array<int, 4> a = {1, 2, 3, 4}; const std::array<int, 4>& c_a = a; - for (int i = 0; i < 4; ++i) { + for (std::size_t 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)]); } @@ -64,9 +62,7 @@ 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); } @@ -75,7 +71,7 @@ TEST(at_tests, std_vector) std::vector<int> a = {1, 2, 3, 4}; const std::vector<int>& c_a = a; - for (int i = 0; i < 4; ++i) { + for (std::size_t 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)]); } @@ -85,9 +81,7 @@ 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); } @@ -96,8 +90,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, i) == i + 1); - EXPECT_TRUE(gsl::at({1, 2, 3, 4}, i) == i + 1); + 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); } std::set_terminate([] { @@ -105,9 +99,7 @@ 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); } @@ -120,12 +112,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, i) != &a1[i]) return false; - if (&gsl::at(c_a1, i) != &a1[i]) return false; + 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; // requires C++17: // if (&gsl::at(a2, i) != &a2[static_cast<std::size_t>(i)]) 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; + 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; } return true; diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index 99ee0d8..ce10325 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -25,7 +25,7 @@ #include <iterator> // for reverse_iterator, operator-, operator== #include <memory> // for unique_ptr, shared_ptr, make_unique, allo... #include <regex> // for match_results, sub_match, match_results<>... -#include <stddef.h> // for ptrdiff_t +#include <cstddef> // for ptrdiff_t #include <string> // for string #include <type_traits> // for integral_constant<>::value, is_default_co... #include <vector> // for vector @@ -161,11 +161,7 @@ TEST(span_test, from_pointer_length_constructor) EXPECT_TRUE(s.data() == &arr[0]); EXPECT_TRUE(s.empty() == (i == 0)); for (std::size_t j = 0; j < i; ++j) - { EXPECT_TRUE(arr[j] == s[j]); - EXPECT_TRUE(arr[j] == s.at(j)); - EXPECT_TRUE(arr[j] == s(j)); - } } { span<int> s = {&arr[i], 4 - i}; @@ -174,11 +170,7 @@ TEST(span_test, from_pointer_length_constructor) EXPECT_TRUE(s.empty() == ((4 - i) == 0)); for (std::size_t j = 0; j < 4 - i; ++j) - { EXPECT_TRUE(arr[j + i] == s[j]); - EXPECT_TRUE(arr[j + i] == s.at(j)); - EXPECT_TRUE(arr[j + i] == s(j)); - } } } } @@ -976,52 +968,6 @@ TEST(span_test, from_array_constructor) } } - TEST(span_test, at_call) - { - std::set_terminate([] { - std::cerr << "Expected Death. at_call"; - std::abort(); - }); - int arr[4] = {1, 2, 3, 4}; - - { - span<int> s = arr; - EXPECT_TRUE(s.at(0) == 1); - EXPECT_DEATH(s.at(5), deathstring); - } - - { - int arr2d[2] = {1, 6}; - span<int, 2> s = arr2d; - EXPECT_TRUE(s.at(0) == 1); - EXPECT_TRUE(s.at(1) == 6); - EXPECT_DEATH(s.at(2), deathstring); - } - } - - TEST(span_test, operator_function_call) - { - std::set_terminate([] { - std::cerr << "Expected Death. operator_function_call"; - std::abort(); - }); - int arr[4] = {1, 2, 3, 4}; - - { - span<int> s = arr; - EXPECT_TRUE(s(0) == 1); - EXPECT_DEATH(s(5), deathstring); - } - - { - int arr2d[2] = {1, 6}; - span<int, 2> s = arr2d; - EXPECT_TRUE(s(0) == 1); - EXPECT_TRUE(s(1) == 6); - EXPECT_DEATH(s(2), deathstring); - } - } - TEST(span_test, iterator_default_init) { span<int>::iterator it1; @@ -1093,8 +1039,8 @@ TEST(span_test, from_array_constructor) int a[] = {1, 2, 3, 4}; span<int> s{a}; - EXPECT_TRUE((std::is_same<decltype(s.size()), decltype(ssize(s))>::value)); - EXPECT_TRUE(s.size() == ssize(s)); + EXPECT_FALSE((std::is_same<decltype(s.size()), decltype(ssize(s))>::value)); + EXPECT_TRUE(s.size() == static_cast<std::size_t>(ssize(s))); } TEST(span_test, iterator_comparisons) diff --git a/tests/utils_tests.cpp b/tests/utils_tests.cpp index b6b5fc9..78bf59d 100644 --- a/tests/utils_tests.cpp +++ b/tests/utils_tests.cpp @@ -23,6 +23,7 @@ #include <limits> // for numeric_limits #include <stdint.h> // for uint32_t, int32_t #include <type_traits> // for is_same +#include <cstddef> // for std::size_t using namespace gsl; @@ -37,7 +38,7 @@ void g() { j += 1; } TEST(utils_tests, sanity_check_for_gsl_index_typedef) { - static_assert(std::is_same<gsl::index, std::ptrdiff_t>::value, + static_assert(std::is_same<gsl::index, std::size_t>::value, "gsl::index represents wrong arithmetic type"); } |