Update of /cvsroot/boost/boost/libs/thread/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8091
Modified Files:
Tag: thread_rewrite
test_lock_concept.cpp
Log Message:
Templated more tests
Index: test_lock_concept.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/thread/test/Attic/test_lock_concept.cpp,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- test_lock_concept.cpp 8 Jun 2006 14:42:41 -0000 1.1.2.5
+++ test_lock_concept.cpp 8 Jun 2006 14:48:46 -0000 1.1.2.6
@@ -33,23 +33,32 @@
};
-void test_mutex_scoped_lock_initially_unlocked_with_bool_parameter_false()
+template<typename Mutex,typename Lock>
+struct test_initially_unlocked_with_bool_parameter_false
{
- boost::mutex m;
- boost::mutex::scoped_lock lock(m,false);
-
- BOOST_CHECK(!lock);
- BOOST_CHECK(!lock.locked());
-}
+ void operator()() const
+ {
+ Mutex m;
+ Lock lock(m,false);
+
+ BOOST_CHECK(!lock);
+ BOOST_CHECK(!lock.locked());
+ }
+};
-void test_mutex_scoped_lock_unlocked_after_unlock_called()
+
+template<typename Mutex,typename Lock>
+struct test_unlocked_after_unlock_called
{
- boost::mutex m;
- boost::mutex::scoped_lock lock(m,true);
- lock.unlock();
- BOOST_CHECK(!lock);
- BOOST_CHECK(!lock.locked());
-}
+ void operator()() const
+ {
+ Mutex m;
+ Lock lock(m,true);
+ lock.unlock();
+ BOOST_CHECK(!lock);
+ BOOST_CHECK(!lock.locked());
+ }
+};
void test_mutex_scoped_lock_locked_after_lock_called()
{
@@ -83,15 +92,21 @@
BOOST_TEST_SUITE("Boost.Threads: lock concept test suite");
test->add(BOOST_TEST_CASE((test_initially_locked<boost::mutex,boost::mutex::scoped_lock>())));
-
test->add(BOOST_TEST_CASE((test_initially_locked<boost::try_mutex,boost::try_mutex::scoped_lock>())));
test->add(BOOST_TEST_CASE((test_initially_locked_with_bool_parameter_true<boost::mutex,boost::mutex::scoped_lock>())));
-
test->add(BOOST_TEST_CASE((test_initially_locked_with_bool_parameter_true<boost::try_mutex,boost::try_mutex::scoped_lock>())));
-
test->add(BOOST_TEST_CASE((test_initially_locked_with_bool_parameter_true<boost::try_mutex,boost::try_mutex::scoped_try_lock>())));
-
test->add(BOOST_TEST_CASE(&test_mutex_scoped_lock_initially_unlocked_with_bool_parameter_false));
-
test->add(BOOST_TEST_CASE(&test_mutex_scoped_lock_unlocked_after_unlock_called));
+
test->add(BOOST_TEST_CASE((test_initially_unlocked_with_bool_parameter_false<boost::mutex,boost::mutex::scoped_lock>())));
+
test->add(BOOST_TEST_CASE((test_unlocked_after_unlock_called<boost::mutex,boost::mutex::scoped_lock>())));
test->add(BOOST_TEST_CASE(&test_mutex_scoped_lock_locked_after_lock_called));
test->add(BOOST_TEST_CASE(&test_mutex_scoped_lock_throws_if_lock_called_when_already_locked));
test->add(BOOST_TEST_CASE(&test_mutex_scoped_lock_throws_if_unlock_called_when_already_unlocked));
+
test->add(BOOST_TEST_CASE((test_initially_locked<boost::try_mutex,boost::try_mutex::scoped_lock>())));
+
test->add(BOOST_TEST_CASE((test_initially_locked_with_bool_parameter_true<boost::try_mutex,boost::try_mutex::scoped_lock>())));
+
test->add(BOOST_TEST_CASE((test_initially_unlocked_with_bool_parameter_false<boost::try_mutex,boost::try_mutex::scoped_lock>())));
+
test->add(BOOST_TEST_CASE((test_unlocked_after_unlock_called<boost::try_mutex,boost::try_mutex::scoped_lock>())));
+
+
test->add(BOOST_TEST_CASE((test_initially_locked_with_bool_parameter_true<boost::try_mutex,boost::try_mutex::scoped_try_lock>())));
+
test->add(BOOST_TEST_CASE((test_initially_unlocked_with_bool_parameter_false<boost::try_mutex,boost::try_mutex::scoped_try_lock>())));
+
test->add(BOOST_TEST_CASE((test_unlocked_after_unlock_called<boost::try_mutex,boost::try_mutex::scoped_try_lock>())));
+
return test;
}
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
