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
Filter multi: relay init sz parameters
[metaproxy-moved-to-github.git]
/
src
/
test_filter_frontend_net.cpp
diff --git
a/src/test_filter_frontend_net.cpp
b/src/test_filter_frontend_net.cpp
index
8b5a47d
..
945a242
100644
(file)
--- a/
src/test_filter_frontend_net.cpp
+++ b/
src/test_filter_frontend_net.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2011 Index Data
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
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
@@
-20,12
+20,11
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <iostream>
#include <stdexcept>
#include <iostream>
#include <stdexcept>
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include "filter_frontend_net.hpp"
#include "router_chain.hpp"
#include "filter_frontend_net.hpp"
#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
#define BOOST_AUTO_TEST_MAIN
#define BOOST_TEST_DYN_LINK
#define BOOST_AUTO_TEST_MAIN
#define BOOST_TEST_DYN_LINK
@@
-44,14
+43,11
@@
public:
}
Z_GDU *gdu = package.request().get();
}
Z_GDU *gdu = package.request().get();
- if (gdu)
+ if (gdu && gdu->which == Z_GDU_Z3950)
{
// std::cout << "Got PDU. Sending init response\n";
mp::odr odr;
{
// std::cout << "Got PDU. Sending init response\n";
mp::odr odr;
- Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
-
- apdu->u.initResponse->implementationName = "YP2/YAZ";
-
+ Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
package.response() = apdu;
}
return package.move();
package.response() = apdu;
}
return package.move();
@@
-67,6
+63,10
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_1 )
mp::filter::FrontendNet nf;
}
}
mp::filter::FrontendNet nf;
}
}
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
+ }
catch ( ... ) {
BOOST_CHECK (false);
}
catch ( ... ) {
BOOST_CHECK (false);
}
@@
-106,6
+106,10
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
}
}
}
}
}
}
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
+ }
catch ( ... ) {
BOOST_CHECK (false);
}
catch ( ... ) {
BOOST_CHECK (false);
}
@@
-137,6
+141,10
@@
BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
}
BOOST_CHECK(true);
}
}
BOOST_CHECK(true);
}
+ catch (std::runtime_error &e) {
+ std::cerr << "std::runtime error: " << e.what() << std::endl;
+ BOOST_CHECK(false);
+ }
catch ( ... ) {
BOOST_CHECK (false);
}
catch ( ... ) {
BOOST_CHECK (false);
}