Year 2007.

[metaproxy-moved-to-github.git] / src / test_filter_log.cpp

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index 2e3af23..4430313 100644 (file)
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_filter_log.cpp,v 1.5 2005-10-29 22:23:36 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_log.cpp,v 1.11 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -9,7 +9,7 @@
 #include <stdexcept>
 
 #include "filter_log.hpp"
-
+#include "util.hpp"
 #include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
@@ -18,10 +18,11 @@
 #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,53 +33,48 @@ 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();
     };
-    const std::string type() const {
-        return "FilterBounceInit";
-    };
 };
 
 
-BOOST_AUTO_TEST_CASE( test_filter_log_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
 {
     try 
     {
-        yp2::filter::Log lf;
+        mp::filter::Log lf;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_log_2 )
+BOOST_AUTO_UNIT_TEST( 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