[Boost-commit] svn:boost r49953 - trunk/libs/utility/swap/test

Subject: [Boost-commit] svn:boost r49953 - trunk/libs/utility/swap/test
From: nielsdekker_at_[hidden]
Date: 2008-11-27 06:08:06

Author: niels_dekker
Date: 2008-11-27 06:08:05 EST (Thu, 27 Nov 2008)
New Revision: 49953
URL: http://svn.boost.org/trac/boost/changeset/49953

Log:
[utility/swap] Added comment to various array swapping tests, added member typedef to swap_test_template, to make the test more realistic.
Text files modified: 
   trunk/libs/utility/swap/test/array_of_class.cpp    |     2 ++                                      
   trunk/libs/utility/swap/test/array_of_int.cpp      |     2 ++                                      
   trunk/libs/utility/swap/test/array_of_template.cpp |    23 +++++++++++++----------                 
   3 files changed, 17 insertions(+), 10 deletions(-)

Modified: trunk/libs/utility/swap/test/array_of_class.cpp
==============================================================================
--- trunk/libs/utility/swap/test/array_of_class.cpp	(original)
+++ trunk/libs/utility/swap/test/array_of_class.cpp	2008-11-27 06:08:05 EST (Thu, 27 Nov 2008)
@@ -4,6 +4,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Tests swapping an array of arrays of swap_test_class objects by means of boost::swap.
+
 #include <boost/utility/swap.hpp>
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>

Modified: trunk/libs/utility/swap/test/array_of_int.cpp
==============================================================================
--- trunk/libs/utility/swap/test/array_of_int.cpp	(original)
+++ trunk/libs/utility/swap/test/array_of_int.cpp	2008-11-27 06:08:05 EST (Thu, 27 Nov 2008)
@@ -4,6 +4,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Tests swapping an array of integers by means of boost::swap.
+
 #include <boost/utility/swap.hpp>
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>

Modified: trunk/libs/utility/swap/test/array_of_template.cpp
==============================================================================
--- trunk/libs/utility/swap/test/array_of_template.cpp	(original)
+++ trunk/libs/utility/swap/test/array_of_template.cpp	2008-11-27 06:08:05 EST (Thu, 27 Nov 2008)
@@ -4,6 +4,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Tests swapping an array of swap_test_template<int> objects by means of boost::swap.
+
 #include <boost/utility/swap.hpp>
 #define BOOST_INCLUDE_MAIN
 #include <boost/test/test_tools.hpp>
@@ -18,6 +20,7 @@
 class swap_test_template
 {
 public:
+  typedef T template_argument;
   swap_test_class swap_test_object;
 };
 
@@ -45,23 +48,23 @@
 
 int test_main(int, char*[])
 {
-  const std::size_t dimension = 2;
-  const swap_test_template<int> initial_array1[dimension] = { swap_test_class(1), swap_test_class(2) };
-  const swap_test_template<int> initial_array2[dimension] = { swap_test_class(3), swap_test_class(4) };
+  const std::size_t array_size = 2;
+  const swap_test_template<int> initial_array1[array_size] = { swap_test_class(1), swap_test_class(2) };
+  const swap_test_template<int> initial_array2[array_size] = { swap_test_class(3), swap_test_class(4) };
   
-  swap_test_template<int> array1[dimension];
-  swap_test_template<int> array2[dimension];
+  swap_test_template<int> array1[array_size];
+  swap_test_template<int> array2[array_size];
 
-  std::copy(initial_array1, initial_array1 + dimension, array1);
-  std::copy(initial_array2, initial_array2 + dimension, array2);
+  std::copy(initial_array1, initial_array1 + array_size, array1);
+  std::copy(initial_array2, initial_array2 + array_size, array2);
   
   swap_test_class::reset();
   boost::swap(array1, array2);
 
-  BOOST_CHECK(std::equal(array1, array1 + dimension, initial_array2));
-  BOOST_CHECK(std::equal(array2, array2 + dimension, initial_array1));
+  BOOST_CHECK(std::equal(array1, array1 + array_size, initial_array2));
+  BOOST_CHECK(std::equal(array2, array2 + array_size, initial_array1));
 
-  BOOST_CHECK_EQUAL(swap_test_class::swap_count(), dimension);
+  BOOST_CHECK_EQUAL(swap_test_class::swap_count(), array_size);
   BOOST_CHECK_EQUAL(swap_test_class::copy_count(), 0);
 
   return 0;