projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #1064: Test test_thread_pool_observer hangs.
[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
7090d4c
..
2785abe
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.3 2005-10-24 14:33:30 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: test_filter_z3950_client.cpp,v 1.12 2007-04-16 21:54:52 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
#include "config.hpp"
*/
#include "config.hpp"
@@
-9,8
+9,9
@@
#include <stdexcept>
#include "filter_z3950_client.hpp"
#include <stdexcept>
#include "filter_z3950_client.hpp"
+#include "util.hpp"
-#include "router.hpp"
+#include "router_chain.hpp"
#include "session.hpp"
#include "package.hpp"
#include "session.hpp"
#include "package.hpp"
@@
-19,40
+20,41
@@
#include <yaz/zgdu.h>
#include <yaz/otherinfo.h>
#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
{
{
try
{
- yp2::filter::Z3950Client zc; // can we construct OK?
+ mp::filter::Z3950Client zc; // can we construct OK?
}
catch ( ... ) {
BOOST_CHECK (false);
}
}
}
catch ( ... ) {
BOOST_CHECK (false);
}
}
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_2 )
{
try
{
{
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
// 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;
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();
// Put it in router
pack.router(router).move();
@@
-75,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
{
{
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
// 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;
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();
// Put it in router
pack.router(router).move();
@@
-117,30
+118,31
@@
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
{
{
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
// 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)
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;
BOOST_CHECK(apdu);
pack.request() = apdu;
- odr_destroy(odr);
// Put it in router
pack.router(router).move();
// Put it in router
pack.router(router).move();