[Boost-cvs] CVS: boost/libs/thread/test test_lock_concept.cpp, 1.1.2.6, 1.1.2.7

[Anthony Williams]

Update of /cvsroot/boost/boost/libs/thread/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9941

Modified Files:
      Tag: thread_rewrite
        test_lock_concept.cpp 
Log Message:
Templated test_locked_after_lock_called


Index: test_lock_concept.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/thread/test/Attic/test_lock_concept.cpp,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- test_lock_concept.cpp       8 Jun 2006 14:48:46 -0000       1.1.2.6
+++ test_lock_concept.cpp       8 Jun 2006 14:53:02 -0000       1.1.2.7
@@ -60,14 +60,18 @@
     }
 };
 
-void test_mutex_scoped_lock_locked_after_lock_called()
+template<typename Mutex,typename Lock>
+struct test_locked_after_lock_called
 {
-    boost::mutex m;
-    boost::mutex::scoped_lock lock(m,false);
-    lock.lock();
-    BOOST_CHECK(lock);
-    BOOST_CHECK(lock.locked());
-}
+    void operator()() const
+    {
+        Mutex m;
+        Lock lock(m,false);
+        lock.lock();
+        BOOST_CHECK(lock);
+        BOOST_CHECK(lock.locked());
+    }
+};
 
 void test_mutex_scoped_lock_throws_if_lock_called_when_already_locked()
 {
@@ -95,7 +99,7 @@
     
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_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_locked_after_lock_called<boost::mutex,boost::mutex::scoped_lock>())));
     
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));
 
@@ -103,10 +107,12 @@
     
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_locked_after_lock_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>())));
+    
test->add(BOOST_TEST_CASE((test_locked_after_lock_called<boost::try_mutex,boost::try_mutex::scoped_try_lock>())));
 
     return test;
 }



_______________________________________________
Boost-cvs mailing list
Boost-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/boost-cvs