X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_z3950_client.cpp;h=3e66adec4148558bfa693ec8062f44cd6aab181c;hb=c1d953eee6c00432493bc364da6284704ccd9cc2;hp=cb0717309dc8ddabe988c2cd1bc3697e87677eaf;hpb=d7e08b36e1d7e76b3f14616d8dede97bdbb16c03;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp
index cb07173..3e66ade 100644
--- a/src/test_filter_z3950_client.cpp
+++ b/src/test_filter_z3950_client.cpp
@@ -1,34 +1,47 @@
-/* $Id: test_filter_z3950_client.cpp,v 1.2 2005-10-16 16:09:58 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 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 "filter_z3950_client.hpp"
+#include <metaproxy/util.hpp>
 
-#include "router.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include "router_chain.hpp"
+#include <metaproxy/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;
-        }
+        mp::filter::Z3950Client zc; // can we construct OK?
     }
     catch ( ... ) {
         BOOST_CHECK (false);
@@ -39,27 +52,26 @@ 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(); 
         
-        // Inspect that we got Z39.50 init Response - a Z39.50 session
+        // Inspect that we got Z39.50 init Response - a Z39.50 session MUST
         // specify a virtual host
         yazpp_1::GDU *gdu = &pack.response();
         
@@ -81,22 +93,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(); 
@@ -123,26 +134,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(); 
@@ -172,8 +184,9 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_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
  */
+