diff options
Diffstat (limited to 'libs/thread/test/test_thread_id.cpp')
| -rw-r--r-- | libs/thread/test/test_thread_id.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/libs/thread/test/test_thread_id.cpp b/libs/thread/test/test_thread_id.cpp index 0a9725ec0..96b98016a 100644 --- a/libs/thread/test/test_thread_id.cpp +++ b/libs/thread/test/test_thread_id.cpp @@ -2,6 +2,9 @@ // // 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) + +#define BOOST_TEST_MODULE Boost.Threads: thread::get_id test suite + #include <boost/thread/thread_only.hpp> #include <boost/test/unit_test.hpp> #include <boost/bind.hpp> @@ -9,20 +12,20 @@ void do_nothing() {} -void test_thread_id_for_default_constructed_thread_is_default_constructed_id() +BOOST_AUTO_TEST_CASE(test_thread_id_for_default_constructed_thread_is_default_constructed_id) { boost::thread t; BOOST_CHECK(t.get_id()==boost::thread::id()); } -void test_thread_id_for_running_thread_is_not_default_constructed_id() +BOOST_AUTO_TEST_CASE(test_thread_id_for_running_thread_is_not_default_constructed_id) { boost::thread t(do_nothing); BOOST_CHECK(t.get_id()!=boost::thread::id()); t.join(); } -void test_different_threads_have_different_ids() +BOOST_AUTO_TEST_CASE(test_different_threads_have_different_ids) { boost::thread t(do_nothing); boost::thread t2(do_nothing); @@ -31,7 +34,7 @@ void test_different_threads_have_different_ids() t2.join(); } -void test_thread_ids_have_a_total_order() +BOOST_AUTO_TEST_CASE(test_thread_ids_have_a_total_order) { boost::thread t(do_nothing); boost::thread t2(do_nothing); @@ -126,7 +129,7 @@ void get_thread_id(boost::thread::id* id) *id=boost::this_thread::get_id(); } -void test_thread_id_of_running_thread_returned_by_this_thread_get_id() +BOOST_AUTO_TEST_CASE(test_thread_id_of_running_thread_returned_by_this_thread_get_id) { boost::thread::id id; boost::thread t(boost::bind(get_thread_id,&id)); @@ -134,18 +137,3 @@ void test_thread_id_of_running_thread_returned_by_this_thread_get_id() t.join(); BOOST_CHECK(id==t_id); } - -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_id_for_default_constructed_thread_is_default_constructed_id)); - test->add(BOOST_TEST_CASE(test_thread_id_for_running_thread_is_not_default_constructed_id)); - test->add(BOOST_TEST_CASE(test_different_threads_have_different_ids)); - test->add(BOOST_TEST_CASE(test_thread_ids_have_a_total_order)); - test->add(BOOST_TEST_CASE(test_thread_id_of_running_thread_returned_by_this_thread_get_id)); - return test; -} - - |