X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=3cf58b6ceeb0988d5f53d04a03658b82968a1586;hb=86cf292c69bde833d4f587cbf0fae5c6e7d47c68;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..3cf58b6 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,7 +1,22 @@
-/* $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.20 2007-05-09 21:23:09 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+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.
*/
#include "config.hpp"
@@ -17,15 +32,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;
}
@@ -36,7 +53,8 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
try
{
std::string xmlconf = "\n"
- "\n"
+ "\n"
" \n"
" \n"
" \n"
@@ -45,9 +63,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" \n"
" my msg\n"
" \n"
- " \n"
- " \n"
- " \n"
+ " \n"
" \n"
" other\n"
" \n"
@@ -62,11 +78,11 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" \n"
" \n"
" \n"
- "\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) {
@@ -86,16 +102,16 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
try
{
std::string xmlconf_invalid = "\n"
- "\n"
+ "\n"
" \n"
" \n"
" \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;
}
@@ -114,26 +130,27 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
try
{
std::string xmlconf = "\n"
- "\n"
- " \n"
- " \n"
- " \n"
+ "\n"
+ " \n"
+ " \n"
+ " \n"
" @:210\n"
- " \n"
- " \n"
+ " \n"
+ " \n"
" my msg\n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
- "\n";
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \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";
@@ -151,8 +168,9 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
try
{
std::string xmlconf = "\n"
- "\n"
- " \n"
+ "\n"
+ " \n"
" \n"
" \n"
" @:210\n"
@@ -163,14 +181,14 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
" \n"
" \n"
" \n"
- "\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) {