X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=ba51d8a1827db8e44edd3bf8516aa29c7a67b92c;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=8b5a47d86c58e8fd1f397a1e5d460782f3f21d52;hpb=665559cbc22546e8df69be33a7d492294cab9fb1;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index 8b5a47d..ba51d8a 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2008 Index Data
+   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
@@ -20,12 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <iostream>
 #include <stdexcept>
 
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "filter_frontend_net.hpp"
 
-#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
@@ -37,36 +36,38 @@ namespace mp = metaproxy_1;
 class FilterInit: 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_TEST_CASE( test_filter_frontend_net_1 )
 {
-    try 
+    try
     {
         {
             mp::filter::FrontendNet nf;
         }
     }
+    catch (std::runtime_error &e) {
+        std::cerr << "std::runtime error: " << e.what() << std::endl;
+        BOOST_CHECK(false);
+    }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
@@ -74,7 +75,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
 
 BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 {
-    try 
+    try
     {
         {
 	    mp::RouterChain router;
@@ -88,12 +89,12 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 
             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();
@@ -106,6 +107,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
             }
         }
     }
+    catch (std::runtime_error &e) {
+        std::cerr << "std::runtime error: " << e.what() << std::endl;
+        BOOST_CHECK(false);
+    }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
@@ -113,7 +118,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 
 BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
 {
-    try 
+    try
     {
         {
 	    mp::RouterChain router;
@@ -132,11 +137,15 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
 	    router.append(filter_init);
 
 	    mp::Package pack;
-	    
-	    pack.router(router).move(); 
+
+	    pack.router(router).move();
         }
         BOOST_CHECK(true);
     }
+    catch (std::runtime_error &e) {
+        std::cerr << "std::runtime error: " << e.what() << std::endl;
+        BOOST_CHECK(false);
+    }
     catch ( ... ) {
         BOOST_CHECK (false);
     }