X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter_z3950_client.cpp;h=b0a9c14e5bc34428da87c16ffdf42b6ea1aaa27d;hb=0ab6e8aba7de1ea5cf109de175f56c9d8f7f49bc;hp=7090d4c23d790adf7da3a5bd687b8e79f48dff62;hpb=d732b2b2ea19a0669f9a42ca6fd7bc14a3845fc5;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp
index 7090d4c..b0a9c14 100644
--- a/src/test_filter_z3950_client.cpp
+++ b/src/test_filter_z3950_client.cpp
@@ -1,7 +1,22 @@
-/* $Id: test_filter_z3950_client.cpp,v 1.3 2005-10-24 14:33:30 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_z3950_client.cpp,v 1.14 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"
@@ -9,24 +24,28 @@
 #include <stdexcept>
 
 #include "filter_z3950_client.hpp"
+#include "util.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 #include <yaz/zgdu.h>
 #include <yaz/otherinfo.h>
-using namespace boost::unit_test;
+#include <yaz/oid_db.h>
 
+using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
 BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 )
 {
     try 
     {
-        yp2::filter::Z3950Client zc; // can we construct OK?
+        mp::filter::Z3950Client zc; // can we construct OK?
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -37,22 +56,21 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Z3950Client zc;
+        mp::filter::Z3950Client zc;
         
-        router.rule(zc);
+        router.append(zc);
         
         // Create package with Z39.50 init request in it
-        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(); 
@@ -79,22 +97,21 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Z3950Client zc;
+        mp::filter::Z3950Client zc;
 
-        router.rule(zc);
+        router.append(zc);
         
         // Create package with Z39.50 present request in it
-        yp2::Package pack;
+        mp::Package pack;
         
-        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(); 
@@ -121,26 +138,27 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
 {
     try 
     {
-        yp2::RouterChain router;
+        mp::RouterChain router;
         
-        yp2::filter::Z3950Client zc;
+        mp::filter::Z3950Client zc;
         
-        router.rule(zc);
+        router.append(zc);
         
         // Create package with Z39.50 init request in it
-        yp2::Package pack;
+        mp::Package pack;
         
-        ODR odr = odr_createmem(ODR_ENCODE);
+        mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
         
         const char *vhost = "localhost:9999";
         if (vhost)
-            yaz_oi_set_string_oidval(&apdu->u.initRequest->otherInfo,
-                                     odr, VAL_PROXY, 1, vhost);
+        {
+            yaz_oi_set_string_oid(&apdu->u.initRequest->otherInfo,
+                                  odr, yaz_oid_userinfo_proxy, 1, vhost);
+        }
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move();