-/* $Id: test_filter_z3950_client.cpp,v 1.1 2005-10-16 16:05:44 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_filter_z3950_client.cpp,v 1.10 2007-01-25 14:05:54 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
#include <stdexcept>
#include "filter_z3950_client.hpp"
+#include "util.hpp"
-#include "router.hpp"
+#include "router_chain.hpp"
#include "session.hpp"
#include "package.hpp"
#include <yaz/zgdu.h>
#include <yaz/otherinfo.h>
-using namespace boost::unit_test;
+using namespace boost::unit_test;
+namespace mp = metaproxy_1;
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 )
{
try
{
- {
- yp2::filter::Z3950Client zc;
- }
+ mp::filter::Z3950Client zc; // can we construct OK?
}
catch ( ... ) {
BOOST_CHECK (false);
}
}
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_2 )
{
try
{
- {
- yp2::RouterChain router;
-
- yp2::filter::Z3950Client zc;
-
- router.rule(zc);
-
- // Create package with Z39.50 init request in it
- yp2::Package pack;
-
- ODR odr = odr_createmem(ODR_ENCODE);
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-
- BOOST_CHECK(apdu);
-
- pack.request() = apdu;
- odr_destroy(odr);
-
- // Put it in router
- pack.router(router).move();
-
- // Inspect that we got Z39.50 init Response - a Z39.50 session
- // specify a virtual host
- yazpp_1::GDU *gdu = &pack.response();
-
- BOOST_CHECK(pack.session().is_closed());
-
- Z_GDU *z_gdu = gdu->get();
- BOOST_CHECK(z_gdu);
- if (z_gdu) {
- BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
- BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse);
- }
+ mp::RouterChain router;
+
+ mp::filter::Z3950Client zc;
+
+ router.append(zc);
+
+ // Create package with Z39.50 init request in it
+ 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();
+
+ // Inspect that we got Z39.50 init Response - a Z39.50 session MUST
+ // specify a virtual host
+ yazpp_1::GDU *gdu = &pack.response();
+
+ BOOST_CHECK(pack.session().is_closed());
+
+ Z_GDU *z_gdu = gdu->get();
+ BOOST_CHECK(z_gdu);
+ if (z_gdu) {
+ BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
+ BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse);
}
}
catch ( ... ) {
}
}
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_3 )
{
try
{
- {
- yp2::RouterChain router;
-
- yp2::filter::Z3950Client zc;
-
- router.rule(zc);
-
- // Create package with Z39.50 present request in it
- yp2::Package pack;
-
- ODR odr = odr_createmem(ODR_ENCODE);
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest);
-
- BOOST_CHECK(apdu);
-
- pack.request() = apdu;
- odr_destroy(odr);
-
- // Put it in router
- pack.router(router).move();
-
- // Inspect that we got Z39.50 close - a Z39.50 session must start
- // with an init !
- yazpp_1::GDU *gdu = &pack.response();
-
- BOOST_CHECK(pack.session().is_closed());
-
- Z_GDU *z_gdu = gdu->get();
- BOOST_CHECK(z_gdu);
- if (z_gdu) {
- BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
- BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_close);
- }
+ mp::RouterChain router;
+
+ mp::filter::Z3950Client zc;
+
+ router.append(zc);
+
+ // Create package with Z39.50 present request in it
+ mp::Package pack;
+
+ 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();
+
+ // Inspect that we got Z39.50 close - a Z39.50 session must start
+ // with an init !
+ yazpp_1::GDU *gdu = &pack.response();
+
+ BOOST_CHECK(pack.session().is_closed());
+
+ Z_GDU *z_gdu = gdu->get();
+ BOOST_CHECK(z_gdu);
+ if (z_gdu) {
+ BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
+ BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_close);
}
}
catch ( ... ) {
}
}
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_4 )
{
try
{
+ mp::RouterChain router;
+
+ mp::filter::Z3950Client zc;
+
+ router.append(zc);
+
+ // Create package with Z39.50 init request in it
+ mp::Package pack;
+
+ mp::odr odr;
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
+
+ const char *vhost = "localhost:9999";
+ if (vhost)
+ yaz_oi_set_string_oidval(&apdu->u.initRequest->otherInfo,
+ odr, VAL_PROXY, 1, vhost);
+ BOOST_CHECK(apdu);
+
+ pack.request() = apdu;
+
+ // Put it in router
+ pack.router(router).move();
+
+ if (pack.session().is_closed())
{
- yp2::RouterChain router;
-
- yp2::filter::Z3950Client zc;
-
- router.rule(zc);
-
- // Create package with Z39.50 init request in it
- yp2::Package pack;
-
- ODR odr = odr_createmem(ODR_ENCODE);
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-
- const char *vhost = "localhost:9999";
- if (vhost)
- yaz_oi_set_string_oidval(&apdu->u.initRequest->otherInfo,
- odr, VAL_PROXY, 1, vhost);
-
- BOOST_CHECK(apdu);
-
- pack.request() = apdu;
- odr_destroy(odr);
-
- // Put it in router
- pack.router(router).move();
-
- // Inspect that we got Z39.50 close - a Z39.50 session must start
- // with an init !
+ // OK, server was not up!
+ }
+ else
+ {
+ // Inspect that we got Z39.50 init response
yazpp_1::GDU *gdu = &pack.response();
-
- BOOST_CHECK(!pack.session().is_closed());
-
Z_GDU *z_gdu = gdu->get();
BOOST_CHECK(z_gdu);
if (z_gdu) {
projects / metaproxy-moved-to-github.git / blobdiff