X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=b209730eb4b5d6fe6fe12e6fc357d76b41baf197;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=f3db9ee96a72eb7e0743ab77bfe105d54b96087d;hpb=d7b1186d1f020678b617e2368415485bffef93f9;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp
index f3db9ee..b209730 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,5 +1,5 @@
-/* $Id: test_filter_backend_test.cpp,v 1.2 2005-10-26 10:21:03 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_backend_test.cpp,v 1.7 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -8,7 +8,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "test_util.hpp"
+#include "util.hpp"
 #include "filter_backend_test.hpp"
 #include "filter_log.hpp"
 
@@ -24,35 +24,36 @@
 #include <boost/test/auto_unit_test.hpp>
 using namespace boost::unit_test;
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 )
+namespace mp = metaproxy_1;
+
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 )
 {
     try 
     {
-        yp2::filter::Backend_test btest;
+        mp::filter::Backend_test btest;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
-        router.rule(btest);
+        mp::filter::Backend_test btest;
+        router.append(btest);
         
-        yp2::Package pack;
+        mp::Package pack;
         
-        ODR odr = odr_createmem(ODR_ENCODE);
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move(); 
@@ -74,23 +75,23 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
-        router.rule(btest);
+        mp::filter::Backend_test btest;
+        router.append(btest);
         
-        yp2::Package pack;
+        mp::Package pack;
         
         // send search request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
 
-        yp2::util::pqf(odr, apdu, "computer");
+        mp::util::pqf(odr, apdu, "computer");
         
         apdu->u.searchRequest->num_databaseNames = 1;
         apdu->u.searchRequest->databaseNames = (char**)
@@ -100,7 +101,6 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move(); 
@@ -122,26 +122,25 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
-        router.rule(btest);
+        mp::filter::Backend_test btest;
+        router.append(btest);
         
-        yp2::Package pack;
+        mp::Package pack;
         
         // send present request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest);
 
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move();