diff options
Diffstat (limited to 'libs/thread/test/test_move_function.cpp')
| -rw-r--r-- | libs/thread/test/test_move_function.cpp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/libs/thread/test/test_move_function.cpp b/libs/thread/test/test_move_function.cpp index 6eb145231..1fef7a3bb 100644 --- a/libs/thread/test/test_move_function.cpp +++ b/libs/thread/test/test_move_function.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #define BOOST_THREAD_VERSION 2 +#define BOOST_TEST_MODULE Boost.Threads: move function test suite #include <boost/thread/thread_only.hpp> #include <boost/test/unit_test.hpp> @@ -13,7 +14,7 @@ void do_nothing() {} -void test_thread_move_from_lvalue_on_construction() +BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_construction) { boost::thread src(do_nothing); boost::thread::id src_id=src.get_id(); @@ -24,7 +25,7 @@ void test_thread_move_from_lvalue_on_construction() dest.join(); } -void test_thread_move_from_lvalue_on_assignment() +BOOST_AUTO_TEST_CASE(test_thread_move_from_lvalue_on_assignment) { boost::thread src(do_nothing); boost::thread::id src_id=src.get_id(); @@ -41,14 +42,14 @@ boost::thread start_thread() return boost::thread(do_nothing); } -void test_thread_move_from_rvalue_on_construction() +BOOST_AUTO_TEST_CASE(test_thread_move_from_rvalue_on_construction) { boost::thread x(start_thread()); BOOST_CHECK(x.get_id()!=boost::thread::id()); x.join(); } -void test_thread_move_from_rvalue_using_explicit_move() +BOOST_AUTO_TEST_CASE(test_thread_move_from_rvalue_using_explicit_move) { //boost::thread x(boost::move(start_thread())); boost::thread x=start_thread(); @@ -56,7 +57,7 @@ void test_thread_move_from_rvalue_using_explicit_move() x.join(); } -void test_unique_lock_move_from_lvalue_on_construction() +BOOST_AUTO_TEST_CASE(test_unique_lock_move_from_lvalue_on_construction) { boost::mutex m; boost::unique_lock<boost::mutex> l(m); @@ -76,7 +77,7 @@ boost::unique_lock<boost::mutex> get_lock(boost::mutex& m) } -void test_unique_lock_move_from_rvalue_on_construction() +BOOST_AUTO_TEST_CASE(test_unique_lock_move_from_rvalue_on_construction) { boost::mutex m; boost::unique_lock<boost::mutex> l(get_lock(m)); @@ -117,7 +118,7 @@ namespace boost BOOST_THREAD_DCL_MOVABLE(user_test_ns::nc) } -void test_move_for_user_defined_type_unaffected() +BOOST_AUTO_TEST_CASE(test_move_for_user_defined_type_unaffected) { user_test_ns::nc src; #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES @@ -128,19 +129,6 @@ void test_move_for_user_defined_type_unaffected() BOOST_CHECK(user_test_ns::move_called); } -boost::unit_test::test_suite* init_unit_test_suite(int, char*[]) -{ - boost::unit_test::test_suite* test = - BOOST_TEST_SUITE("Boost.Threads: thread move test suite"); - - test->add(BOOST_TEST_CASE(test_thread_move_from_lvalue_on_construction)); - test->add(BOOST_TEST_CASE(test_thread_move_from_rvalue_on_construction)); - test->add(BOOST_TEST_CASE(test_thread_move_from_rvalue_using_explicit_move)); - test->add(BOOST_TEST_CASE(test_thread_move_from_lvalue_on_assignment)); - test->add(BOOST_TEST_CASE(test_unique_lock_move_from_lvalue_on_construction)); - test->add(BOOST_TEST_CASE(test_unique_lock_move_from_rvalue_on_construction)); - test->add(BOOST_TEST_CASE(test_move_for_user_defined_type_unaffected)); - return test; -} + |