X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=7bdb01a53392c7c93430b924d8fd3604a8aca99e;hb=f82b19f2b93707657fee804bd1242f2548d51ada;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..7bdb01a 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,29 +1,46 @@
+/* $Id: test_filter_frontend_net.cpp,v 1.7 2005-10-15 14:09:09 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
+#include "filter_frontend_net.hpp"
+
 #include "router.hpp"
 #include "session.hpp"
 #include "package.hpp"
-#include "filter_frontend_net.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
 
-class FilterInit: public yp2::Filter {
+class FilterInit: public yp2::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";
+    void process(yp2::Package & package) const {
 
-        package.response() = apdu;
-        odr_destroy(odr);
-	return package.move();
+        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";
+            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();
     };
 };
 
@@ -33,9 +50,8 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
     try 
     {
         {
-            yp2::FilterFrontendNet nf;
+            yp2::filter::FrontendNet nf;
         }
-        BOOST_CHECK(true);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -53,18 +69,29 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 
 	    router.rule(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
+	    yp2::Package pack;
 
-            yazpp_1::GDU *gdu = &pack_in.response();
+            ODR odr = odr_createmem(ODR_ENCODE);
+            Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
+            
+            pack.request() = apdu;
+            odr_destroy(odr);
+	    // Done creating query. 
 
-            BOOST_CHECK_EQUAL(gdu->get()->which, Z_GDU_Z3950);
-            BOOST_CHECK_EQUAL(gdu->get()->u.z3950->which, Z_APDU_initResponse);
+            // Put it in router
+	    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) {
+                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);
@@ -78,19 +105,22 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
         {
 	    yp2::RouterChain router;
 
-            yp2::FilterFrontendNet filter_front;
-            filter_front.listen_address() = "unix:socket";
-            filter_front.listen_duration() = 2;  // listen a short time only
+            // put in frontend first
+            yp2::filter::FrontendNet 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.rule(filter_front);
 
+            // put in a backend
             FilterInit filter_init;
 	    router.rule(filter_init);
 
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack_in(session, origin);
+	    yp2::Package pack;
 	    
-	    pack_in.router(router).move(); 
+	    pack.router(router).move(); 
         }
         BOOST_CHECK(true);
     }
@@ -103,6 +133,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
  */