X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=524e3c9f06a972669599008ae41729faa20b37eb;hb=b0c61b7f8b17d876c88347a96c246c47493140da;hp=16cbe4e050ea8d2b21f1f9c7e6a1130fab09df2a;hpb=d0123337d70b0fb97b578cc57467bb94980f1014;p=metaproxy-moved-to-github.git diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp index 16cbe4e..524e3c9 100644 --- a/src/test_filter_frontend_net.cpp +++ b/src/test_filter_frontend_net.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2009 Index Data + Copyright (C) 2005-2010 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 @@ -44,14 +44,11 @@ public: } Z_GDU *gdu = package.request().get(); - if (gdu) + if (gdu && gdu->which == Z_GDU_Z3950) { // std::cout << "Got PDU. Sending init response\n"; mp::odr odr; - Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse); - - apdu->u.initResponse->implementationName = "YP2/YAZ"; - + Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0); package.response() = apdu; } return package.move(); @@ -67,6 +64,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 ) mp::filter::FrontendNet nf; } } + catch (std::runtime_error &e) { + std::cerr << "std::runtime error: " << e.what() << std::endl; + BOOST_CHECK(false); + } catch ( ... ) { BOOST_CHECK (false); } @@ -106,6 +107,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 ) } } } + catch (std::runtime_error &e) { + std::cerr << "std::runtime error: " << e.what() << std::endl; + BOOST_CHECK(false); + } catch ( ... ) { BOOST_CHECK (false); } @@ -137,6 +142,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 ) } BOOST_CHECK(true); } + catch (std::runtime_error &e) { + std::cerr << "std::runtime error: " << e.what() << std::endl; + BOOST_CHECK(false); + } catch ( ... ) { BOOST_CHECK (false); }