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

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index 1cbf651..9b2626c 100644
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,27 +1,40 @@
-/* $Id: test_filter_log.cpp,v 1.8 2005-12-02 12:21:07 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2010 Index Data
 
-%LICENSE%
- */
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
 #include "filter_log.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/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())
         {
@@ -29,14 +42,11 @@ public:
         }
        
         Z_GDU *gdu = package.request().get();
-        if (gdu)
+        if (gdu && gdu->which == Z_GDU_Z3950)
         {
             // std::cout << "Got PDU. Sending init response\n";
-            yp2::odr odr;
-            Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-            
-            apdu->u.initResponse->implementationName = "YP2/YAZ";
-            
+            mp::odr odr;
+            Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
             package.response() = apdu;
         }
         return package.move();
@@ -44,33 +54,33 @@ public:
 };
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
+BOOST_AUTO_TEST_CASE( test_filter_log_1 )
 {
     try 
     {
-        yp2::filter::Log lf;
+        mp::filter::Log lf;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_log_2 )
+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;
         
-        yp2::odr odr;
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         pack.request() = apdu;
@@ -97,8 +107,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_log_2 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+