X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_log.cpp;h=38881e27e467720885b7d5dc29e9c9479801fe7d;hb=7e75c6abaa325fd42359128e8e91572beb17628b;hp=b8def0b29fdfc7b9f2083a82c3d9328d8d7553e9;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_log.cpp b/src/test_filter_log.cpp
index b8def0b..38881e2 100644
--- a/src/test_filter_log.cpp
+++ b/src/test_filter_log.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter_log.cpp,v 1.12 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 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
@@ -14,22 +12,21 @@ 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.
- */
+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 "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/util.hpp>
+#include <metaproxy/router_chain.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;
@@ -38,31 +35,29 @@ namespace mp = metaproxy_1;
 class FilterBounceInit: public mp::filter::Base {
 public:
     void process(mp::Package & package) const {
-        
+
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
         }
-       
+
         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 
+    try
     {
         mp::filter::Log lf;
     }
@@ -71,33 +66,33 @@ 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 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::Log lf;
         FilterBounceInit bf;
-        
+
         router.append(lf);
         router.append(bf);
-        
+
         // Create package with Z39.50 init request in it
         mp::Package pack;
-        
+
         mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-        
+
         pack.request() = apdu;
-        // Done creating query. 
-        
+        // Done creating query.
+
         // Put it in router
-        pack.router(router).move(); 
-        
+        pack.router(router).move();
+
         // Inspect that we got Z39.50 init response
         yazpp_1::GDU *gdu = &pack.response();
-        
+
         Z_GDU *z_gdu = gdu->get();
         BOOST_CHECK(z_gdu);
         if (z_gdu) {
@@ -113,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
  */
+