X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_virt_db.cpp;h=6c4415871f6a2b076e0fa3887d7bb2dfab29887a;hb=b8550b672196ca7e6fe11a8cba7155beb8794286;hp=ded40578e64b7e13547385f5af34eb220759e750;hpb=f26cca046b4879a78261ea436c3e21bb3b851b52;p=metaproxy-moved-to-github.git diff --git a/src/test_filter_virt_db.cpp b/src/test_filter_virt_db.cpp index ded4057..6c44158 100644 --- a/src/test_filter_virt_db.cpp +++ b/src/test_filter_virt_db.cpp @@ -1,23 +1,35 @@ -/* $Id: test_filter_virt_db.cpp,v 1.8 2005-10-30 17:13:36 adam Exp $ - Copyright (c) 2005, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2012 Index Data -%LICENSE% - */ +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 #include -#include "util.hpp" +#include #include "filter_virt_db.hpp" #include "filter_backend_test.hpp" #include "filter_log.hpp" #include "router_chain.hpp" -#include "session.hpp" -#include "package.hpp" +#include #define BOOST_AUTO_TEST_MAIN +#define BOOST_TEST_DYN_LINK #include #include @@ -25,12 +37,13 @@ #include using namespace boost::unit_test; +namespace mp = metaproxy_1; BOOST_AUTO_TEST_CASE( test_filter_virt_db_1 ) { try { - yp2::filter::Virt_db vdb; + mp::filter::VirtualDB vdb; } catch ( ... ) { BOOST_CHECK (false); @@ -41,18 +54,18 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_2 ) { try { - yp2::RouterChain router; + mp::RouterChain router; - yp2::filter::Virt_db vdb; + mp::filter::VirtualDB vdb; router.append(vdb); // Create package with Z39.50 init request in it // Since there is not vhost given, the virt will make its // own init response (regardless of backend) - yp2::Package pack; + mp::Package pack; - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest); BOOST_CHECK(apdu); @@ -80,10 +93,10 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_2 ) } -static void init(yp2::Package &pack, yp2::Router &router) +static void init(mp::Package &pack, mp::Router &router) { // Create package with Z39.50 init request in it - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest); BOOST_CHECK(apdu); @@ -108,16 +121,16 @@ static void init(yp2::Package &pack, yp2::Router &router) BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse); } -static void search(yp2::Package &pack, yp2::Router &router, +static void search(mp::Package &pack, mp::Router &router, const std::string &query, const char *db, const char *setname) { // Create package with Z39.50 search request in it - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest); - yp2::util::pqf(odr, apdu, query); + mp::util::pqf(odr, apdu, query); apdu->u.searchRequest->resultSetName = odr_strdup(odr, setname); @@ -151,13 +164,13 @@ static void search(yp2::Package &pack, yp2::Router &router, BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_searchResponse); } -static void present(yp2::Package &pack, yp2::Router &router, +static void present(mp::Package &pack, mp::Router &router, int start, int number, const char *setname) { // Create package with Z39.50 present request in it - yp2::odr odr; + mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest); apdu->u.presentRequest->resultSetId = odr_strdup(odr, setname); @@ -193,43 +206,43 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 ) { try { - yp2::RouterChain router; + mp::RouterChain router; - yp2::filter::Log filter_log1("FRONT"); + mp::filter::Log filter_log1("FRONT"); #if 0 router.append(filter_log1); #endif - yp2::filter::Virt_db vdb; + mp::filter::VirtualDB vdb; router.append(vdb); - vdb.add_map_db2vhost("Default", "localhost:210"); - yp2::filter::Log filter_log2("BACK"); + vdb.add_map_db2target("Default", "localhost:210", ""); + mp::filter::Log filter_log2("BACK"); #if 0 router.append(filter_log2); #endif - yp2::filter::Backend_test btest; + mp::filter::BackendTest btest; router.append(btest); - yp2::Session session1; - yp2::Origin origin1; + mp::Session session1; + mp::Origin origin1; { - yp2::Package pack(session1, origin1); + mp::Package pack(session1, origin1); init(pack, router); } { // search for database for which there is no map - yp2::Package pack(session1, origin1); + mp::Package pack(session1, origin1); search(pack, router, "computer", "bad_database", "default"); } { // search for database for which there a map - yp2::Package pack(session1, origin1); + mp::Package pack(session1, origin1); search(pack, router, "other", "Default", "default"); } { // present from last search - yp2::Package pack(session1, origin1); + mp::Package pack(session1, origin1); present(pack, router, 1, 2, "default"); } } @@ -242,8 +255,9 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 ) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +