-/* $Id: test_filter_log.cpp,v 1.1 2005-10-19 22:45:59 marc Exp $
+/* $Id: test_filter_log.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include <stdexcept>
#include "filter_log.hpp"
-
-#include "router.hpp"
+#include "util.hpp"
+#include "router_chain.hpp"
#include "session.hpp"
#include "package.hpp"
if (gdu)
{
// std::cout << "Got PDU. Sending init response\n";
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
apdu->u.initResponse->implementationName = "YP2/YAZ";
package.response() = apdu;
- odr_destroy(odr);
}
return package.move();
};
};
-BOOST_AUTO_TEST_CASE( test_filter_log_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
{
try
{
- {
- yp2::filter::Log lf;
- }
+ yp2::filter::Log lf;
}
catch ( ... ) {
BOOST_CHECK (false);
}
}
-BOOST_AUTO_TEST_CASE( test_filter_log_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_log_2 )
{
try
{
- {
- yp2::RouterChain router;
-
- yp2::filter::Log lf;
- FilterBounceInit bf;
-
- router.rule(lf);
- router.rule(bf);
-
- // 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);
-
- pack.request() = apdu;
- odr_destroy(odr);
- // Done creating query.
-
- // Put it in router
- pack.router(router).move();
-
- // Inspect that we got Z39.50 init response
- yazpp_1::GDU *gdu = &pack.response();
-
- 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);
- }
+ yp2::RouterChain router;
+
+ yp2::filter::Log lf;
+ FilterBounceInit bf;
+
+ router.append(lf);
+ router.append(bf);
+
+ // Create package with Z39.50 init request in it
+ yp2::Package pack;
+
+ yp2::odr odr;
+ Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
+
+ pack.request() = apdu;
+ // Done creating query.
+
+ // Put it in router
+ pack.router(router).move();
+
+ // Inspect that we got Z39.50 init response
+ yazpp_1::GDU *gdu = &pack.response();
+
+ 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 ( ... ) {