X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_log.cpp;h=1cbf651d0374e2dd64973c3a1115e5d405c41dce;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=2e3af23eaddf119bd55531cfdaf83dcf4917e88a;hpb=7467b072bb64f5c8575daa9917cce7df62d832f1;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index 2e3af23..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.5 2005-10-29 22:23:36 marc Exp $
+/* $Id: test_filter_log.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -9,7 +9,7 @@
 #include <stdexcept>
 
 #include "filter_log.hpp"
-
+#include "util.hpp"
 #include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
@@ -32,23 +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();
     };
-    const std::string type() const {
-        return "FilterBounceInit";
-    };
 };
 
 
-BOOST_AUTO_TEST_CASE( test_filter_log_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
 {
     try 
     {
@@ -59,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 
     {
@@ -74,11 +70,10 @@ BOOST_AUTO_TEST_CASE( test_filter_log_2 )
         // 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