From 1025ad2bbcb35787705aa96d289100f56dc6926c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sat, 28 Feb 2015 00:15:27 +0100 Subject: [PATCH] Reuse vector's initializer_list test code --- test/deque_test.cpp | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/test/deque_test.cpp b/test/deque_test.cpp index 6d37b86..3a32e6b 100644 --- a/test/deque_test.cpp +++ b/test/deque_test.cpp @@ -335,37 +335,6 @@ int test_cont_variants() return 0; } -bool test_support_for_initialization_list() -{ -#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) - const std::initializer_list il = {1, 10, 11}; - const deque expectedDeque(il.begin(), il.end()); - - const deque testConstructor = il; - if(testConstructor != expectedDeque) - return false; - - deque testAssignmentOperator = {11, 12, 23}; - testAssignmentOperator = il; - if(testConstructor != expectedDeque) - return false; - - deque testAssignmentMethod = {11, 12, 23}; - testAssignmentMethod.assign(il); - if(testConstructor != expectedDeque) - return false; - - deque testInsertMethod = {11}; - testInsertMethod.insert(testInsertMethod.cbegin(), {12, 23}); - if(testConstructor != expectedDeque) - return false; - - return true; -#endif - return true; - -} - struct boost_container_deque; namespace boost { namespace container { namespace test { @@ -436,9 +405,6 @@ int main () return 1; } - if(!test_support_for_initialization_list()) - return 1; - //////////////////////////////////// // Emplace testing //////////////////////////////////// @@ -453,6 +419,15 @@ int main () if(!boost::container::test::test_propagate_allocator()) return 1; + //////////////////////////////////// + // Initializer lists testing + //////////////////////////////////// + if(!boost::container::test::test_vector_methods_with_initializer_list_as_argument_for + < boost::container::deque >()) { + return 1; + } + return 0; + return 0; }