X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=8b5a47d86c58e8fd1f397a1e5d460782f3f21d52;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=abba95bb58bb07f312794d01b8f6cb4b8999d337;hpb=cea1fb12604fd1ddbac6804b95c4aff078d30409;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index abba95b..8b5a47d 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,23 +1,43 @@
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 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
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
+#include "util.hpp"
 #include "filter_frontend_net.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.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:
-    void process(yp2::Package & package) const {
-
+    void process(mp::Package & package) const {
+        
         if (package.session().is_closed())
         {
             // std::cout << "Got Close.\n";
@@ -27,13 +47,12 @@ public:
         if (gdu)
         {
             // std::cout << "Got PDU. Sending init response\n";
-            ODR odr = odr_createmem(ODR_ENCODE);
+            mp::odr odr;
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
             
             apdu->u.initResponse->implementationName = "YP2/YAZ";
             
             package.response() = apdu;
-            odr_destroy(odr);
         }
         return package.move();
     };
@@ -45,7 +64,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
     try 
     {
         {
-            yp2::FilterFrontendNet nf;
+            mp::filter::FrontendNet nf;
         }
     }
     catch ( ... ) {
@@ -58,22 +77,19 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             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(session, origin);
+	    mp::Package pack;
 
-            ODR odr = odr_createmem(ODR_ENCODE);
+            mp::odr odr;
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
             
             pack.request() = apdu;
-            odr_destroy(odr);
 	    // Done creating query. 
 
             // Put it in router
@@ -100,21 +116,22 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             // put in frontend first
-            yp2::FilterFrontendNet filter_front;
-            filter_front.listen_address() = "unix:socket";
-            filter_front.listen_duration() = 2;  // listen a short time only
-	    router.rule(filter_front);
+            mp::filter::FrontendNet filter_front;
+
+            std::vector <std::string> ports;
+            ports.insert(ports.begin(), "unix:socket");
+            filter_front.set_ports(ports);
+            filter_front.set_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(session, origin);
+	    mp::Package pack;
 	    
 	    pack.router(router).move(); 
         }
@@ -128,7 +145,9 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+