X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=4648222d10cadc8b6367a47cef0efac0d98cbaba;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=8af770dc439ca72fc12c6788808cdf1a6627b17c;hpb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index 8af770d..4648222 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_frontend_net.cpp,v 1.8 2005-10-16 16:05:44 adam Exp $
+/* $Id: test_filter_frontend_net.cpp,v 1.14 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -8,9 +8,10 @@
 #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"
 
@@ -32,20 +33,19 @@ public:
         if (gdu)
         {
             // std::cout << "Got PDU. Sending init response\n";
-            ODR odr = odr_createmem(ODR_ENCODE);
+            yp2::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();
     };
 };
 
 
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
 {
     try 
     {
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 )
 {
     try 
     {
@@ -67,16 +67,15 @@ 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::Package pack;
 
-            ODR odr = odr_createmem(ODR_ENCODE);
+            yp2::odr odr;
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
             
             pack.request() = apdu;
-            odr_destroy(odr);
 	    // Done creating query. 
 
             // Put it in router
@@ -98,7 +97,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_3 )
 {
     try 
     {
@@ -112,11 +111,11 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
             ports.insert(ports.begin(), "unix:socket");
             filter_front.ports() = ports;
             filter_front.listen_duration() = 1;  // listen a short time only
-	    router.rule(filter_front);
+	    router.append(filter_front);
 
             // put in a backend
             FilterInit filter_init;
-	    router.rule(filter_init);
+	    router.append(filter_init);
 
 	    yp2::Package pack;