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
Fix debug=0 compile
[metaproxy-moved-to-github.git]
/
src
/
test_filter_frontend_net.cpp
diff --git
a/src/test_filter_frontend_net.cpp
b/src/test_filter_frontend_net.cpp
index
2eb88b8
..
9eaf40a
100644
(file)
--- a/
src/test_filter_frontend_net.cpp
+++ b/
src/test_filter_frontend_net.cpp
@@
-1,5
+1,5
@@
-/* $Id: test_filter_frontend_net.cpp,v 1.13 2005-10-31 09:40:18 marc Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_filter_frontend_net.cpp,v 1.15 2006-03-16 10:40:59 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
%LICENSE%
*/
%LICENSE%
*/
@@
-19,10
+19,11
@@
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
+namespace mp = metaproxy_1;
-class FilterInit: public yp2::filter::Base {
+class FilterInit: public mp::filter::Base {
public:
public:
- void process(yp2::Package & package) const {
+ void process(mp::Package & package) const {
if (package.session().is_closed())
{
if (package.session().is_closed())
{
@@
-33,7
+34,7
@@
public:
if (gdu)
{
// std::cout << "Got PDU. Sending init response\n";
if (gdu)
{
// std::cout << "Got PDU. Sending init response\n";
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
apdu->u.initResponse->implementationName = "YP2/YAZ";
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
apdu->u.initResponse->implementationName = "YP2/YAZ";
@@
-45,12
+46,12
@@
public:
};
};
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
{
try
{
{
{
try
{
{
- yp2::filter::FrontendNet nf;
+ mp::filter::FrontendNet nf;
}
}
catch ( ... ) {
}
}
catch ( ... ) {
@@
-58,21
+59,21
@@
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
{
{
{
try
{
{
- yp2::RouterChain router;
+ mp::RouterChain router;
FilterInit tf;
router.append(tf);
// Create package with Z39.50 init request in it
FilterInit tf;
router.append(tf);
// Create package with Z39.50 init request in it
- yp2::Package pack;
+ mp::Package pack;
- yp2::odr odr;
+ mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
pack.request() = apdu;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
pack.request() = apdu;
@@
-97,15
+98,15
@@
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
{
{
{
try
{
{
- yp2::RouterChain router;
+ mp::RouterChain router;
// put in frontend first
// put in frontend first
- yp2::filter::FrontendNet filter_front;
+ mp::filter::FrontendNet filter_front;
std::vector <std::string> ports;
ports.insert(ports.begin(), "unix:socket");
std::vector <std::string> ports;
ports.insert(ports.begin(), "unix:socket");
@@
-117,7
+118,7
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
FilterInit filter_init;
router.append(filter_init);
FilterInit filter_init;
router.append(filter_init);
- yp2::Package pack;
+ mp::Package pack;
pack.router(router).move();
}
pack.router(router).move();
}