X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_log.cpp;h=1cbf651d0374e2dd64973c3a1115e5d405c41dce;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=0c2e6d80b63594376ee10eee9ab03f72a02c0224;hpb=cf09b1981338f07c333e43e0a2c907012c841c5d;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index 0c2e6d8..1cbf651 100644
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_log.cpp,v 1.2 2005-10-25 11:48:30 adam Exp $
+/* $Id: test_filter_log.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -9,8 +9,8 @@
 #include <stdexcept>
 
 #include "filter_log.hpp"
-
-#include "router.hpp"
+#include "util.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
@@ -32,20 +32,19 @@ public:
         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 
     {
@@ -56,7 +55,7 @@ BOOST_AUTO_TEST_CASE( test_filter_log_1 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_log_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_log_2 )
 {
     try 
     {
@@ -65,17 +64,16 @@ BOOST_AUTO_TEST_CASE( test_filter_log_2 )
         yp2::filter::Log lf;
         FilterBounceInit bf;
         
-        router.rule(lf);
-        router.rule(bf);
+        router.append(lf);
+        router.append(bf);
         
         // Create package with Z39.50 init request in it
         yp2::Package pack;
         
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         // Done creating query. 
         
         // Put it in router