diff options
Diffstat (limited to 'libs/thread/test/test_shared_mutex_timed_locks.cpp')
| -rw-r--r-- | libs/thread/test/test_shared_mutex_timed_locks.cpp | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/libs/thread/test/test_shared_mutex_timed_locks.cpp b/libs/thread/test/test_shared_mutex_timed_locks.cpp index 5eea1a1ac..c29c4260c 100644 --- a/libs/thread/test/test_shared_mutex_timed_locks.cpp +++ b/libs/thread/test/test_shared_mutex_timed_locks.cpp @@ -4,6 +4,7 @@ // http://www.boost.org/LICENSE_1_0.txt) #define BOOST_THREAD_VERSION 2 +#define BOOST_TEST_MODULE Boost.Threads: shared_mutex_timed_locks test suite #include <boost/test/unit_test.hpp> #include <boost/thread/thread_only.hpp> @@ -18,7 +19,7 @@ } -void test_timed_lock_shared_times_out_if_write_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_shared_times_out_if_write_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -54,7 +55,7 @@ void test_timed_lock_shared_times_out_if_write_lock_held() writer.join(); } -void test_timed_lock_shared_succeeds_if_no_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_shared_succeeds_if_no_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -83,7 +84,7 @@ void test_timed_lock_shared_succeeds_if_no_lock_held() } -void test_timed_lock_shared_succeeds_if_read_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_shared_succeeds_if_read_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -119,7 +120,7 @@ void test_timed_lock_shared_succeeds_if_read_lock_held() reader.join(); } -void test_timed_lock_times_out_if_write_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_if_write_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -155,7 +156,7 @@ void test_timed_lock_times_out_if_write_lock_held() writer.join(); } -void test_timed_lock_succeeds_if_no_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_succeeds_if_no_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -184,7 +185,7 @@ void test_timed_lock_succeeds_if_no_lock_held() } -void test_timed_lock_times_out_if_read_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_if_read_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -220,7 +221,7 @@ void test_timed_lock_times_out_if_read_lock_held() reader.join(); } -void test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held() +BOOST_AUTO_TEST_CASE(test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held) { boost::shared_mutex rw_mutex; boost::mutex finish_mutex; @@ -252,21 +253,3 @@ void test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held() reader.join(); } - -boost::unit_test::test_suite* init_unit_test_suite(int, char*[]) -{ - boost::unit_test::test_suite* test = - BOOST_TEST_SUITE("Boost.Threads: shared_mutex test suite"); - - test->add(BOOST_TEST_CASE(&test_timed_lock_shared_times_out_if_write_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_shared_succeeds_if_no_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_shared_succeeds_if_read_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_if_write_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_if_read_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_succeeds_if_no_lock_held)); - test->add(BOOST_TEST_CASE(&test_timed_lock_times_out_but_read_lock_succeeds_if_read_lock_held)); - - return test; -} - - |