X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter_frontend_net.cpp;h=d6dd1e92f35aa0029ce69803bdf69f847860829f;hb=517e528f09d1f80ccc4948f9d38eeb79f8501975;hp=ce53512a33895b657e3512fd703608a05485dbbf;hpb=f26cca046b4879a78261ea436c3e21bb3b851b52;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index ce53512..d6dd1e9 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_filter_frontend_net.cpp,v 1.12 2005-10-30 17:13:36 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_frontend_net.cpp,v 1.17 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -19,10 +19,11 @@
 #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 +34,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";
@@ -42,18 +43,15 @@ public:
         }
         return package.move();
     };
-    const std::string type() const {
-        return "FilterInit";
-    };
 };
 
 
-BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_frontend_net_1 )
 {
     try 
     {
         {
-            yp2::filter::FrontendNet nf;
+            mp::filter::FrontendNet nf;
         }
     }
     catch ( ... ) {
@@ -61,21 +59,21 @@ 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 
     {
         {
-	    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;
@@ -100,15 +98,15 @@ 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 
     {
         {
-	    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");
@@ -120,7 +118,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
             FilterInit filter_init;
 	    router.append(filter_init);
 
-	    yp2::Package pack;
+	    mp::Package pack;
 	    
 	    pack.router(router).move(); 
         }