X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=c81bef741982f13be8126ccb5971e833a052e059;hb=a5ad4b6e9fc82d294b1903e8b8c9439e33cfffd4;hp=99aa27cb88dc2a997af7a788abb788685f7e16c7;hpb=891f355967146e1f2d66e4dc44158a011282c87f;p=metaproxy-moved-to-github.git
diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 99aa27c..c81bef7 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,5 +1,5 @@
-/* $Id: test_router_flexml.cpp,v 1.14 2006-01-11 11:51:50 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_router_flexml.cpp,v 1.16 2006-03-16 10:40:59 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
%LICENSE%
*/
@@ -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;
}
@@ -45,9 +47,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" \n"
" my msg\n"
" \n"
- " \n"
- " \n"
- " \n"
+ " \n"
" \n"
" other\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::XMLError &e) {
+ catch ( mp::XMLError &e) {
std::cout << "XMLError: " << e.what() << "\n";
got_error_as_expected = true;
}
@@ -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) {