X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_auth_simple.cpp;h=f66445e119fb0c8938912306bc4251aa432aba2e;hb=54c6c2c4fa4378ced846240bea454bc9583f48da;hp=1c782d8a4a5015c5a19bb478d9f43314fddc80c9;hpb=e9530d6289df9b848e4901d7c73f5a2f27706d66;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_auth_simple.cpp b/src/test_filter_auth_simple.cpp
index 1c782d8..f66445e 100644
--- a/src/test_filter_auth_simple.cpp
+++ b/src/test_filter_auth_simple.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2008 Index Data
+   Copyright (C) 2005-2013 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
@@ -21,10 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdexcept>
 
 #include "filter_auth_simple.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
@@ -36,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;
         }
         package.move();
     };
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
 
 BOOST_AUTO_TEST_CASE( test_filter_auth_simple_1 )
 {
-    try 
+    try
     {
         mp::filter::AuthSimple lf;
     }
@@ -71,31 +68,31 @@ BOOST_AUTO_TEST_CASE( test_filter_auth_simple_1 )
 
 BOOST_AUTO_TEST_CASE( test_filter_auth_simple2 )
 {
-    try 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::AuthSimple auth;
         FilterBounceInit bounce;
-        
+
         router.append(auth);
         router.append(bounce);
-        
+
         // 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) {
@@ -111,8 +108,9 @@ BOOST_AUTO_TEST_CASE( test_filter_auth_simple2 )
 /*
  * 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
  */
+