X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=945a242ed6b209ea655131f4022f493989b774a0;hb=36cd7b13f11bb7269d4335c5a4053270ae886051;hp=78e18684a9bd52ea4f9b63d73ff2dffcf944b687;hpb=e9530d6289df9b848e4901d7c73f5a2f27706d66;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index 78e1868..945a242 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) 2005-2011 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
@@ -15,22 +15,16 @@ 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
 */
-/* $Id: test_filter_frontend_net.cpp,v 1.20 2008-02-20 15:07:53 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-   See the LICENSE file for details
- */
 
 #include "config.hpp"
 #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/package.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
@@ -49,14 +43,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";
             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();
@@ -72,6 +63,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
             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);
     }
@@ -111,6 +106,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);
     }
@@ -142,6 +141,10 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
         }
         BOOST_CHECK(true);
     }
+    catch (std::runtime_error &e) {
+        std::cerr << "std::runtime error: " << e.what() << std::endl;
+        BOOST_CHECK(false);
+    }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
@@ -150,8 +153,9 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
 /*
  * 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
  */
+