X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_log.cpp;h=0f49e12a9478df352d38972170e68f7bbe7c321b;hb=55248f83c4d706bc529873d01d3696388e816d32;hp=a6f71b1070f6fc6da6a72ea8eacc78dee2956848;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index a6f71b1..0f49e12 100644
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,20 +1,32 @@
-/* $Id: test_filter_log.cpp,v 1.10 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2012 Index Data
 
-   See the LICENSE file for details
- */
+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;
@@ -30,22 +42,20 @@ public:
         }
        
         Z_GDU *gdu = package.request().get();
-        if (gdu)
+        if (gdu && gdu->which == Z_GDU_Z3950)
         {
             // std::cout << "Got PDU. Sending init response\n";
             mp::odr odr;
-            Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-            
-            apdu->u.initResponse->implementationName = "YP2/YAZ";
-            
+            Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
             package.response() = apdu;
         }
         return package.move();
     };
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
+BOOST_AUTO_TEST_CASE( test_filter_log_1 )
 {
     try 
     {
@@ -56,7 +66,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_log_1 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_log_2 )
+BOOST_AUTO_TEST_CASE( test_filter_log_2 )
 {
     try 
     {
@@ -98,8 +108,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
  */
+