X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=d23ee5c5ac0780e9fcafb3281d714d0e09d832f6;hb=743341841a21a695d08c99b27a30329119030db5;hp=f1836b5b2f1dc186278bb1cd9ee6de4530368f75;hpb=b54482cdb759f092fcd07a9be4fdc8c28009b895;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp
index f1836b5..d23ee5c 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_backend_test.cpp,v 1.4 2005-10-26 18:53:49 adam Exp $
+/* $Id: test_filter_backend_test.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -24,7 +24,7 @@
 #include <boost/test/auto_unit_test.hpp>
 using namespace boost::unit_test;
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 )
 {
     try 
     {
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
 {
     try 
     {
@@ -46,13 +46,12 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
         
         yp2::Package pack;
         
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::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,7 +73,7 @@ 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 
     {
@@ -87,7 +86,7 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
         
         // send search request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
 
         yp2::util::pqf(odr, apdu, "computer");
@@ -100,7 +99,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,7 +120,7 @@ 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 
     {
@@ -135,13 +133,12 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
         
         // send present request as first request.. That should fail with
         // a close from the backend
-        ODR odr = odr_createmem(ODR_ENCODE);
+        yp2::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();