projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started access logging of Z39.50 packages, partially done init, search
[metaproxy-moved-to-github.git]
/
src
/
test_router_flexml.cpp
diff --git
a/src/test_router_flexml.cpp
b/src/test_router_flexml.cpp
index
1a30019
..
95b05ef
100644
(file)
--- 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"
*/
#include "config.hpp"
@@
-17,15
+17,17
@@
using namespace boost::unit_test;
using namespace boost::unit_test;
+namespace mp = metaproxy_1;
+
static int tfilter_ref = 0;
static int tfilter_ref = 0;
-class TFilter: public yp2::filter::Base {
+class TFilter: public mp::filter::Base {
public:
public:
- void process(yp2::Package & package) const {};
+ void process(mp::Package & package) const {};
TFilter() { tfilter_ref++; };
~TFilter() { tfilter_ref--; };
};
TFilter() { tfilter_ref++; };
~TFilter() { tfilter_ref--; };
};
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
{
return new TFilter;
}
{
return new TFilter;
}
@@
-43,13
+45,11
@@
BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" <port>@:210</port>\n"
" </filter>\n"
" <filter id=\"log_cout1\" type=\"log\">\n"
" <port>@:210</port>\n"
" </filter>\n"
" <filter id=\"log_cout1\" type=\"log\">\n"
- " <logfile>mylog1.log</logfile>\n"
- " </filter>\n"
- " <filter id=\"tfilter_id\" type=\"tfilter\">\n"
- " <someelement/>\n"
+ " <message>my msg</message>\n"
" </filter>\n"
" </filter>\n"
+ " <filter id=\"tfilter_id\" type=\"tfilter\"/>\n"
" <filter id=\"log_cout2\" type=\"log\">\n"
" <filter id=\"log_cout2\" type=\"log\">\n"
- " <logfile>mylog2.log</logfile>\n"
+ " <message>other</message>\n"
" </filter>\n"
" </filters>\n"
" <routes>\n"
" </filter>\n"
" </filters>\n"
" <routes>\n"
@@
-64,9
+64,9
@@
BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
" </routes>\n"
"</yp2>\n";
" </routes>\n"
"</yp2>\n";
- yp2::FactoryStatic factory;
+ mp::FactoryStatic factory;
factory.add_creator("tfilter", filter_creator);
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) {
BOOST_CHECK_EQUAL(tfilter_ref, 2);
}
catch ( std::runtime_error &e) {
@@
-92,10
+92,10
@@
BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
" <filter id=\"front_default\" type=\"frontend_net\">\n"
" <port>@:210</port>\n";
" <filter id=\"front_default\" type=\"frontend_net\">\n"
" <port>@:210</port>\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;
}
std::cout << "XMLError: " << e.what() << "\n";
got_error_as_expected = true;
}
@@
-121,7
+121,7
@@
BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
" <port>@:210</port>\n"
" </y:filter>\n"
" <y:filter id=\"log_cout\" type=\"log\">\n"
" <port>@:210</port>\n"
" </y:filter>\n"
" <y:filter id=\"log_cout\" type=\"log\">\n"
- " <logfile>mylog.log</logfile>\n"
+ " <message>my msg</message>\n"
" </y:filter>\n"
" </y:filters>\n"
" <y:routes>\n"
" </y:filter>\n"
" </y:filters>\n"
" <y:routes>\n"
@@
-132,8
+132,8
@@
BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
" </y:routes>\n"
"</y:yp2>\n";
" </y:routes>\n"
"</y:yp2>\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";
}
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 )
" </routes>\n"
"</yp2>\n";
" </routes>\n"
"</yp2>\n";
- yp2::FactoryStatic factory;
+ mp::FactoryStatic factory;
factory.add_creator("tfilter", filter_creator);
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) {
got_error_as_expected = true;
}
catch ( std::runtime_error &e) {