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
Do not include router.hpp in filters
[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
1c9b8c2
..
4648222
100644
(file)
--- a/
src/test_filter_frontend_net.cpp
+++ b/
src/test_filter_frontend_net.cpp
@@
-1,11
+1,17
@@
+/* $Id: test_filter_frontend_net.cpp,v 1.14 2005-12-02 12:21:07 adam Exp $
+ Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
#include "config.hpp"
#include <iostream>
#include <stdexcept>
#include "config.hpp"
#include <iostream>
#include <stdexcept>
+#include "util.hpp"
#include "filter_frontend_net.hpp"
#include "filter_frontend_net.hpp"
-#include "router.hpp"
+#include "router_chain.hpp"
#include "session.hpp"
#include "package.hpp"
#include "session.hpp"
#include "package.hpp"
@@
-14,10
+20,10
@@
using namespace boost::unit_test;
using namespace boost::unit_test;
-class FilterInit: public yp2::Filter {
+class FilterInit: public yp2::filter::Base {
public:
void process(yp2::Package & package) const {
public:
void process(yp2::Package & package) const {
-
+
if (package.session().is_closed())
{
// std::cout << "Got Close.\n";
if (package.session().is_closed())
{
// std::cout << "Got Close.\n";
@@
-27,25
+33,24
@@
public:
if (gdu)
{
// std::cout << "Got PDU. Sending init response\n";
if (gdu)
{
// std::cout << "Got PDU. Sending init response\n";
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
apdu->u.initResponse->implementationName = "YP2/YAZ";
package.response() = apdu;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
apdu->u.initResponse->implementationName = "YP2/YAZ";
package.response() = apdu;
- odr_destroy(odr);
}
return package.move();
};
};
}
return package.move();
};
};
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
{
try
{
{
{
try
{
{
- yp2::FilterFrontendNet nf;
+ yp2::filter::FrontendNet nf;
}
}
catch ( ... ) {
}
}
catch ( ... ) {
@@
-53,7
+58,7
@@
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
{
@@
-62,16
+67,15
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
FilterInit tf;
FilterInit tf;
- router.rule(tf);
+ router.append(tf);
// Create package with Z39.50 init request in it
yp2::Package pack;
// Create package with Z39.50 init request in it
yp2::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::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;
- odr_destroy(odr);
// Done creating query.
// Put it in router
// Done creating query.
// Put it in router
@@
-93,7
+97,7
@@
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
{
@@
-101,14
+105,17
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
yp2::RouterChain router;
// put in frontend first
yp2::RouterChain router;
// put in frontend first
- yp2::FilterFrontendNet filter_front;
- filter_front.listen_address() = "unix:socket";
+ yp2::filter::FrontendNet filter_front;
+
+ std::vector <std::string> ports;
+ ports.insert(ports.begin(), "unix:socket");
+ filter_front.ports() = ports;
filter_front.listen_duration() = 1; // listen a short time only
filter_front.listen_duration() = 1; // listen a short time only
- router.rule(filter_front);
+ router.append(filter_front);
// put in a backend
FilterInit filter_init;
// put in a backend
FilterInit filter_init;
- router.rule(filter_init);
+ router.append(filter_init);
yp2::Package pack;
yp2::Package pack;
@@
-125,6
+132,7
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
* Local variables:
* c-basic-offset: 4
* indent-tabs-mode: nil
* Local variables:
* c-basic-offset: 4
* indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/