diff options
author | MikeGitb <MikeGitb@users.noreply.github.com> | 2017-04-02 22:30:49 +0300 |
---|---|---|
committer | Neil MacIntosh <neilmac@microsoft.com> | 2017-04-02 22:30:49 +0300 |
commit | ade86caa92e47ad5e5560b8a00d88cb31d79b53b (patch) | |
tree | 566c58f7ac7985cae6337730281f859615530d78 /tests/string_span_tests.cpp | |
parent | 33006026535d3664629585b67b852daeb6eaca9f (diff) |
Fix some corechecker warnings (#470)
* Improve const correctness in string_span
* Improve const correctness in bounds_tests.cpp and byte_tests.cpp
* Improve const correctness in span_tests.cpp
* Improve const correctness in utils_tests.cpp
* Use gsl::owner for dynamically allocated memory in string_span_tests.cpp
* Improve const correctness in string_span_tests.cpp
* Improve const correctness for strided_span_tests.cpp
Diffstat (limited to 'tests/string_span_tests.cpp')
-rw-r--r-- | tests/string_span_tests.cpp | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/tests/string_span_tests.cpp b/tests/string_span_tests.cpp index 471d5de..b152650 100644 --- a/tests/string_span_tests.cpp +++ b/tests/string_span_tests.cpp @@ -17,6 +17,7 @@ #include <UnitTest++/UnitTest++.h> #include <cstdlib> #include <gsl/string_span> +#include <gsl/gsl> //owner #include <vector> #include <map> @@ -229,7 +230,7 @@ SUITE(string_span_tests) const char ar2[10] = "Hello"; const std::string str = "Hello"; const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - gsl::span<const char> sp = ensure_z("Hello"); + const gsl::span<const char> sp = ensure_z("Hello"); cstring_span<> span = "Hello"; @@ -441,7 +442,7 @@ SUITE(string_span_tests) // ensure z on c strings { - char* ptr = new char[3]; + gsl::owner<char*> ptr = new char[3]; ptr[0] = 'a'; ptr[1] = 'b'; @@ -553,52 +554,52 @@ SUITE(string_span_tests) // from const string { const std::string str = "Hello"; - cstring_span<> span = str; + const cstring_span<> span = str; CHECK(span.length() == 5); } // from non-const string { std::string str = "Hello"; - cstring_span<> span = str; + const cstring_span<> span = str; CHECK(span.length() == 5); } // from const vector { const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - cstring_span<> span = vec; + const cstring_span<> span = vec; CHECK(span.length() == 5); } // from non-const vector { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - cstring_span<> span = vec; + const cstring_span<> span = vec; CHECK(span.length() == 5); } // from const span { - std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; + const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; const span<const char> inner = vec; - cstring_span<> span = inner; + const cstring_span<> span = inner; CHECK(span.length() == 5); } // from non-const span { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - span<char> inner = vec; - cstring_span<> span = inner; + const span<char> inner = vec; + const cstring_span<> span = inner; CHECK(span.length() == 5); } // from const string_span { - std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - cstring_span<> tmp = vec; - cstring_span<> span = tmp; + const std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; + const cstring_span<> tmp = vec; + const cstring_span<> span = tmp; CHECK(span.length() == 5); } @@ -725,8 +726,8 @@ SUITE(string_span_tests) // from non-const string_span { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; - string_span<> tmp = vec; - string_span<> span = tmp; + const string_span<> tmp = vec; + const string_span<> span = tmp; CHECK(span.length() == 5); } @@ -744,7 +745,7 @@ SUITE(string_span_tests) { std::vector<char> vec = { 'H', 'e', 'l', 'l', 'o' }; const string_span<> tmp = vec; - string_span<> span = tmp; + const string_span<> span = tmp; CHECK(span.length() == 5); } } @@ -766,29 +767,29 @@ SUITE(string_span_tests) // move string_span { cstring_span<> span = "Hello"; - auto span1 = std::move(span); + const auto span1 = std::move(span); CHECK(span1.length() == 5); } { cstring_span<> span = "Hello"; - auto span1 = move_wrapper(std::move(span)); + const auto span1 = move_wrapper(std::move(span)); CHECK(span1.length() == 5); } { cstring_span<> span = "Hello"; - auto span1 = move_wrapper(std::move(span)); + const auto span1 = move_wrapper(std::move(span)); CHECK(span1.length() == 5); } // move span { span<const char> span = ensure_z("Hello"); - cstring_span<> span1 = std::move(span); + const cstring_span<> span1 = std::move(span); CHECK(span1.length() == 5); } { span<const char> span = ensure_z("Hello"); - cstring_span<> span2 = move_wrapper(std::move(span)); + const cstring_span<> span2 = move_wrapper(std::move(span)); CHECK(span2.length() == 5); } @@ -939,7 +940,7 @@ SUITE(string_span_tests) wchar_t buf[1]; buf[0] = L'a'; - auto workaround_macro = [&]() { wzstring_span<> zspan({ buf, 1 }); }; + const auto workaround_macro = [&]() { wzstring_span<> zspan({ buf, 1 }); }; CHECK_THROW(workaround_macro(), fail_fast); } @@ -947,7 +948,7 @@ SUITE(string_span_tests) { wchar_t buf[10]; - auto name = CreateTempNameW({ buf, 10 }); + const auto name = CreateTempNameW({ buf, 10 }); if (!name.empty()) { cwzstring<> str = name.assume_z(); |