X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=ffcfe66e3f974610e83f2f4b433dd18092038bcc;hb=0264192f26c10308aad161983ea29568c96521a6;hp=d23ee5c5ac0780e9fcafb3281d714d0e09d832f6;hpb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp
index d23ee5c..ffcfe66 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,7 +1,22 @@
-/* $Id: test_filter_backend_test.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_backend_test.cpp,v 1.12 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
@@ -21,32 +36,35 @@
 #include <yaz/otherinfo.h>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 using namespace boost::unit_test;
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 )
+namespace mp = metaproxy_1;
+
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 )
 {
     try 
     {
-        yp2::filter::Backend_test btest;
+        mp::filter::BackendTest btest;
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
+        mp::filter::BackendTest btest;
         router.append(btest);
         
-        yp2::Package pack;
+        mp::Package pack;
         
-        yp2::odr odr;
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         BOOST_CHECK(apdu);
@@ -73,23 +91,23 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
+        mp::filter::BackendTest 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
-        yp2::odr odr;
+        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**)
@@ -120,20 +138,20 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Backend_test btest;
+        mp::filter::BackendTest 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
-        yp2::odr odr;
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest);
 
         BOOST_CHECK(apdu);