X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=ee107d7d328f557594946c813b8dfc5eeefa39c8;hb=94731cca473cc9ce0cbda7a1b51ce4c0d509a15f;hp=a561258bb1ca81d35960ed07ef1d862c3eef8283;hpb=0547b0ccdb89ccc0728741c61d3115ede8c37571;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp
index a561258..ee107d7 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_backend_test.cpp,v 1.1 2005-10-25 21:32:28 adam Exp $
+/* $Id: test_filter_backend_test.cpp,v 1.5 2005-10-30 17:13:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -8,11 +8,11 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "test_util.hpp"
+#include "util.hpp"
 #include "filter_backend_test.hpp"
 #include "filter_log.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
@@ -42,17 +42,16 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
         yp2::RouterChain router;
         
         yp2::filter::Backend_test btest;
-        router.rule(btest);
+        router.append(btest);
         
         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(); 
@@ -81,13 +80,13 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
         yp2::RouterChain router;
         
         yp2::filter::Backend_test btest;
-        router.rule(btest);
+        router.append(btest);
         
         yp2::Package pack;
         
         // send search request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
 
         yp2::util::pqf(odr, apdu, "computer");
@@ -100,7 +99,6 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move(); 
@@ -129,19 +127,18 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
         yp2::RouterChain router;
         
         yp2::filter::Backend_test btest;
-        router.rule(btest);
+        router.append(btest);
         
         yp2::Package pack;
         
         // send present request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::odr odr;
         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();