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
Move methods jump_to_... and check_element_yp2 to xmlutil.
[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
..
c3cbd2c
100644
(file)
--- a/
src/test_filter_z3950_client.cpp
+++ b/
src/test_filter_z3950_client.cpp
@@
-1,4
+1,4
@@
-/* $Id: test_filter_z3950_client.cpp,v 1.2 2005-10-16 16:09:58 adam Exp $
+/* $Id: test_filter_z3950_client.cpp,v 1.7 2005-12-02 12:21:07 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
Copyright (c) 2005, Index Data.
%LICENSE%
@@
-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"
@@
-22,20
+23,18
@@
using namespace boost::unit_test;
using namespace boost::unit_test;
-BOOST_AUTO_TEST_CASE( test_filter_z3950_client_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_z3950_client_1 )
{
try
{
{
try
{
- {
- yp2::filter::Z3950Client zc;
- }
+ yp2::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
{
@@
-43,23
+42,22
@@
BOOST_AUTO_TEST_CASE( test_filter_z3950_client_2 )
yp2::filter::Z3950Client zc;
yp2::filter::Z3950Client zc;
- router.rule(zc);
+ router.append(zc);
// Create package with Z39.50 init request in it
yp2::Package pack;
// Create package with Z39.50 init request in it
yp2::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::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();
- // 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();
// specify a virtual host
yazpp_1::GDU *gdu = &pack.response();
@@
-77,7
+75,7
@@
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
{
@@
-85,18
+83,17
@@
BOOST_AUTO_TEST_CASE( test_filter_z3950_client_3 )
yp2::filter::Z3950Client zc;
yp2::filter::Z3950Client zc;
- router.rule(zc);
+ router.append(zc);
// Create package with Z39.50 present request in it
yp2::Package pack;
// Create package with Z39.50 present request in it
yp2::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::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();
@@
-119,7
+116,7
@@
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
{
@@
-127,12
+124,12
@@
BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
yp2::filter::Z3950Client zc;
yp2::filter::Z3950Client zc;
- router.rule(zc);
+ router.append(zc);
// Create package with Z39.50 init request in it
yp2::Package pack;
// Create package with Z39.50 init request in it
yp2::Package pack;
- ODR odr = odr_createmem(ODR_ENCODE);
+ yp2::odr odr;
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
const char *vhost = "localhost:9999";
Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
const char *vhost = "localhost:9999";
@@
-142,7
+139,6
@@
BOOST_AUTO_TEST_CASE( test_filter_z3950_client_4 )
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();