From 77dee8966dd1304a0fb8540c3fc68d02dc6ce84a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 2 Dec 2005 12:21:07 +0000 Subject: [PATCH] In tests use BOOST_AUTO_UNIT_TEST instead of BOOST_AUTO_TEST_CASE so what the system works with 1.32 an 1.33 of the Boost libs. This should make things compile fine on Debian Sarge - currently stable. Remove dead test ex_libxml2_conf. --- configure.ac | 2 +- src/.cvsignore | 1 - src/Makefile.am | 5 +- src/ex_libxml2_conf.cpp | 364 ------------------------------------- src/test_boost_threads.cpp | 6 +- src/test_boost_time.cpp | 4 +- src/test_filter1.cpp | 4 +- src/test_filter2.cpp | 6 +- src/test_filter_backend_test.cpp | 10 +- src/test_filter_factory.cpp | 4 +- src/test_filter_frontend_net.cpp | 8 +- src/test_filter_log.cpp | 6 +- src/test_filter_virt_db.cpp | 8 +- src/test_filter_z3950_client.cpp | 10 +- src/test_package1.cpp | 4 +- src/test_pipe.cpp | 4 +- src/test_router_flexml.cpp | 4 +- src/test_ses_map.cpp | 4 +- src/test_session1.cpp | 4 +- src/test_session2.cpp | 4 +- src/test_thread_pool_observer.cpp | 6 +- 21 files changed, 51 insertions(+), 417 deletions(-) delete mode 100644 src/ex_libxml2_conf.cpp diff --git a/configure.ac b/configure.ac index fff4af9..01a82aa 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ LIBS="$LIBS -lboost_unit_test_framework" AC_TRY_LINK([ #define BOOST_AUTO_TEST_MAIN #include -BOOST_AUTO_TEST_CASE( test ) +BOOST_AUTO_UNIT_TEST( test ) { BOOST_CHECK(true); } diff --git a/src/.cvsignore b/src/.cvsignore index b77b825..06637f8 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -10,7 +10,6 @@ Makefile Makefile.in config.hpp.in ex_filter_frontend_net -ex_libxml2_conf ex_router_flexml test_boost_threads test_boost_time diff --git a/src/Makefile.am b/src/Makefile.am index b05f05b..d3924c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.36 2005-11-14 23:35:22 adam Exp $ +## $Id: Makefile.am,v 1.37 2005-12-02 12:21:07 adam Exp $ MAINTAINERCLEANFILES = Makefile.in config.in config.hpp @@ -33,10 +33,9 @@ libyp2_la_SOURCES = \ LDADD= libyp2.la $(YAZPPLALIB) $(XSLT_LIBS) bin_PROGRAMS = -noinst_PROGRAMS = ex_filter_frontend_net ex_libxml2_conf ex_router_flexml +noinst_PROGRAMS = ex_filter_frontend_net ex_router_flexml ex_filter_frontend_net_SOURCES = ex_filter_frontend_net.cpp -ex_libxml2_conf_SOURCES = ex_libxml2_conf.cpp ex_router_flexml_SOURCES = ex_router_flexml.cpp # Rules for test programs.. diff --git a/src/ex_libxml2_conf.cpp b/src/ex_libxml2_conf.cpp deleted file mode 100644 index 7ec4ba4..0000000 --- a/src/ex_libxml2_conf.cpp +++ /dev/null @@ -1,364 +0,0 @@ -/* $Id: ex_libxml2_conf.cpp,v 1.4 2005-10-26 10:20:15 marc Exp $ - Copyright (c) 2005, Index Data. - -%LICENSE% - */ - -#include -#include - -#include -namespace po = boost::program_options; - -#include - -class Configuration -{ -public: - Configuration(int argc, char **argv) - { - m_config = ""; - m_duration = 0; - m_xinclude = false; - m_xml_conf_doc = 0; - - parse_command_line(argc, argv); - parse_xml_config(); - } - -public: - std::string config() - { - return m_config; - } - int duration() - { - return m_duration; - } - - -private: - std::string m_config; - int m_duration; - bool m_xinclude; - xmlDoc * m_xml_conf_doc; - - - void parse_command_line(int argc, char **argv) - { - po::options_description generic("Generic options"); - generic.add_options() - ("help,h", "produce help message") - ("version,v", "version number") - ("xinclude,x", "allow Xinclude on XML config files") - ; - - po::options_description config("Configuration options"); - config.add_options() - ("config,c", po::value(&m_config)->default_value("../etc/config1.xml"), - "config XML file path (string)") - ("duration,d", po::value(&m_duration)->default_value(0), - "number of seconds for server to exist (int)") - //("commands", po::value< std::vector >(), - // "listener ports (string)") - ; - - //po::positional_options_description p; - // p.add("port", -1); - - po::options_description cmdline_options; - cmdline_options.add(generic).add(config); - po::variables_map vm; - - try - { - //po::store(po::command_line_parser(argc, argv). - // options(cmdline_options).positional(p).run(), vm); - //po::store(po::command_line_parser(argc, argv). - // options(cmdline_options).run(), vm); - po::store(po::parse_command_line(argc, argv, cmdline_options), vm); - po::notify(vm); - } - catch ( po::invalid_command_line_syntax &e) { - std::cerr << "ex_libxml2_conf error: " << e.what() << std::endl; - std::cerr << generic << config << std::endl; - std::exit(1); - } - catch ( po::invalid_option_value &e) { - //std::cerr << "ex_libxml2_conf error: " << e.what() << std::endl; - std::cerr << "invalid option value" << std::endl; - std::cerr << generic << config << std::endl; - std::exit(1); - } - catch ( po::unknown_option &e) { - std::cerr << "ex_libxml2_conf error: " << e.what() << std::endl; - std::cerr << generic << config << std::endl; - std::exit(1); - } - - std::cout << "ex_libxml2_conf "; - - if (vm.count("help")) { - std::cout << "--help" << std::endl; - std::cout << generic << config << std::endl; - std::exit(0); - } - - if (vm.count("version")) { - std::cout << "--version" << std::endl; - std::exit(0); - } - - if (vm.count("xinclude")) { - std::cout << "--xinclude" << std::endl; - m_xinclude = true; - } - - if (vm.count("duration")) { - std::cout << "--duration " - << vm["duration"].as() << " "; - } - if (vm.count("config")) { - std::cout << "--config " - << vm["config"].as() << " "; - } - - std::cout << std::endl; - - //if (vm.count("port")) - //{ - // std::vector ports = - // vm["port"].as< std::vector >(); - // - // for (size_t i = 0; iSetParserProp(libxml2.PARSER_SUBST_ENTITIES,1); - int ret; - reader = xmlReaderForFile(m_config.c_str(), NULL, 0); - - if (reader == NULL) { - std::cerr << "failed to open XML config file " - << m_config << std::endl; - std::exit(1); - } - - - // root element processing - xml_progress_deep_to_element(reader); - if (std::string("yp2") != (const char*)xmlTextReaderConstName(reader)) - xml_error(reader, "root element must be named "); - - std::cout << "<" << xmlTextReaderConstName(reader); - - //if (xmlTextReaderHasAttributes(reader)) - //if ((!xmlTextReaderMoveToAttributeNs(reader, NULL, - // (const xmlChar*)"http://indexdata.dk/yp2/config/1" ))) - if ((!xmlTextReaderMoveToFirstAttribute(reader)) - || (! xmlTextReaderIsNamespaceDecl(reader)) - || (std::string("http://indexdata.dk/yp2/config/1") - != (const char*)xmlTextReaderConstValue(reader))) - xml_error(reader, "expected root element in namespace " - "'http://indexdata.dk/yp2/config/1'"); - - std::cout << " " << xmlTextReaderConstName(reader) << "=\"" - << xmlTextReaderConstValue(reader) << "\">" - //<< xmlTextReaderIsNamespaceDecl(reader) - << std::endl; - - - // start element processing - xml_progress_deep_to_element(reader); - if (std::string("start") != (const char*)xmlTextReaderConstName(reader) - || !xmlTextReaderMoveToFirstAttribute(reader) - || std::string("route") != (const char*)xmlTextReaderConstName(reader) - ) - xml_error(reader, "start element expected"); - - std::cout << "" << std::endl; - //<< xmlTextReaderGetAttribute(reader, (const xmlChar *)"route") - - - // filters element processing - xml_progress_flat_to_element(reader); - if (std::string("filters") != (const char*)xmlTextReaderConstName(reader) - ) - xml_error(reader, "filters element expected"); - - std::cout << "" << std::endl; - - - // filter element processing - xml_progress_deep_to_element(reader); - if (std::string("filter") != (const char*)xmlTextReaderConstName(reader) - ) - xml_error(reader, "filter element expected"); - - while (std::string("filter") == (const char*)xmlTextReaderConstName(reader)){ - std::string filter_id; - std::string filter_type; - if (!xmlTextReaderMoveToFirstAttribute(reader) - || std::string("id") != (const char*)xmlTextReaderConstName(reader)) - xml_error(reader, "filter element expected"); - filter_id = (const char*)xmlTextReaderConstValue(reader); - if (!xmlTextReaderMoveToNextAttribute(reader) - || std::string("type") != (const char*)xmlTextReaderConstName(reader)) - xml_error(reader, "filter element expected"); - filter_type = (const char*)xmlTextReaderConstValue(reader); - std::cout << "" - << std::endl; - xml_progress_flat_to_element(reader); - } - - std::cout << "" << std::endl; - - - // routes element processing - // xml_progress_flat_to_element(reader); - if (std::string("routes") != (const char*)xmlTextReaderConstName(reader) - ) - xml_error(reader, "routes element expected"); - - std::cout << "" << std::endl; - // route element processing - xml_progress_deep_to_element(reader); - if (std::string("route") != (const char*)xmlTextReaderConstName(reader) - ) - xml_error(reader, "route element expected"); - while (std::string("route") == (const char*)xmlTextReaderConstName(reader)){ - std::string route_id; - if (!xmlTextReaderMoveToFirstAttribute(reader) - || std::string("id") != (const char*)xmlTextReaderConstName(reader)) - xml_error(reader, "route element expected"); - route_id = (const char*)xmlTextReaderConstValue(reader); - - - std::cout << "" << std::endl; - std::cout << "" << std::endl; - xml_progress_flat_to_element(reader); - } - - std::cout << "" << std::endl; - - std::cout << "" << std::endl; - - - xml_debug_print(reader); - - - // freeing C xml reader libs - xmlFreeTextReader(reader); - if (ret != 0) { - std::cerr << "Parsing failed of XML config file " - << m_config << std::endl; - std::exit(1); - } - } - - void xml_error ( xmlTextReader* reader, std::string msg) - { - std::cerr << "ERROR: " << msg << " " - << xmlTextReaderGetParserLineNumber(reader) << ":" - << xmlTextReaderGetParserColumnNumber(reader) << " " - << xmlTextReaderConstName(reader) << " " - << xmlTextReaderDepth(reader) << " " - << xmlTextReaderNodeType(reader) << std::endl; - } - - void xml_debug_print ( xmlTextReader* reader) - { - // processing all other elements - //while (xmlTextReaderMoveToElement(reader)) // reads next element ?? - //while (xmlTextReaderNext(reader)) //does not descend, keeps level - while (xmlTextReaderRead(reader)) // descends into all subtree nodes - std::cout << xmlTextReaderGetParserLineNumber(reader) << ":" - << xmlTextReaderGetParserColumnNumber(reader) << " " - << xmlTextReaderDepth(reader) << " " - << xmlTextReaderNodeType(reader) << " " - << "ConstName " << xmlTextReaderConstName(reader) << " " - //<< "Prefix " << xmlTextReaderPrefix(reader) << "\n" - //<< "XmlLang " << xmlTextReaderXmlLang(reader) << "\n" - //<< "NamespaceUri " << xmlTextReaderNamespaceUri(reader) << "\n" - //<< "BaseUri" << xmlTextReaderBaseUri(reader) << "\n" - << std::endl; - } - - bool xml_progress_deep_to_element(xmlTextReader* reader) - { - bool ret = false; - while(xmlTextReaderRead(reader) - && xmlTextReaderNodeType(reader) != XML_ELEMENT_NODE - && !( xmlTextReaderNodeType(reader) == XML_READER_TYPE_END_ELEMENT - && 0 == xmlTextReaderDepth(reader)) - ) - ret = true; - return ret; - } - - bool xml_progress_flat_to_element(xmlTextReader* reader) - { - bool ret = false; - - while(xmlTextReaderNext(reader) - && xmlTextReaderNodeType(reader) != XML_ELEMENT_NODE - && !( xmlTextReaderNodeType(reader) == XML_READER_TYPE_END_ELEMENT - && 0 == xmlTextReaderDepth(reader)) - ) { - ret = true; - } - return ret; - } - - -}; - - - -int main(int argc, char **argv) -{ - //try - //{ - - - Configuration conf(argc, argv); - - std::cout << "config " << conf.config() << std::endl; - std::cout << "duration " << conf.duration() << std::endl; - - - - - // } - //catch ( ... ) { - //std::cerr << "Unknown Exception" << std::endl; - //throw(); - //std::exit(1); - //} - std::exit(0); -} - - - - -/* - * Local variables: - * c-basic-offset: 4 - * indent-tabs-mode: nil - * c-file-style: "stroustrup" - * End: - * vim: shiftwidth=4 tabstop=8 expandtab - */ diff --git a/src/test_boost_threads.cpp b/src/test_boost_threads.cpp index 7b13970..db30c39 100644 --- a/src/test_boost_threads.cpp +++ b/src/test_boost_threads.cpp @@ -1,4 +1,4 @@ -/* $Id: test_boost_threads.cpp,v 1.5 2005-10-15 14:09:09 adam Exp $ +/* $Id: test_boost_threads.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -42,7 +42,7 @@ public: #define USE_GROUP 1 -BOOST_AUTO_TEST_CASE( thread_group ) +BOOST_AUTO_UNIT_TEST( thread_group ) { try { @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE( thread_group ) } -BOOST_AUTO_TEST_CASE( thread_list ) +BOOST_AUTO_UNIT_TEST( thread_list ) { try { diff --git a/src/test_boost_time.cpp b/src/test_boost_time.cpp index 8f79989..fed4a27 100644 --- a/src/test_boost_time.cpp +++ b/src/test_boost_time.cpp @@ -1,4 +1,4 @@ -/* $Id: test_boost_time.cpp,v 1.5 2005-10-15 14:09:09 adam Exp $ +/* $Id: test_boost_time.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -15,7 +15,7 @@ using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( testboosttime1 ) +BOOST_AUTO_UNIT_TEST( testboosttime1 ) { // test session diff --git a/src/test_filter1.cpp b/src/test_filter1.cpp index 91912ea..162b209 100644 --- a/src/test_filter1.cpp +++ b/src/test_filter1.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter1.cpp,v 1.13 2005-10-31 09:40:18 marc Exp $ +/* $Id: test_filter1.cpp,v 1.14 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -21,7 +21,7 @@ public: }; -BOOST_AUTO_TEST_CASE( test_filter1 ) +BOOST_AUTO_UNIT_TEST( test_filter1 ) { try{ TFilter filter; diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp index c6295b8..fb34da0 100644 --- a/src/test_filter2.cpp +++ b/src/test_filter2.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter2.cpp,v 1.15 2005-10-31 09:40:18 marc Exp $ +/* $Id: test_filter2.cpp,v 1.16 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -118,7 +118,7 @@ public: }; -BOOST_AUTO_TEST_CASE( testfilter2_1 ) +BOOST_AUTO_UNIT_TEST( testfilter2_1 ) { try { FilterConstant fc; @@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 ) } -BOOST_AUTO_TEST_CASE( testfilter2_2 ) +BOOST_AUTO_UNIT_TEST( testfilter2_2 ) { try { FilterConstant fc; diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp index ee107d7..d23ee5c 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.5 2005-10-30 17:13:36 adam Exp $ +/* $Id: test_filter_backend_test.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -24,7 +24,7 @@ #include using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 ) { try { @@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 ) } } -BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 ) +BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 ) { try { @@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 ) } } -BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 ) +BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 ) { try { @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 ) } } -BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 ) +BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 ) { try { diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp index 4445a01..7dfcaae 100644 --- a/src/test_filter_factory.cpp +++ b/src/test_filter_factory.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_factory.cpp,v 1.5 2005-11-10 23:10:42 adam Exp $ +/* $Id: test_filter_factory.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -39,7 +39,7 @@ yp2::filter::Base* yfilter_creator(){ } -BOOST_AUTO_TEST_CASE( test_filter_factory_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_factory_1 ) { try { diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp index 2eb88b8..4648222 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.13 2005-10-31 09:40:18 marc Exp $ +/* $Id: test_filter_frontend_net.cpp,v 1.14 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -45,7 +45,7 @@ public: }; -BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 ) { try { @@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 ) } } -BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 ) +BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 ) { try { @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 ) } } -BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 ) +BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_3 ) { try { diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp index d896995..1cbf651 100644 --- a/src/test_filter_log.cpp +++ b/src/test_filter_log.cpp @@ -1,4 +1,4 @@ -/* $Id: test_filter_log.cpp,v 1.7 2005-10-31 09:40:18 marc Exp $ +/* $Id: test_filter_log.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -44,7 +44,7 @@ public: }; -BOOST_AUTO_TEST_CASE( test_filter_log_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_log_1 ) { try { @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE( test_filter_log_1 ) } } -BOOST_AUTO_TEST_CASE( test_filter_log_2 ) +BOOST_AUTO_UNIT_TEST( test_filter_log_2 ) { try { diff --git a/src/test_filter_virt_db.cpp b/src/test_filter_virt_db.cpp index ded4057..4ec8efc 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.8 2005-10-30 17:13:36 adam Exp $ +/* $Id: test_filter_virt_db.cpp,v 1.9 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -26,7 +26,7 @@ using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( test_filter_virt_db_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_virt_db_1 ) { try { @@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_1 ) } } -BOOST_AUTO_TEST_CASE( test_filter_virt_db_2 ) +BOOST_AUTO_UNIT_TEST( test_filter_virt_db_2 ) { try { @@ -189,7 +189,7 @@ static void present(yp2::Package &pack, yp2::Router &router, BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_presentResponse); } -BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 ) +BOOST_AUTO_UNIT_TEST( test_filter_virt_db_3 ) { try { diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp index 0391b9e..c3cbd2c 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.6 2005-10-30 17:13:36 adam Exp $ +/* $Id: test_filter_z3950_client.cpp,v 1.7 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -23,7 +23,7 @@ using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 ) +BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 ) { try { @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 ) } } -BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 ) +BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_2 ) { try { @@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 ) } } -BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 ) +BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_3 ) { try { @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 ) } } -BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 ) +BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_4 ) { try { diff --git a/src/test_package1.cpp b/src/test_package1.cpp index 5ec2520..7b88adf 100644 --- a/src/test_package1.cpp +++ b/src/test_package1.cpp @@ -1,4 +1,4 @@ -/* $Id: test_package1.cpp,v 1.3 2005-10-15 14:09:09 adam Exp $ +/* $Id: test_package1.cpp,v 1.4 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -15,7 +15,7 @@ using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( test_package1_1 ) +BOOST_AUTO_UNIT_TEST( test_package1_1 ) { try { yp2::Package package1; diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp index 89f1ee6..40c67d4 100644 --- a/src/test_pipe.cpp +++ b/src/test_pipe.cpp @@ -1,4 +1,4 @@ -/* $Id: test_pipe.cpp,v 1.3 2005-11-08 08:55:41 adam Exp $ +/* $Id: test_pipe.cpp,v 1.4 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -46,7 +46,7 @@ void Timer::socketNotify(int event) m_obs->deleteObserver(this); } -BOOST_AUTO_TEST_CASE( test_pipe_1 ) +BOOST_AUTO_UNIT_TEST( test_pipe_1 ) { yazpp_1::SocketManager mySocketManager; diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp index 23d9339..c458286 100644 --- a/src/test_router_flexml.cpp +++ b/src/test_router_flexml.cpp @@ -1,4 +1,4 @@ -/* $Id: test_router_flexml.cpp,v 1.4 2005-10-31 11:59:08 marc Exp $ +/* $Id: test_router_flexml.cpp,v 1.5 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -22,7 +22,7 @@ public: }; -BOOST_AUTO_TEST_CASE( test_router_flexml_1 ) +BOOST_AUTO_UNIT_TEST( test_router_flexml_1 ) { try{ diff --git a/src/test_ses_map.cpp b/src/test_ses_map.cpp index 6a89f83..6652801 100644 --- a/src/test_ses_map.cpp +++ b/src/test_ses_map.cpp @@ -1,4 +1,4 @@ -/* $Id: test_ses_map.cpp,v 1.1 2005-10-26 18:53:49 adam Exp $ +/* $Id: test_ses_map.cpp,v 1.2 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -50,7 +50,7 @@ namespace yp2 { } -BOOST_AUTO_TEST_CASE( test_ses_map_1 ) +BOOST_AUTO_UNIT_TEST( test_ses_map_1 ) { try { diff --git a/src/test_session1.cpp b/src/test_session1.cpp index cd1e23b..5e21cde 100644 --- a/src/test_session1.cpp +++ b/src/test_session1.cpp @@ -1,4 +1,4 @@ -/* $Id: test_session1.cpp,v 1.8 2005-10-15 14:09:09 adam Exp $ +/* $Id: test_session1.cpp,v 1.9 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -13,7 +13,7 @@ using namespace boost::unit_test; -BOOST_AUTO_TEST_CASE( testsession1 ) +BOOST_AUTO_UNIT_TEST( testsession1 ) { // test session diff --git a/src/test_session2.cpp b/src/test_session2.cpp index 1e26bca..6e237ad 100644 --- a/src/test_session2.cpp +++ b/src/test_session2.cpp @@ -1,4 +1,4 @@ -/* $Id: test_session2.cpp,v 1.5 2005-10-15 14:09:09 adam Exp $ +/* $Id: test_session2.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% @@ -48,7 +48,7 @@ class Worker -BOOST_AUTO_TEST_CASE( testsession2 ) +BOOST_AUTO_UNIT_TEST( testsession2 ) { // test session diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp index c496391..f6b08d8 100644 --- a/src/test_thread_pool_observer.cpp +++ b/src/test_thread_pool_observer.cpp @@ -1,9 +1,9 @@ -/* $Id: test_thread_pool_observer.cpp,v 1.7 2005-11-07 21:57:10 adam Exp $ +/* $Id: test_thread_pool_observer.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% */ -/* $Id: test_thread_pool_observer.cpp,v 1.7 2005-11-07 21:57:10 adam Exp $ +/* $Id: test_thread_pool_observer.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -103,7 +103,7 @@ void My_Timer_Thread::socketNotify(int event) m_t->put(m); } -BOOST_AUTO_TEST_CASE( thread_pool_observer1 ) +BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) { SocketManager mySocketManager; -- 1.7.10.4