Revert conversion from lightweight test to Boost.Test.

[SVN r47545]
This commit is contained in:
Daniel James
2008-07-18 12:31:18 +00:00
parent 62226713a2
commit 4bb4957dc4
32 changed files with 228 additions and 229 deletions
+31 -31
View File
@@ -12,7 +12,7 @@
#endif
#include <iostream>
#include <boost/test/minimal.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/limits.hpp>
@@ -39,27 +39,27 @@ void numeric_test(T*)
HASH_NAMESPACE::hash<T> x2;
T v1 = (T) -5;
BOOST_CHECK(x1(v1) == x2(v1));
BOOST_CHECK(x1(T(-5)) == x2(T(-5)));
BOOST_CHECK(x1(T(0)) == x2(T(0)));
BOOST_CHECK(x1(T(10)) == x2(T(10)));
BOOST_CHECK(x1(T(25)) == x2(T(25)));
BOOST_CHECK(x1(T(5) - T(5)) == x2(T(0)));
BOOST_CHECK(x1(T(6) + T(4)) == x2(T(10)));
BOOST_TEST(x1(v1) == x2(v1));
BOOST_TEST(x1(T(-5)) == x2(T(-5)));
BOOST_TEST(x1(T(0)) == x2(T(0)));
BOOST_TEST(x1(T(10)) == x2(T(10)));
BOOST_TEST(x1(T(25)) == x2(T(25)));
BOOST_TEST(x1(T(5) - T(5)) == x2(T(0)));
BOOST_TEST(x1(T(6) + T(4)) == x2(T(10)));
#if defined(TEST_EXTENSIONS)
BOOST_CHECK(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
BOOST_CHECK(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
BOOST_CHECK(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
BOOST_CHECK(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
BOOST_TEST(x1(T(-5)) == HASH_NAMESPACE::hash_value(T(-5)));
BOOST_TEST(x1(T(0)) == HASH_NAMESPACE::hash_value(T(0)));
BOOST_TEST(x1(T(10)) == HASH_NAMESPACE::hash_value(T(10)));
BOOST_TEST(x1(T(25)) == HASH_NAMESPACE::hash_value(T(25)));
if (limits::is_integer)
{
if(limits::is_signed || limits::digits <= boost::hash_detail::limits<std::size_t>::digits)
BOOST_CHECK(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
BOOST_CHECK(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
BOOST_CHECK(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
BOOST_CHECK(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
}
#endif
}
@@ -77,18 +77,18 @@ void limits_test(T*)
T min_value = (limits::min)();
T max_value = (limits::max)();
BOOST_CHECK(x1(min_value) == x2((limits::min)()));
BOOST_CHECK(x1(max_value) == x2((limits::max)()));
BOOST_TEST(x1(min_value) == x2((limits::min)()));
BOOST_TEST(x1(max_value) == x2((limits::max)()));
#if defined(TEST_EXTENSIONS)
BOOST_CHECK(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
BOOST_CHECK(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
BOOST_TEST(x1(min_value) == HASH_NAMESPACE::hash_value(min_value));
BOOST_TEST(x1(max_value) == HASH_NAMESPACE::hash_value(max_value));
if (limits::is_integer)
{
BOOST_CHECK(HASH_NAMESPACE::hash_value(min_value)
BOOST_TEST(HASH_NAMESPACE::hash_value(min_value)
== std::size_t(min_value));
BOOST_CHECK(HASH_NAMESPACE::hash_value(max_value)
BOOST_TEST(HASH_NAMESPACE::hash_value(max_value)
== std::size_t(max_value));
}
#endif
@@ -106,11 +106,11 @@ void poor_quality_tests(T*)
// A hash function can legally fail these tests, but it'll not be a good
// sign.
if(T(1) != T(-1))
BOOST_CHECK(x1(T(1)) != x2(T(-1)));
BOOST_TEST(x1(T(1)) != x2(T(-1)));
if(T(1) != T(2))
BOOST_CHECK(x1(T(1)) != x2(T(2)));
BOOST_TEST(x1(T(1)) != x2(T(2)));
if((limits::max)() != (limits::max)() - 1)
BOOST_CHECK(x1((limits::max)()) != x2((limits::max)() - 1));
BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
}
void bool_test()
@@ -118,10 +118,10 @@ void bool_test()
HASH_NAMESPACE::hash<bool> x1;
HASH_NAMESPACE::hash<bool> x2;
BOOST_CHECK(x1(true) == x2(true));
BOOST_CHECK(x1(false) == x2(false));
BOOST_CHECK(x1(true) != x2(false));
BOOST_CHECK(x1(false) != x2(true));
BOOST_TEST(x1(true) == x2(true));
BOOST_TEST(x1(false) == x2(false));
BOOST_TEST(x1(true) != x2(false));
BOOST_TEST(x1(false) != x2(true));
}
#define NUMERIC_TEST(type, name) \
@@ -134,7 +134,7 @@ void bool_test()
numeric_test((type*) 0); \
poor_quality_tests((type*) 0);
int test_main(int, char**)
int main()
{
NUMERIC_TEST(char, char)
NUMERIC_TEST(signed char, schar)
@@ -159,7 +159,7 @@ int test_main(int, char**)
bool_test();
return 0;
return boost::report_errors();
}
#if defined(BOOST_MSVC)