+/* This file is part of Metaproxy.
+ Copyright (C) Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include "config.hpp"
#include <iostream>
#include <stdexcept>
+#include <metaproxy/util.hpp>
#include "filter_frontend_net.hpp"
-#include "router.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
#include <boost/test/auto_unit_test.hpp>
using namespace boost::unit_test;
+namespace mp = metaproxy_1;
-class FilterInit: public yp2::Filter {
+class FilterInit: public mp::filter::Base {
public:
- yp2::Package & process(yp2::Package & package) const {
+ void process(mp::Package & package) const {
- Z_GDU *gdu = package.request().get();
if (package.session().is_closed())
{
- // std::cout << "Got Close. Sending nothing\n";
+ // std::cout << "Got Close.\n";
}
-
- if (gdu)
+
+ Z_GDU *gdu = package.request().get();
+ if (gdu && gdu->which == Z_GDU_Z3950)
{
// std::cout << "Got PDU. Sending init response\n";
- ODR odr = odr_createmem(ODR_ENCODE);
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-
- apdu->u.initResponse->implementationName = "YP2/YAZ";
-
+ mp::odr odr;
+ Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
package.response() = apdu;
- odr_destroy(odr);
}
return package.move();
};
+ void configure(const xmlNode* ptr, bool test_only, const char *path) {};
};
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
{
- try
+ try
{
{
- yp2::FilterFrontendNet nf;
+ mp::filter::FrontendNet nf;
}
- BOOST_CHECK(true);
+ }
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
}
catch ( ... ) {
BOOST_CHECK (false);
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
{
- try
+ try
{
{
- yp2::RouterChain router;
+ mp::RouterChain router;
FilterInit tf;
- router.rule(tf);
+ router.append(tf);
// Create package with Z39.50 init request in it
- yp2::Session session;
- yp2::Origin origin;
- yp2::Package pack_in(session, origin);
+ mp::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ mp::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-
- pack_in.request() = apdu;
- odr_destroy(odr);
- // Done creating query.
+
+ pack.request() = apdu;
+ // Done creating query.
// Put it in router
- pack_in.router(router).move();
+ pack.router(router).move();
// Inspect that we got Z39.50 init response
- yazpp_1::GDU *gdu = &pack_in.response();
+ yazpp_1::GDU *gdu = &pack.response();
Z_GDU *z_gdu = gdu->get();
BOOST_CHECK(z_gdu);
BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse);
}
}
- BOOST_CHECK(true);
+ }
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
}
catch ( ... ) {
BOOST_CHECK (false);
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
{
- try
+ try
{
{
- yp2::RouterChain router;
- yp2::FilterFrontendNet filter_front;
- filter_front.listen_address() = "unix:socket";
- filter_front.listen_duration() = 2; // listen a short time only
- router.rule(filter_front);
+ mp::RouterChain router;
+
+ // put in frontend first
+ mp::filter::FrontendNet filter_front;
+ std::vector <std::string> ports;
+ ports.insert(ports.begin(), "unix:socket");
+ filter_front.set_ports(ports);
+ filter_front.set_listen_duration(1); // listen a short time only
+ router.append(filter_front);
+
+ // put in a backend
FilterInit filter_init;
- router.rule(filter_init);
+ router.append(filter_init);
+
+ mp::Package pack;
- yp2::Session session;
- yp2::Origin origin;
- yp2::Package pack_in(session, origin);
-
- pack_in.router(router).move();
+ pack.router(router).move();
}
BOOST_CHECK(true);
}
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
+ }
catch ( ... ) {
BOOST_CHECK (false);
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+