forked from boostorg/container_hash
Merge all hash changes from trunk.
[SVN r46343]
This commit is contained in:
+10
-10
@@ -1,5 +1,5 @@
|
||||
|
||||
// Copyright 2006-2007 Daniel James.
|
||||
// Copyright 2006-2008 Daniel James.
|
||||
// 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)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "./hash_fwd_test.hpp"
|
||||
|
||||
#include <boost/detail/lightweight_test.hpp>
|
||||
#include <boost/test/minimal.hpp>
|
||||
|
||||
#if defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
|
||||
|
||||
@@ -24,8 +24,8 @@ void fwd_test1()
|
||||
HASH_NAMESPACE::hash<test::test_type1<int> > hasher_test_int;
|
||||
HASH_NAMESPACE::hash<test::test_type1<std::string> > hasher_test_string;
|
||||
|
||||
BOOST_TEST(hasher_int(5) == hasher_test_int(x));
|
||||
BOOST_TEST(hasher_string("Test") == hasher_test_string(y));
|
||||
BOOST_CHECK(hasher_int(5) == hasher_test_int(x));
|
||||
BOOST_CHECK(hasher_string("Test") == hasher_test_string(y));
|
||||
}
|
||||
|
||||
void fwd_test2()
|
||||
@@ -44,8 +44,8 @@ void fwd_test2()
|
||||
HASH_NAMESPACE::hash<test::test_type2<int> > hasher_test_int;
|
||||
HASH_NAMESPACE::hash<test::test_type2<std::string> > hasher_test_string;
|
||||
|
||||
BOOST_TEST(seed1 == hasher_test_int(x));
|
||||
BOOST_TEST(seed2 == hasher_test_string(y));
|
||||
BOOST_CHECK(seed1 == hasher_test_int(x));
|
||||
BOOST_CHECK(seed2 == hasher_test_string(y));
|
||||
}
|
||||
|
||||
void fwd_test3()
|
||||
@@ -75,19 +75,19 @@ void fwd_test3()
|
||||
HASH_NAMESPACE::hash<test::test_type3<int> > hasher_test_int;
|
||||
HASH_NAMESPACE::hash<test::test_type3<std::string> > hasher_test_string;
|
||||
|
||||
BOOST_TEST(seed1 == hasher_test_int(x));
|
||||
BOOST_TEST(seed2 == hasher_test_string(y));
|
||||
BOOST_CHECK(seed1 == hasher_test_int(x));
|
||||
BOOST_CHECK(seed2 == hasher_test_string(y));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int main()
|
||||
int test_main(int, char**)
|
||||
{
|
||||
#ifdef TEST_EXTENSIONS
|
||||
fwd_test1();
|
||||
fwd_test2();
|
||||
fwd_test3();
|
||||
#endif
|
||||
return boost::report_errors();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user