|
From: Frank M. H. <fm...@us...> - 2007-02-28 20:15:48
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9125 Modified Files: dead_slot_test.cpp deletion_test.cpp ordering_test.cpp signal_n_test.cpp signal_test.cpp Log Message: Altered tests to account for changes from signals to thread_safe_signals. Index: signal_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test/signal_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- signal_test.cpp 28 Feb 2007 19:16:04 -0000 1.1 +++ signal_test.cpp 28 Feb 2007 19:44:09 -0000 1.2 @@ -8,7 +8,7 @@ // For more information, see http://www.boost.org #include <boost/test/minimal.hpp> -#include <boost/signal.hpp> +#include <boost/thread_safe_signal.hpp> #include <functional> #include <iostream> @@ -132,22 +132,22 @@ static void test_signal_signal_connect() { - boost::signal<int (int value), max_or_default<int> > s1; + typedef boost::signal<int (int value), max_or_default<int> > signal_type; + signal_type s1; s1.connect(std::negate<int>()); BOOST_CHECK(s1(3) == -3); { - boost::signal<int (int value), max_or_default<int> > s2; - s1.connect(s2); + signal_type s2; + s1.connect(signal_type::slot_type(s2).track(s2)); s2.connect(std::bind1st(std::multiplies<int>(), 2)); s2.connect(std::bind1st(std::multiplies<int>(), -3)); BOOST_CHECK(s2(-3) == 9); BOOST_CHECK(s1(3) == 6); } // s2 goes out of scope and disconnects - BOOST_CHECK(s1(3) == -3); } Index: signal_n_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test/signal_n_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- signal_n_test.cpp 28 Feb 2007 19:16:04 -0000 1.1 +++ signal_n_test.cpp 28 Feb 2007 19:44:09 -0000 1.2 @@ -8,7 +8,7 @@ // For more information, see http://www.boost.org #include <boost/test/minimal.hpp> -#include <boost/signal.hpp> +#include <boost/thread_safe_signal.hpp> #include <functional> template<typename T> @@ -134,15 +134,16 @@ static void test_signal_signal_connect() { - boost::signal1<int, int, max_or_default<int> > s1; + typedef boost::signal1<int, int, max_or_default<int> > signal_type; + signal_type s1; s1.connect(std::negate<int>()); BOOST_CHECK(s1(3) == -3); { - boost::signal1<int, int, max_or_default<int> > s2; - s1.connect(s2); + signal_type s2; + s1.connect(signal_type::slot_type(s2).track(s2)); s2.connect(std::bind1st(std::multiplies<int>(), 2)); s2.connect(std::bind1st(std::multiplies<int>(), -3)); Index: ordering_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test/ordering_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ordering_test.cpp 28 Feb 2007 19:16:04 -0000 1.1 +++ ordering_test.cpp 28 Feb 2007 19:44:09 -0000 1.2 @@ -8,7 +8,7 @@ // For more information, see http://www.boost.org #include <boost/test/minimal.hpp> -#include <boost/signal.hpp> +#include <boost/thread_safe_signal.hpp> #include <iostream> #include <vector> #include <algorithm> Index: deletion_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test/deletion_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- deletion_test.cpp 28 Feb 2007 19:16:04 -0000 1.1 +++ deletion_test.cpp 28 Feb 2007 19:44:09 -0000 1.2 @@ -8,7 +8,7 @@ // For more information, see http://www.boost.org #include <boost/test/minimal.hpp> -#include <boost/signal.hpp> +#include <boost/thread_safe_signal.hpp> #include <iostream> #include <string> Index: dead_slot_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/thread_safe_signals/test/dead_slot_test.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dead_slot_test.cpp 28 Feb 2007 19:16:04 -0000 1.1 +++ dead_slot_test.cpp 28 Feb 2007 19:44:09 -0000 1.2 @@ -7,13 +7,14 @@ // For more information, see http://www.boost.org +#include <boost/shared_ptr.hpp> #include <boost/test/minimal.hpp> #include <boost/thread_safe_signal.hpp> #include <boost/bind.hpp> typedef boost::signal1<int, int> sig_type; -class with_constant : public boost::BOOST_SIGNALS_NAMESPACE::trackable { +class with_constant { public: with_constant(int c) : constant(c) {} @@ -23,12 +24,12 @@ int constant; }; -void do_delayed_connect(with_constant* wc, +void do_delayed_connect(boost::shared_ptr<with_constant> &wc, sig_type& sig, sig_type::slot_type slot) { // Should invalidate the slot, so that we cannot connect to it - delete wc; + wc.reset(); boost::BOOST_SIGNALS_NAMESPACE::connection c = sig.connect(slot); BOOST_CHECK(!c.connected()); @@ -37,9 +38,9 @@ int test_main(int, char*[]) { sig_type s1; - with_constant* wc1 = new with_constant(7); + boost::shared_ptr<with_constant> wc1(new with_constant(7)); - do_delayed_connect(wc1, s1, boost::bind(&with_constant::add, wc1, _1)); + do_delayed_connect(wc1, s1, sig_type::slot_type(&with_constant::add, wc1.get(), _1).track(wc1)); return 0; } |