X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=78e18684a9bd52ea4f9b63d73ff2dffcf944b687;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=4648222d10cadc8b6367a47cef0efac0d98cbaba;hpb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index 4648222..78e1868 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,7 +1,24 @@
-/* $Id: test_filter_frontend_net.cpp,v 1.14 2005-12-02 12:21:07 adam Exp $
-   Copyright (c) 2005, Index Data.
-
-%LICENSE%
+/* 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
+*/
+/* $Id: test_filter_frontend_net.cpp,v 1.20 2008-02-20 15:07:53 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -16,13 +33,15 @@
 #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::Base {
+class FilterInit: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const {
+    void process(mp::Package & package) const {
         
         if (package.session().is_closed())
         {
@@ -33,7 +52,7 @@ public:
         if (gdu)
         {
             // std::cout << "Got PDU. Sending init response\n";
-            yp2::odr odr;
+            mp::odr odr;
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
             
             apdu->u.initResponse->implementationName = "YP2/YAZ";
@@ -45,12 +64,12 @@ public:
 };
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
+BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
 {
     try 
     {
         {
-            yp2::filter::FrontendNet nf;
+            mp::filter::FrontendNet nf;
         }
     }
     catch ( ... ) {
@@ -58,21 +77,21 @@ BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 )
+BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 {
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             FilterInit tf;
 
 	    router.append(tf);
 
             // Create package with Z39.50 init request in it
-	    yp2::Package pack;
+	    mp::Package pack;
 
-            yp2::odr odr;
+            mp::odr odr;
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
             
             pack.request() = apdu;
@@ -97,27 +116,27 @@ BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_2 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_3 )
+BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
 {
     try 
     {
         {
-	    yp2::RouterChain router;
+	    mp::RouterChain router;
 
             // put in frontend first
-            yp2::filter::FrontendNet filter_front;
+            mp::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
+            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.append(filter_init);
 
-	    yp2::Package pack;
+	    mp::Package pack;
 	    
 	    pack.router(router).move(); 
         }