Use namespace yp2::filter for filters .. Rename filters from

[metaproxy-moved-to-github.git] / src / test_filter_frontend_net.cpp

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index abba95b..9b74cd3 100644 (file)
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -14,7 +14,7 @@
 
 using namespace boost::unit_test;
 
-class FilterInit: public yp2::Filter {
+class FilterInit: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {
 
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
     try 
     {
         {
-            yp2::FilterFrontendNet nf;
+            yp2::filter::FrontendNet nf;
         }
     }
     catch ( ... ) {
@@ -65,9 +65,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
            router.rule(tf);
 
             // Create package with Z39.50 init request in it
-            yp2::Session session;
-            yp2::Origin origin;
-           yp2::Package pack(session, origin);
+           yp2::Package pack;
 
             ODR odr = odr_createmem(ODR_ENCODE);
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
@@ -103,18 +101,19 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
            yp2::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
+            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(session, origin);
+           yp2::Package pack;
            
            pack.router(router).move(); 
         }