X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=1eb796e7975802b25ab6e6306a9a75d55d21f39d;hb=235ec6eb8e28884ca223a5d451aa83b18909acd9;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..1eb796e 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,34 +1,48 @@
-/* $Id: test_filter_backend_test.cpp,v 1.4 2005-10-26 18:53:49 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2010 Index Data
 
-%LICENSE%
- */
+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
+*/
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "filter_backend_test.hpp"
 #include "filter_log.hpp"
 
 #include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
 
 #include <yaz/zgdu.h>
 #include <yaz/pquery.h>
 #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;
 
+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);
@@ -39,20 +53,19 @@ 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;
         
-        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(); 
@@ -78,19 +91,19 @@ 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
-        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 +113,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(); 
@@ -126,22 +138,21 @@ 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
-        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(); 
@@ -167,8 +178,9 @@ BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+