Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80154 - trunk/libs/functional/hash/test
From: dnljms_at_[hidden]
Date: 2012-08-23 08:18:19


Author: danieljames
Date: 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
New Revision: 80154
URL: http://svn.boost.org/trac/boost/changeset/80154

Log:
Hash: Clean up some unit tests.

- Remove some unnecessary headers.
- Try to fix warning in enum tests.
- Compile tests + hash namespace in enum tests.

Text files modified:
   trunk/libs/functional/hash/test/hash_enum_test.cpp | 22 +++++++++++++---------
   trunk/libs/functional/hash/test/hash_function_pointer_test.cpp | 4 ----
   trunk/libs/functional/hash/test/hash_number_test.cpp | 2 --
   trunk/libs/functional/hash/test/hash_pointer_test.cpp | 4 ----
   trunk/libs/functional/hash/test/hash_range_test.cpp | 3 ---
   trunk/libs/functional/hash/test/hash_string_test.cpp | 4 ----
   6 files changed, 13 insertions(+), 26 deletions(-)

Modified: trunk/libs/functional/hash/test/hash_enum_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_enum_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_enum_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -12,13 +12,11 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
+#include "./compile_time.hpp"
 
 namespace test {
         enum enum_override { enum_override1, enum_override2 };
- std::size_t hash_value(enum_override x) { return -896532; }
+ std::size_t hash_value(enum_override) { return 896532; }
 
         enum enum1 { enum1a };
         enum enum2 { enum2a, enum2b };
@@ -27,10 +25,16 @@
 }
 
 int main() {
- boost::hash<test::enum1> hash1;
- boost::hash<test::enum2> hash2;
- boost::hash<test::enum3> hash3;
- boost::hash<test::enum4> hash4;
+ compile_time_tests((test::enum1*) 0);
+ compile_time_tests((test::enum2*) 0);
+ compile_time_tests((test::enum3*) 0);
+ compile_time_tests((test::enum4*) 0);
+ compile_time_tests((test::enum_override*) 0);
+
+ HASH_NAMESPACE::hash<test::enum1> hash1;
+ HASH_NAMESPACE::hash<test::enum2> hash2;
+ HASH_NAMESPACE::hash<test::enum3> hash3;
+ HASH_NAMESPACE::hash<test::enum4> hash4;
         
         BOOST_TEST(hash1(test::enum1a) == hash1(test::enum1a));
 
@@ -46,7 +50,7 @@
         BOOST_TEST(hash4(test::enum4a) != hash4(test::enum4b));
         BOOST_TEST(hash4(test::enum4b) == hash4(test::enum4b));
 
- boost::hash<test::enum_override> hash_override;
+ HASH_NAMESPACE::hash<test::enum_override> hash_override;
 
         BOOST_TEST(hash_override(test::enum_override1) ==
                 hash_override(test::enum_override1));

Modified: trunk/libs/functional/hash/test/hash_function_pointer_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_function_pointer_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_function_pointer_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -12,10 +12,6 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void void_func1() { static int x = 1; ++x; }

Modified: trunk/libs/functional/hash/test/hash_number_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_number_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_number_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -16,8 +16,6 @@
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/functional/hash/detail/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 
 #include "./compile_time.hpp"
 

Modified: trunk/libs/functional/hash/test/hash_pointer_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_pointer_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_pointer_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
-
 #include "./compile_time.hpp"
 
 void pointer_tests()

Modified: trunk/libs/functional/hash/test/hash_range_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_range_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_range_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -18,10 +18,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
 #include <boost/limits.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <vector>
 
 void hash_range_tests()

Modified: trunk/libs/functional/hash/test/hash_string_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_string_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_string_test.cpp 2012-08-23 08:18:18 EDT (Thu, 23 Aug 2012)
@@ -12,11 +12,7 @@
 #endif
 
 #include <boost/detail/lightweight_test.hpp>
-
-#include <boost/mpl/assert.hpp>
-#include <boost/type_traits/is_base_and_derived.hpp>
 #include <string>
-
 #include "./compile_time.hpp"
 
 void string_tests()


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk