Author: marshall Date: Wed Nov 15 09:47:09 2017 New Revision: 318313 URL: http://llvm.org/viewvc/llvm-project?rev=318313&view=rev Log: Clean up the tests for free data(), size() and empty()
Modified: libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp Modified: libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp?rev=318313&r1=318312&r2=318313&view=diff ============================================================================== --- libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp (original) +++ libcxx/trunk/test/std/iterators/iterator.container/data.pass.cpp Wed Nov 15 09:47:09 2017 @@ -7,51 +7,54 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11, c++14 + // <iterator> // template <class C> constexpr auto data(C& c) -> decltype(c.data()); // C++17 // template <class C> constexpr auto data(const C& c) -> decltype(c.data()); // C++17 // template <class T, size_t N> constexpr T* data(T (&array)[N]) noexcept; // C++17 // template <class E> constexpr const E* data(initializer_list<E> il) noexcept; // C++17 -#include "test_macros.h" - -#if TEST_STD_VER <= 14 -int main () {} -#else - #include <iterator> #include <cassert> #include <vector> #include <array> #include <initializer_list> +#include "test_macros.h" + template<typename C> void test_const_container( const C& c ) { +// Can't say noexcept here because the container might not be assert ( std::data(c) == c.data()); } template<typename T> void test_const_container( const std::initializer_list<T>& c ) { + ASSERT_NOEXCEPT(std::data(c)); assert ( std::data(c) == c.begin()); } template<typename C> void test_container( C& c ) { +// Can't say noexcept here because the container might not be assert ( std::data(c) == c.data()); } template<typename T> void test_container( std::initializer_list<T>& c) { + ASSERT_NOEXCEPT(std::data(c)); assert ( std::data(c) == c.begin()); } template<typename T, size_t Sz> void test_const_array( const T (&array)[Sz] ) { + ASSERT_NOEXCEPT(std::data(array)); assert ( std::data(array) == &array[0]); } @@ -72,5 +75,3 @@ int main() static constexpr int arrA [] { 1, 2, 3 }; test_const_array ( arrA ); } - -#endif Modified: libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp?rev=318313&r1=318312&r2=318313&view=diff ============================================================================== --- libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp (original) +++ libcxx/trunk/test/std/iterators/iterator.container/empty.pass.cpp Wed Nov 15 09:47:09 2017 @@ -7,17 +7,13 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11, c++14 + // <iterator> // template <class C> constexpr auto empty(const C& c) -> decltype(c.empty()); // C++17 // template <class T, size_t N> constexpr bool empty(const T (&array)[N]) noexcept; // C++17 // template <class E> constexpr bool empty(initializer_list<E> il) noexcept; // C++17 -#include "test_macros.h" - -#if TEST_STD_VER <= 14 -int main () {} -#else - #include <iterator> #include <cassert> #include <vector> @@ -25,9 +21,12 @@ int main () {} #include <list> #include <initializer_list> +#include "test_macros.h" + template<typename C> void test_const_container( const C& c ) { +// Can't say noexcept here because the container might not be assert ( std::empty(c) == c.empty()); } @@ -40,18 +39,21 @@ void test_const_container( const std::in template<typename C> void test_container( C& c ) { +// Can't say noexcept here because the container might not be assert ( std::empty(c) == c.empty()); } template<typename T> void test_container( std::initializer_list<T>& c ) { + ASSERT_NOEXCEPT(std::empty(c)); assert ( std::empty(c) == (c.size() == 0)); } template<typename T, size_t Sz> void test_const_array( const T (&array)[Sz] ) { + ASSERT_NOEXCEPT(std::empty(array)); assert (!std::empty(array)); } @@ -75,5 +77,3 @@ int main() static constexpr int arrA [] { 1, 2, 3 }; test_const_array ( arrA ); } - -#endif Modified: libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp?rev=318313&r1=318312&r2=318313&view=diff ============================================================================== --- libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp (original) +++ libcxx/trunk/test/std/iterators/iterator.container/size.pass.cpp Wed Nov 15 09:47:09 2017 @@ -7,16 +7,12 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11, c++14 + // <iterator> // template <class C> constexpr auto size(const C& c) -> decltype(c.size()); // C++17 // template <class T, size_t N> constexpr size_t size(const T (&array)[N]) noexcept; // C++17 -#include "test_macros.h" - -#if TEST_STD_VER <= 14 -int main () {} -#else - #include <iterator> #include <cassert> #include <vector> @@ -24,33 +20,42 @@ int main () {} #include <list> #include <initializer_list> +#include "test_macros.h" + template<typename C> void test_const_container( const C& c ) { +// Can't say noexcept here because the container might not be assert ( std::size(c) == c.size()); } template<typename T> void test_const_container( const std::initializer_list<T>& c) { +// ASSERT_NOEXCEPT(std::size(c)); +// For some reason, there isn't a std::size() for initializer lists assert ( std::size(c) == c.size()); } template<typename C> void test_container( C& c) { +// Can't say noexcept here because the container might not be assert ( std::size(c) == c.size()); } template<typename T> void test_container( std::initializer_list<T>& c ) { +// ASSERT_NOEXCEPT(std::size(c)); +// For some reason, there isn't a std::size() for initializer lists assert ( std::size(c) == c.size()); } template<typename T, size_t Sz> void test_const_array( const T (&array)[Sz] ) { + ASSERT_NOEXCEPT(std::size(array)); assert ( std::size(array) == Sz ); } @@ -74,5 +79,3 @@ int main() static constexpr int arrA [] { 1, 2, 3 }; test_const_array ( arrA ); } - -#endif _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits