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

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

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

Log:
[utility/swap] Distinguished between testing array-of-array-of-class and array-of-array-of-int, as the latter appears to succeed on CodeGear 6.10 while the former does not.
Added:
   trunk/libs/utility/swap/test/array_of_array_of_class.cpp   (contents, props changed)
      - copied, changed from r49952, /trunk/libs/utility/swap/test/array_of_array.cpp
   trunk/libs/utility/swap/test/array_of_array_of_int.cpp   (contents, props changed)
Removed:
   trunk/libs/utility/swap/test/array_of_array.cpp
Text files modified: 
   trunk/libs/utility/swap/test/Jamfile.v2                  |     3 ++-                                     
   trunk/libs/utility/swap/test/array_of_array_of_class.cpp |     2 ++                                      
   2 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/libs/utility/swap/test/Jamfile.v2
==============================================================================
--- trunk/libs/utility/swap/test/Jamfile.v2	(original)
+++ trunk/libs/utility/swap/test/Jamfile.v2	2008-11-27 06:14:52 EST (Thu, 27 Nov 2008)
@@ -29,7 +29,8 @@
     [ run std_vector_of_global.cpp ../../../test/build//boost_test_exec_monitor/<link>static           ]
     [ run std_vector_of_other.cpp ../../../test/build//boost_test_exec_monitor/<link>static            ]
     [ run no_ambiguity_in_boost.cpp ../../../test/build//boost_test_exec_monitor/<link>static          ]
-    [ run array_of_array.cpp ../../../test/build//boost_test_exec_monitor/<link>static                 ]
+    [ run array_of_array_of_class.cpp ../../../test/build//boost_test_exec_monitor/<link>static        ]
+    [ run array_of_array_of_int.cpp ../../../test/build//boost_test_exec_monitor/<link>static          ]
     [ run array_of_class.cpp ../../../test/build//boost_test_exec_monitor/<link>static                 ]
     [ run array_of_int.cpp ../../../test/build//boost_test_exec_monitor/<link>static                   ]
     [ run array_of_template.cpp ../../../test/build//boost_test_exec_monitor/<link>static              ]

Deleted: trunk/libs/utility/swap/test/array_of_array.cpp
==============================================================================
--- trunk/libs/utility/swap/test/array_of_array.cpp	2008-11-27 06:14:52 EST (Thu, 27 Nov 2008)
+++ (empty file)
@@ -1,67 +0,0 @@
-// Copyright (c) 2008 Joseph Gauterin, Niels Dekker
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/utility/swap.hpp>
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
-
-//Put test class in the global namespace
-#include "./swap_test_class.hpp"
-
-#include <algorithm> //for std::copy and std::equal
-#include <cstddef> //for std::size_t
-
-//Provide swap function in both the namespace of swap_test_class
-//(which is the global namespace), and the std namespace.
-//It's common to provide a swap function for a class in both
-//namespaces. Scott Meyers recommends doing so: Effective C++,
-//Third Edition, item 25, "Consider support for a non-throwing swap".
-void swap(swap_test_class& left, swap_test_class& right)
-{
-  left.swap(right);
-}
-
-namespace std
-{
-  template <>
-  void swap(swap_test_class& left, swap_test_class& right)
-  {
-    left.swap(right);
-  }
-}
-
-
-int test_main(int, char*[])
-{
-  const std::size_t first_dimension = 3;
-  const std::size_t second_dimension = 4;
-  const std::size_t number_of_elements = first_dimension * second_dimension;
-
-  swap_test_class array1[first_dimension][second_dimension];
-  swap_test_class array2[first_dimension][second_dimension];
-
-  swap_test_class* const ptr1 = array1[0];
-  swap_test_class* const ptr2 = array2[0];
-
-  for (std::size_t i = 0; i < number_of_elements; ++i)
-  {
-    ptr1[i].set_data( static_cast<int>(i) );
-    ptr2[i].set_data( static_cast<int>(i + number_of_elements) );
-  }
-
-  boost::swap(array1, array2);
-
-  for (std::size_t i = 0; i < number_of_elements; ++i)
-  {
-    BOOST_CHECK_EQUAL(ptr1[i].get_data(), static_cast<int>(i + number_of_elements) );
-    BOOST_CHECK_EQUAL(ptr2[i].get_data(), static_cast<int>(i) );
-  }
-
-  BOOST_CHECK_EQUAL(swap_test_class::swap_count(), number_of_elements);
-  BOOST_CHECK_EQUAL(swap_test_class::copy_count(), 0);
-
-  return 0;
-}

Copied: trunk/libs/utility/swap/test/array_of_array_of_class.cpp (from r49952, /trunk/libs/utility/swap/test/array_of_array.cpp)
==============================================================================
--- /trunk/libs/utility/swap/test/array_of_array.cpp	(original)
+++ trunk/libs/utility/swap/test/array_of_array_of_class.cpp	2008-11-27 06:14:52 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>

Added: trunk/libs/utility/swap/test/array_of_array_of_int.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/utility/swap/test/array_of_array_of_int.cpp	2008-11-27 06:14:52 EST (Thu, 27 Nov 2008)
@@ -0,0 +1,42 @@
+// Copyright (c) 2008 Joseph Gauterin, Niels Dekker
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (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 integers by means of boost::swap.
+
+#include <boost/utility/swap.hpp>
+#define BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>
+
+#include <algorithm> //for std::copy and std::equal
+#include <cstddef> //for std::size_t
+
+int test_main(int, char*[])
+{
+  const std::size_t first_dimension = 3;
+  const std::size_t second_dimension = 4;
+  const std::size_t number_of_elements = first_dimension * second_dimension;
+
+  int array1[first_dimension][second_dimension];
+  int array2[first_dimension][second_dimension];
+
+  int* const ptr1 = array1[0];
+  int* const ptr2 = array2[0];
+
+  for (std::size_t i = 0; i < number_of_elements; ++i)
+  {
+    ptr1[i] = static_cast<int>(i);
+    ptr2[i] = static_cast<int>(i + number_of_elements);
+  }
+
+  boost::swap(array1, array2);
+
+  for (std::size_t i = 0; i < number_of_elements; ++i)
+  {
+    BOOST_CHECK_EQUAL(ptr1[i], static_cast<int>(i + number_of_elements) );
+    BOOST_CHECK_EQUAL(ptr2[i], static_cast<int>(i) );
+  }
+  return 0;
+}