-/* $Id: test_filter_virt_db.cpp,v 1.6 2005-10-26 10:55:26 marc Exp $
+/* $Id: test_filter_virt_db.cpp,v 1.9 2005-12-02 12:21:07 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include <iostream>
#include <stdexcept>
-#include "test_util.hpp"
+#include "util.hpp"
#include "filter_virt_db.hpp"
#include "filter_backend_test.hpp"
#include "filter_log.hpp"
using namespace boost::unit_test;
-BOOST_AUTO_TEST_CASE( test_filter_virt_db_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_virt_db_1 )
{
try
{
}
}
-BOOST_AUTO_TEST_CASE( test_filter_virt_db_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_virt_db_2 )
{
try
{
// own init response (regardless of backend)
yp2::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
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();
static void init(yp2::Package &pack, yp2::Router &router)
{
// Create package with Z39.50 init request in it
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
BOOST_CHECK(apdu);
return;
pack.request() = apdu;
- odr_destroy(odr);
// Put it in router
pack.router(router).move();
{
// Create package with Z39.50 search request in it
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
yp2::util::pqf(odr, apdu, query);
pack.request() = apdu;
- odr_destroy(odr);
-
Z_GDU *gdu_test = pack.request().get();
BOOST_CHECK(gdu_test);
{
// Create package with Z39.50 present request in it
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest);
apdu->u.presentRequest->resultSetId = odr_strdup(odr, setname);
pack.request() = apdu;
- odr_destroy(odr);
-
Z_GDU *gdu_test = pack.request().get();
BOOST_CHECK(gdu_test);
BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_presentResponse);
}
-BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 )
+BOOST_AUTO_UNIT_TEST( test_filter_virt_db_3 )
{
try
{