X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=24ab0be967ad5c842b009a91adb8ececdb8922d4;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=9c8992b3f68e32c8cf6f68391fc75137e7fadf74;hpb=c1d953eee6c00432493bc364da6284704ccd9cc2;p=metaproxy-moved-to-github.git diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp index 9c8992b..24ab0be 100644 --- a/src/test_filter_backend_test.cpp +++ b/src/test_filter_backend_test.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2011 Index Data + Copyright (C) 2005-2013 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 @@ -40,7 +40,7 @@ namespace mp = metaproxy_1; BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 ) { - try + try { mp::filter::BackendTest btest; } @@ -51,30 +51,30 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 ) BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 ) { - try + try { mp::RouterChain router; - + mp::filter::BackendTest btest; router.append(btest); - + mp::Package pack; - + mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest); - + BOOST_CHECK(apdu); - + pack.request() = apdu; - + // Put it in router - pack.router(router).move(); - + pack.router(router).move(); + // Inspect that we got Z39.50 init Response OK. yazpp_1::GDU *gdu = &pack.response(); - - BOOST_CHECK(!pack.session().is_closed()); - + + BOOST_CHECK(!pack.session().is_closed()); + Z_GDU *z_gdu = gdu->get(); BOOST_CHECK(z_gdu); if (z_gdu) { @@ -89,39 +89,39 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 ) BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 ) { - try + try { mp::RouterChain router; - + mp::filter::BackendTest btest; router.append(btest); - + mp::Package pack; - + // send search request as first request.. That should fail with // a close from the backend mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest); mp::util::pqf(odr, apdu, "computer"); - + apdu->u.searchRequest->num_databaseNames = 1; apdu->u.searchRequest->databaseNames = (char**) odr_malloc(odr, sizeof(char *)); apdu->u.searchRequest->databaseNames[0] = odr_strdup(odr, "Default"); - + BOOST_CHECK(apdu); - + pack.request() = apdu; - + // Put it in router - pack.router(router).move(); - + pack.router(router).move(); + // Inspect that we got Z39.50 close yazpp_1::GDU *gdu = &pack.response(); - - BOOST_CHECK(pack.session().is_closed()); - + + BOOST_CHECK(pack.session().is_closed()); + Z_GDU *z_gdu = gdu->get(); BOOST_CHECK(z_gdu); if (z_gdu) { @@ -136,32 +136,32 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 ) BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 ) { - try + try { mp::RouterChain router; - + mp::filter::BackendTest btest; router.append(btest); - + mp::Package pack; - + // send present request as first request.. That should fail with // a close from the backend mp::odr odr; Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest); BOOST_CHECK(apdu); - + pack.request() = apdu; - + // Put it in router - pack.router(router).move(); - + pack.router(router).move(); + // Inspect that we got Z39.50 close yazpp_1::GDU *gdu = &pack.response(); - - BOOST_CHECK(pack.session().is_closed()); - + + BOOST_CHECK(pack.session().is_closed()); + Z_GDU *z_gdu = gdu->get(); BOOST_CHECK(z_gdu); if (z_gdu) {