X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=9969b21911ebc6bb50df50e05f2a30112df57371;hb=7467b072bb64f5c8575daa9917cce7df62d832f1;hp=a8e51163ebb69e3c824e1c54f538c67169d4fb28;hpb=834e7cda28e6f15fb39e0f58ce51268ef8b36ac4;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index a8e5116..9969b21 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,3 +1,8 @@
+/* $Id: test_filter_frontend_net.cpp,v 1.11 2005-10-29 22:23:36 marc Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 #include "config.hpp"
 #include <iostream>
@@ -5,7 +10,7 @@
 
 #include "filter_frontend_net.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
@@ -14,16 +19,16 @@
 
 using namespace boost::unit_test;
 
-class FilterInit: public yp2::Filter {
+class FilterInit: public yp2::filter::Base {
 public:
-    yp2::Package & process(yp2::Package & package) const {
-
-        Z_GDU *gdu = package.request().get();
+    void process(yp2::Package & package) const {
+        
         if (package.session().is_closed())
         {
-            // std::cout << "Got Close. Sending nothing\n";
+            // std::cout << "Got Close.\n";
         }
        
+        Z_GDU *gdu = package.request().get();
         if (gdu)
         {
             // std::cout << "Got PDU. Sending init response\n";
@@ -37,6 +42,9 @@ public:
         }
         return package.move();
     };
+    const std::string type() const {
+        return "FilterInit";
+    };
 };
 
 
@@ -45,9 +53,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);
@@ -63,25 +70,23 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 
             FilterInit tf;
 
-	    router.rule(tf);
+	    router.append(tf);
 
             // Create package with Z39.50 init request in it
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack_in(session, origin);
+	    yp2::Package pack;
 
             ODR odr = odr_createmem(ODR_ENCODE);
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
             
-            pack_in.request() = apdu;
+            pack.request() = apdu;
             odr_destroy(odr);
 	    // Done creating query. 
 
             // Put it in router
-	    pack_in.router(router).move(); 
+	    pack.router(router).move(); 
 
             // Inspect that we got Z39.50 init response
-            yazpp_1::GDU *gdu = &pack_in.response();
+            yazpp_1::GDU *gdu = &pack.response();
 
             Z_GDU *z_gdu = gdu->get();
             BOOST_CHECK(z_gdu);
@@ -90,7 +95,6 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
                 BOOST_CHECK_EQUAL(z_gdu->u.z3950->which, Z_APDU_initResponse);
             }
         }
-        BOOST_CHECK(true);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -103,19 +107,23 @@ 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
-	    router.rule(filter_front);
 
+            // 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.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);
+	    yp2::Package pack;
 	    
-	    pack_in.router(router).move(); 
+	    pack.router(router).move(); 
         }
         BOOST_CHECK(true);
     }
@@ -128,6 +136,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
  */