From 0264192f26c10308aad161983ea29568c96521a6 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 2 Nov 2007 17:47:41 +0000 Subject: [PATCH] Fixed bug #1589: tests does not compile for libboost 1.34.1. We now use #define BOOST_AUTO_TEST_MAIN #define BOOST_TEST_DYN_LINK #include .. BOOST_AUTO_TEST_CASE( mytest) { } . --- src/test_boost_threads.cpp | 7 ++++--- src/test_boost_time.cpp | 5 +++-- src/test_filter_auth_simple.cpp | 7 ++++--- src/test_filter_backend_test.cpp | 11 ++++++----- src/test_filter_bounce.cpp | 9 +++++---- src/test_filter_factory.cpp | 7 ++++--- src/test_filter_frontend_net.cpp | 11 ++++++----- src/test_filter_log.cpp | 7 ++++--- src/test_filter_multi.cpp | 7 ++++--- src/test_filter_query_rewrite.cpp | 9 +++++---- src/test_filter_record_transform.cpp | 9 +++++---- src/test_filter_sru_to_z3950.cpp | 9 +++++---- src/test_filter_virt_db.cpp | 9 +++++---- src/test_filter_z3950_client.cpp | 11 ++++++----- src/test_package1.cpp | 5 +++-- src/test_pipe.cpp | 5 +++-- src/test_router_flexml.cpp | 11 ++++++----- src/test_ses_map.cpp | 5 +++-- src/test_session1.cpp | 5 +++-- src/test_session2.cpp | 5 +++-- src/test_thread_pool_observer.cpp | 5 +++-- 21 files changed, 90 insertions(+), 69 deletions(-) diff --git a/src/test_boost_threads.cpp b/src/test_boost_threads.cpp index 68cdec3..545ded4 100644 --- a/src/test_boost_threads.cpp +++ b/src/test_boost_threads.cpp @@ -1,4 +1,4 @@ -/* $Id: test_boost_threads.cpp,v 1.10 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_boost_threads.cpp,v 1.11 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -24,6 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -57,7 +58,7 @@ public: #define USE_GROUP 1 -BOOST_AUTO_UNIT_TEST( thread_group ) +BOOST_AUTO_TEST_CASE( thread_group ) { try { @@ -79,7 +80,7 @@ BOOST_AUTO_UNIT_TEST( thread_group ) } -BOOST_AUTO_UNIT_TEST( thread_list ) +BOOST_AUTO_TEST_CASE( thread_list ) { try { diff --git a/src/test_boost_time.cpp b/src/test_boost_time.cpp index febe424..bbf275a 100644 --- a/src/test_boost_time.cpp +++ b/src/test_boost_time.cpp @@ -1,4 +1,4 @@ -/* $Id: test_boost_time.cpp,v 1.11 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_boost_time.cpp,v 1.12 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -25,13 +25,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "boost/date_time/posix_time/posix_time.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; -BOOST_AUTO_UNIT_TEST( testboosttime1 ) +BOOST_AUTO_TEST_CASE( testboosttime1 ) { // test session diff --git a/src/test_filter_auth_simple.cpp b/src/test_filter_auth_simple.cpp index 745d50f..3e99d60 100644 --- a/src/test_filter_auth_simple.cpp +++ b/src/test_filter_auth_simple.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_auth_simple.cpp,v 1.5 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_auth_simple.cpp,v 1.6 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -60,7 +61,7 @@ public: }; -BOOST_AUTO_UNIT_TEST( test_filter_auth_simple_1 ) +BOOST_AUTO_TEST_CASE( test_filter_auth_simple_1 ) { try { @@ -71,7 +72,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_auth_simple_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_auth_simple2 ) +BOOST_AUTO_TEST_CASE( test_filter_auth_simple2 ) { try { diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp index e3f8ae1..ffcfe66 100644 --- a/src/test_filter_backend_test.cpp +++ b/src/test_filter_backend_test.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_backend_test.cpp,v 1.11 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_backend_test.cpp,v 1.12 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -36,12 +36,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 ) +BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 ) { try { @@ -52,7 +53,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 ) +BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 ) { try { @@ -90,7 +91,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 ) +BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 ) { try { @@ -137,7 +138,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 ) +BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 ) { try { diff --git a/src/test_filter_bounce.cpp b/src/test_filter_bounce.cpp index 564504d..f2e63f8 100644 --- a/src/test_filter_bounce.cpp +++ b/src/test_filter_bounce.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_bounce.cpp,v 1.3 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_bounce.cpp,v 1.4 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -32,6 +32,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include @@ -124,7 +125,7 @@ void check_bounce_http(mp::RouterChain &router) } } -BOOST_AUTO_UNIT_TEST( test_filter_bounce_1 ) +BOOST_AUTO_TEST_CASE( test_filter_bounce_1 ) { try { @@ -135,7 +136,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_bounce_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_bounce_2 ) +BOOST_AUTO_TEST_CASE( test_filter_bounce_2 ) { try { @@ -179,7 +180,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_bounce_2 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_bounce_3 ) +BOOST_AUTO_TEST_CASE( test_filter_bounce_3 ) { try { diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp index c537eec..acb048b 100644 --- a/src/test_filter_factory.cpp +++ b/src/test_filter_factory.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_factory.cpp,v 1.16 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_factory.cpp,v 1.17 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -29,6 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -64,7 +65,7 @@ static mp::filter::Base* yfilter_creator(){ return new YFilter; } -BOOST_AUTO_UNIT_TEST( test_filter_factory_1 ) +BOOST_AUTO_TEST_CASE( test_filter_factory_1 ) { try { @@ -104,7 +105,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_1 ) #if HAVE_DL_SUPPORT #if HAVE_DLFCN_H -BOOST_AUTO_UNIT_TEST( test_filter_factory_2 ) +BOOST_AUTO_TEST_CASE( test_filter_factory_2 ) { try { mp::FactoryFilter ffactory; diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp index d8edc86..74f2c42 100644 --- a/src/test_filter_frontend_net.cpp +++ b/src/test_filter_frontend_net.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_frontend_net.cpp,v 1.18 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_frontend_net.cpp,v 1.19 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -18,7 +18,7 @@ along with Metaproxy; see the file LICENSE. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: test_filter_frontend_net.cpp,v 1.18 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_frontend_net.cpp,v 1.19 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. See the LICENSE file for details @@ -36,6 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -66,7 +67,7 @@ public: }; -BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 ) +BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 ) { try { @@ -79,7 +80,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 ) +BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 ) { try { @@ -118,7 +119,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_3 ) +BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 ) { try { diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp index b8def0b..4197ec5 100644 --- a/src/test_filter_log.cpp +++ b/src/test_filter_log.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_log.cpp,v 1.12 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_log.cpp,v 1.13 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -60,7 +61,7 @@ public: }; -BOOST_AUTO_UNIT_TEST( test_filter_log_1 ) +BOOST_AUTO_TEST_CASE( test_filter_log_1 ) { try { @@ -71,7 +72,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_log_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_log_2 ) +BOOST_AUTO_TEST_CASE( test_filter_log_2 ) { try { diff --git a/src/test_filter_multi.cpp b/src/test_filter_multi.cpp index 1d49303..8d8e1ac 100644 --- a/src/test_filter_multi.cpp +++ b/src/test_filter_multi.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_multi.cpp,v 1.5 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_multi.cpp,v 1.6 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -60,7 +61,7 @@ public: }; -BOOST_AUTO_UNIT_TEST( test_filter_multi_1 ) +BOOST_AUTO_TEST_CASE( test_filter_multi_1 ) { try { @@ -71,7 +72,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_multi_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_multi_2 ) +BOOST_AUTO_TEST_CASE( test_filter_multi_2 ) { try { diff --git a/src/test_filter_query_rewrite.cpp b/src/test_filter_query_rewrite.cpp index 80bc078..042a270 100644 --- a/src/test_filter_query_rewrite.cpp +++ b/src/test_filter_query_rewrite.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_query_rewrite.cpp,v 1.13 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_query_rewrite.cpp,v 1.14 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -156,7 +157,7 @@ void check_query_rewrite_search(mp::RouterChain &router, } -BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite_1 ) +BOOST_AUTO_TEST_CASE( test_filter_query_rewrite_1 ) { try { @@ -167,7 +168,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite2 ) +BOOST_AUTO_TEST_CASE( test_filter_query_rewrite2 ) { try { @@ -191,7 +192,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite2 ) } -BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 ) +BOOST_AUTO_TEST_CASE( test_filter_query_rewrite3 ) { diff --git a/src/test_filter_record_transform.cpp b/src/test_filter_record_transform.cpp index ec966c9..bcbab1d 100644 --- a/src/test_filter_record_transform.cpp +++ b/src/test_filter_record_transform.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_record_transform.cpp,v 1.6 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_record_transform.cpp,v 1.7 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA //#include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -43,7 +44,7 @@ namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( test_filter_record_transform_1 ) +BOOST_AUTO_TEST_CASE( test_filter_record_transform_1 ) { try { @@ -54,7 +55,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_record_transform_2 ) +BOOST_AUTO_TEST_CASE( test_filter_record_transform_2 ) { try { @@ -76,7 +77,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_2 ) } -BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 ) +BOOST_AUTO_TEST_CASE( test_filter_record_transform_3 ) { diff --git a/src/test_filter_sru_to_z3950.cpp b/src/test_filter_sru_to_z3950.cpp index 11878b5..01e065b 100644 --- a/src/test_filter_sru_to_z3950.cpp +++ b/src/test_filter_sru_to_z3950.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_sru_to_z3950.cpp,v 1.5 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_sru_to_z3950.cpp,v 1.6 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -40,7 +41,7 @@ using namespace mp::util; -BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 ) +BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_1 ) { try { @@ -51,7 +52,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_2 ) +BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_2 ) { try { @@ -73,7 +74,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_2 ) } -// BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_3 ) +// BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_3 ) // { diff --git a/src/test_filter_virt_db.cpp b/src/test_filter_virt_db.cpp index 8d5994d..bcc3fdc 100644 --- a/src/test_filter_virt_db.cpp +++ b/src/test_filter_virt_db.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_virt_db.cpp,v 1.17 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_virt_db.cpp,v 1.18 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -33,6 +33,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -42,7 +43,7 @@ using namespace boost::unit_test; namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( test_filter_virt_db_1 ) +BOOST_AUTO_TEST_CASE( test_filter_virt_db_1 ) { try { @@ -53,7 +54,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_virt_db_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_virt_db_2 ) +BOOST_AUTO_TEST_CASE( test_filter_virt_db_2 ) { try { @@ -205,7 +206,7 @@ static void present(mp::Package &pack, mp::Router &router, BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_presentResponse); } -BOOST_AUTO_UNIT_TEST( test_filter_virt_db_3 ) +BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 ) { try { diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp index 16395e6..b0a9c14 100644 --- a/src/test_filter_z3950_client.cpp +++ b/src/test_filter_z3950_client.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_z3950_client.cpp,v 1.13 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_filter_z3950_client.cpp,v 1.14 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -31,6 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -40,7 +41,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA using namespace boost::unit_test; namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 ) +BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 ) { try { @@ -51,7 +52,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_2 ) +BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 ) { try { @@ -92,7 +93,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_2 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_3 ) +BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 ) { try { @@ -133,7 +134,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_3 ) } } -BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_4 ) +BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 ) { try { diff --git a/src/test_package1.cpp b/src/test_package1.cpp index 687509e..a328b6f 100644 --- a/src/test_package1.cpp +++ b/src/test_package1.cpp @@ -1,4 +1,4 @@ -/* $Id: test_package1.cpp,v 1.8 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_package1.cpp,v 1.9 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -26,12 +26,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "package.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( test_package1_1 ) +BOOST_AUTO_TEST_CASE( test_package1_1 ) { try { mp::Package package1; diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp index 89c6d2a..94e2d8b 100644 --- a/src/test_pipe.cpp +++ b/src/test_pipe.cpp @@ -1,4 +1,4 @@ -/* $Id: test_pipe.cpp,v 1.11 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_pipe.cpp,v 1.12 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -42,6 +42,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "pipe.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -103,7 +104,7 @@ void Timer::socketNotify(int event) } } -BOOST_AUTO_UNIT_TEST( test_pipe_1 ) +BOOST_AUTO_TEST_CASE( test_pipe_1 ) { yazpp_1::SocketManager mySocketManager; diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp index 3cf58b6..b0daf77 100644 --- a/src/test_router_flexml.cpp +++ b/src/test_router_flexml.cpp @@ -1,4 +1,4 @@ -/* $Id: test_router_flexml.cpp,v 1.20 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_router_flexml.cpp,v 1.21 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -28,6 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "factory_static.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -48,7 +49,7 @@ static mp::filter::Base* filter_creator() } // Pass well-formed XML and valid configuration to it (implicit NS) -BOOST_AUTO_UNIT_TEST( test_router_flexml_1 ) +BOOST_AUTO_TEST_CASE( test_router_flexml_1 ) { try { @@ -96,7 +97,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 ) } // Pass non-wellformed XML -BOOST_AUTO_UNIT_TEST( test_router_flexml_2 ) +BOOST_AUTO_TEST_CASE( test_router_flexml_2 ) { bool got_error_as_expected = false; try @@ -125,7 +126,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 ) } // Pass well-formed XML with explicit NS -BOOST_AUTO_UNIT_TEST( test_router_flexml_3 ) +BOOST_AUTO_TEST_CASE( test_router_flexml_3 ) { try { @@ -162,7 +163,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 ) } // Pass well-formed XML but bad filter type -BOOST_AUTO_UNIT_TEST( test_router_flexml_4 ) +BOOST_AUTO_TEST_CASE( test_router_flexml_4 ) { bool got_error_as_expected = false; try diff --git a/src/test_ses_map.cpp b/src/test_ses_map.cpp index 4256fe2..f4935cd 100644 --- a/src/test_ses_map.cpp +++ b/src/test_ses_map.cpp @@ -1,4 +1,4 @@ -/* $Id: test_ses_map.cpp,v 1.6 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_ses_map.cpp,v 1.7 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -32,6 +32,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -66,7 +67,7 @@ namespace metaproxy_1 { } -BOOST_AUTO_UNIT_TEST( test_ses_map_1 ) +BOOST_AUTO_TEST_CASE( test_ses_map_1 ) { try { diff --git a/src/test_session1.cpp b/src/test_session1.cpp index eb576ad..bc68a53 100644 --- a/src/test_session1.cpp +++ b/src/test_session1.cpp @@ -1,4 +1,4 @@ -/* $Id: test_session1.cpp,v 1.13 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_session1.cpp,v 1.14 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -25,12 +25,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; namespace mp = metaproxy_1; -BOOST_AUTO_UNIT_TEST( testsession1 ) +BOOST_AUTO_TEST_CASE( testsession1 ) { // test session diff --git a/src/test_session2.cpp b/src/test_session2.cpp index 84b5fe5..99b8699 100644 --- a/src/test_session2.cpp +++ b/src/test_session2.cpp @@ -1,4 +1,4 @@ -/* $Id: test_session2.cpp,v 1.10 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_session2.cpp,v 1.11 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -29,6 +29,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -65,7 +66,7 @@ class Worker -BOOST_AUTO_UNIT_TEST( testsession2 ) +BOOST_AUTO_TEST_CASE( testsession2 ) { // test session diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp index 10ea2ad..d84e9d0 100644 --- a/src/test_thread_pool_observer.cpp +++ b/src/test_thread_pool_observer.cpp @@ -1,4 +1,4 @@ -/* $Id: test_thread_pool_observer.cpp,v 1.14 2007-05-09 21:23:09 adam Exp $ +/* $Id: test_thread_pool_observer.cpp,v 1.15 2007-11-02 17:47:41 adam Exp $ Copyright (c) 2005-2007, Index Data. This file is part of Metaproxy. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "thread_pool_observer.hpp" #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include using namespace boost::unit_test; @@ -107,7 +108,7 @@ void My_Timer_Thread::socketNotify(int event) #endif } -BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) +BOOST_AUTO_TEST_CASE( thread_pool_observer1 ) { SocketManager mySocketManager; -- 1.7.10.4