X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_log.cpp;h=4197ec54b258451aaf2dbb71e1154f35698a0570;hb=0264192f26c10308aad161983ea29568c96521a6;hp=8a7fc66634f5208de852bbf5b81d877219e11333;hpb=e9420d437bd61c8683058af046a8dd90c859b6bc;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index 8a7fc66..4197ec5 100644
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,7 +1,22 @@
-/* $Id: test_filter_log.cpp,v 1.4 2005-10-26 10:55:26 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_log.cpp,v 1.13 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
@@ -9,19 +24,21 @@
 #include <stdexcept>
 
 #include "filter_log.hpp"
-
+#include "util.hpp"
 #include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
-class FilterBounceInit: public yp2::filter::Base {
+class FilterBounceInit: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const {
+    void process(mp::Package & package) const {
         
         if (package.session().is_closed())
         {
@@ -32,13 +49,12 @@ public:
         if (gdu)
         {
             // std::cout << "Got PDU. Sending init response\n";
-            ODR odr = odr_createmem(ODR_ENCODE);
+            mp::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();
     };
@@ -49,7 +65,7 @@ BOOST_AUTO_TEST_CASE( test_filter_log_1 )
 {
     try 
     {
-        yp2::filter::Log lf;
+        mp::filter::Log lf;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -60,22 +76,21 @@ BOOST_AUTO_TEST_CASE( test_filter_log_2 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Log lf;
+        mp::filter::Log lf;
         FilterBounceInit bf;
         
         router.append(lf);
         router.append(bf);
         
         // Create package with Z39.50 init request in it
-        yp2::Package pack;
+        mp::Package pack;
         
-        ODR odr = odr_createmem(ODR_ENCODE);
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         // Done creating query. 
         
         // Put it in router