Add LICENSE file and Refer to it from the source. Include license material

[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 4f93e38..018c97c 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.4 2005-10-26 10:21:03 marc Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_z3950_client.cpp,v 1.9 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -9,6 +9,7 @@
 #include <stdexcept>
 
 #include "filter_z3950_client.hpp"
+#include "util.hpp"
 
 #include "router_chain.hpp"
 #include "session.hpp"
@@ -19,40 +20,40 @@
 
 #include <yaz/zgdu.h>
 #include <yaz/otherinfo.h>
-using namespace boost::unit_test;
 
+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; // can we construct OK?
+        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(); 
@@ -75,26 +76,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(); 
@@ -117,20 +117,20 @@ 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";
@@ -140,7 +140,6 @@ BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
         BOOST_CHECK(apdu);
         
         pack.request() = apdu;
-        odr_destroy(odr);
         
         // Put it in router
         pack.router(router).move();