X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=95b05efa21a4801926d5f3900eb536279efa014b;hb=0d49c50096893321c3b5f280d4904e0705415079;hp=1a30019f495254090ee5d880229c7be53a71fe4d;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git
diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 1a30019..95b05ef 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_router_flexml.cpp,v 1.13 2006-01-09 13:43:59 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_router_flexml.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
@@ -17,15 +17,17 @@
using namespace boost::unit_test;
+namespace mp = metaproxy_1;
+
static int tfilter_ref = 0;
-class TFilter: public yp2::filter::Base {
+class TFilter: public mp::filter::Base {
public:
- void process(yp2::Package & package) const {};
+ void process(mp::Package & package) const {};
TFilter() { tfilter_ref++; };
~TFilter() { tfilter_ref--; };
};
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
{
return new TFilter;
}
@@ -43,13 +45,11 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" @:210\n"
" \n"
" \n"
- " mylog1.log\n"
- " \n"
- " \n"
- " \n"
+ " my msg\n"
" \n"
+ " \n"
" \n"
- " mylog2.log\n"
+ " other\n"
" \n"
" \n"
" \n"
@@ -64,9 +64,9 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" \n"
"\n";
- yp2::FactoryStatic factory;
+ mp::FactoryStatic factory;
factory.add_creator("tfilter", filter_creator);
- yp2::RouterFleXML rflexml(xmlconf, factory);
+ mp::RouterFleXML rflexml(xmlconf, factory);
BOOST_CHECK_EQUAL(tfilter_ref, 2);
}
catch ( std::runtime_error &e) {
@@ -92,10 +92,10 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
" \n"
" @:210\n";
- yp2::FactoryFilter factory;
- yp2::RouterFleXML rflexml(xmlconf_invalid, factory);
+ mp::FactoryFilter factory;
+ mp::RouterFleXML rflexml(xmlconf_invalid, factory);
}
- catch ( yp2::RouterFleXML::XMLError &e) {
+ catch ( mp::XMLError &e) {
std::cout << "XMLError: " << e.what() << "\n";
got_error_as_expected = true;
}
@@ -121,7 +121,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
" @:210\n"
" \n"
" \n"
- " mylog.log\n"
+ " my msg\n"
" \n"
" \n"
" \n"
@@ -132,8 +132,8 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
" \n"
"\n";
- yp2::FactoryStatic factory;
- yp2::RouterFleXML rflexml(xmlconf, factory);
+ mp::FactoryStatic factory;
+ mp::RouterFleXML rflexml(xmlconf, factory);
}
catch ( std::runtime_error &e) {
std::cout << "std::runtime error: " << e.what() << "\n";
@@ -165,12 +165,12 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
" \n"
"\n";
- yp2::FactoryStatic factory;
+ mp::FactoryStatic factory;
factory.add_creator("tfilter", filter_creator);
- yp2::RouterFleXML rflexml(xmlconf, factory);
+ mp::RouterFleXML rflexml(xmlconf, factory);
}
- catch ( yp2::FactoryFilter::NotFound &e) {
- std::cout << "yp2::FactoryFilter::NotFound: " << e.what() << "\n";
+ catch ( mp::FactoryFilter::NotFound &e) {
+ std::cout << "mp::FactoryFilter::NotFound: " << e.what() << "\n";
got_error_as_expected = true;
}
catch ( std::runtime_error &e) {