Update for YAZ 3s new OID system.

[metaproxy-moved-to-github.git] / src / test_filter_z3950_client.cpp

diff --git a/src/test_filter_z3950_client.cpp b/src/test_filter_z3950_client.cpp
index cb07173..4675f85 100644 (file)
--- a/src/test_filter_z3950_client.cpp
+++ b/src/test_filter_z3950_client.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_filter_z3950_client.cpp,v 1.2 2005-10-16 16:09:58 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_z3950_client.cpp,v 1.11 2007-04-13 09:57:51 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -9,8 +9,9 @@
 #include <stdexcept>
 
 #include "filter_z3950_client.hpp"
+#include "util.hpp"
 
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "session.hpp"
 #include "package.hpp"
 
@@ -19,47 +20,46 @@
 
 #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 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 )
 {
     try 
     {
-        {
-            yp2::filter::Z3950Client zc;
-        }
+        mp::filter::Z3950Client zc; // can we construct OK?
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
+BOOST_AUTO_UNIT_TEST( 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();
         
@@ -77,26 +77,25 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 )
+BOOST_AUTO_UNIT_TEST( 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(); 
@@ -119,30 +118,34 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 )
     }
 }
 
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
+BOOST_AUTO_UNIT_TEST( 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);
+        {
+            const int *oid_proxy = yaz_string_to_oid(yaz_oid_std(),
+                                                     CLASS_USERINFO,
+                                                     OID_STR_PROXY);
+            yaz_oi_set_string_oid(&apdu->u.initRequest->otherInfo,
+                                  odr, oid_proxy, 1, vhost);
+        }
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move();