X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=74f2c42869f5e3524b16dc4db5ab2aeb6987e0aa;hb=0264192f26c10308aad161983ea29568c96521a6;hp=f5ea15a6bb549b4a93f15ebb0550217b9c2f24e1;hpb=57c1c4822f1de4d983c1aee3bc6059ad2600d991;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index f5ea15a..74f2c42 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,29 +1,68 @@
+/* $Id: test_filter_frontend_net.cpp,v 1.19 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+/* $Id: test_filter_frontend_net.cpp,v 1.19 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+   See the LICENSE file for details
+ */
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
-#include "router.hpp"
+#include "util.hpp"
+#include "filter_frontend_net.hpp"
+
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
-#include "filter_frontend_net.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
-class FilterInit: public yp2::Filter {
+class FilterInit: public mp::filter::Base {
 public:
-    yp2::Package & process(yp2::Package & package) const {
-        ODR odr = odr_createmem(ODR_ENCODE);
-        Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-
-        apdu->u.initResponse->implementationName = "YP2/YAZ";
-
-        package.response() = apdu;
-        odr_destroy(odr);
-	return package.move();
+    void process(mp::Package & package) const {
+        
+        if (package.session().is_closed())
+        {
+            // std::cout << "Got Close.\n";
+        }
+       
+        Z_GDU *gdu = package.request().get();
+        if (gdu)
+        {
+            // 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";
+            
+            package.response() = apdu;
+        }
+        return package.move();
     };
 };
 
@@ -33,9 +72,8 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
     try 
     {
         {
-            yp2::FilterFrontendNet nf;
+            mp::filter::FrontendNet nf;
         }
-        BOOST_CHECK(true);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -47,24 +85,34 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             FilterInit tf;
 
-	    router.rule(tf);
+	    router.append(tf);
 
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack_in(session, origin);
-	    
-	    pack_in.router(router).move(); 
+            // 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. 
+
+            // Put it in router
+	    pack.router(router).move(); 
 
-            yazpp_1::GDU *gdu = &pack_in.response();
+            // Inspect that we got Z39.50 init response
+            yazpp_1::GDU *gdu = &pack.response();
 
-            BOOST_CHECK_EQUAL(gdu->get()->which, Z_GDU_Z3950);
-            BOOST_CHECK_EQUAL(gdu->get()->u.z3950->which, Z_APDU_initResponse);
+            Z_GDU *z_gdu = gdu->get();
+            BOOST_CHECK(z_gdu);
+            if (z_gdu) {
+                BOOST_CHECK_EQUAL(z_gdu->which, Z_GDU_Z3950);
+                BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse);
+            }
         }
-        BOOST_CHECK(true);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -76,21 +124,24 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
+
+            // put in frontend first
+            mp::filter::FrontendNet filter_front;
 
-            yp2::FilterFrontendNet filter_front;
-            filter_front.listen_address() = "unix:socket";
-            filter_front.listen_duration() = 2;  // listen a short time only
-	    router.rule(filter_front);
+            std::vector <std::string> ports;
+            ports.insert(ports.begin(), "unix:socket");
+            filter_front.ports() = ports;
+            filter_front.listen_duration() = 1;  // listen a short time only
+	    router.append(filter_front);
 
+            // put in a backend
             FilterInit filter_init;
-	    router.rule(filter_init);
+	    router.append(filter_init);
 
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack_in(session, origin);
+	    mp::Package pack;
 	    
-	    pack_in.router(router).move(); 
+	    pack.router(router).move(); 
         }
         BOOST_CHECK(true);
     }
@@ -103,6 +154,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */