X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=110d6144037ec4d8d29d7e92f4fb2990c22fd67f;hb=564939279d82cace4201191523793b583b687d84;hp=2e4ae545a40a2607da333810356157b0f1f34006;hpb=41ddc790e888e2b0cfe5da66a34e26e737e20b54;p=metaproxy-moved-to-github.git
diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index 2e4ae54..110d614 100644
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -1,5 +1,5 @@
/* This file is part of Metaproxy.
- Copyright (C) 2005-2013 Index Data
+ Copyright (C) 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
@@ -38,29 +38,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
using namespace boost::unit_test;
namespace mp = metaproxy_1;
-/*
- * The global testconfig is commented out, as it won't even compile
- * on old Centos5 machines
-struct TestConfig {
- TestConfig()
- {
- std::cout << "global setup\n";
- yaz_log_init_level(YLOG_ALL);
- }
- ~TestConfig()
- {
- std::cout << "global teardown\n";
- }
-};
-
-BOOST_GLOBAL_FIXTURE( TestConfig );
-*/
BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
{
try
{
- std::cout << "Running non-xml config test case" << std::endl;
mp::RouterChain router;
mp::filter::HttpRewrite fhr;
@@ -69,30 +51,44 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
"\n"
" \n"
- " \n"
- " \n"
+ " \n"
+ " \n"
" \n"
" \n"
- " \n"
- " \n"
- " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
" \n"
" \n"
- " \n"
- " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
" \n"
" \n"
- " \n"
- " \n"
- " \n"
- " \n"
- " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
" \n"
"\n"
;
@@ -113,15 +109,17 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
mp::odr odr;
Z_GDU *gdu_req = z_get_HTTP_Request_uri(odr,
- "http://proxyhost/proxypath/targetsite/page1.html", 0, 1);
-
+ "http://proxyhost/proxypath/targetsite/page1.html", 0, 1);
+
+ Z_HTTP_Request *hreq = gdu_req->u.HTTP_Request;
+ z_HTTP_header_set(odr, &hreq->headers,
+ "X-Metaproxy-SkipLink", ".* skiplink.com" );
pack.request() = gdu_req;
//create the http response
const char *resp_buf =
"HTTP/1.1 200 OK\r\n"
- "Content-Length: 441\r\n"
"Content-Type: text/html\r\n"
"Link: ; rel=absolute\r\n"
"Link: ; rel=relative\r\n"
@@ -133,7 +131,10 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
"}"
""
""
- ""
+ ""
""
"
Welcome to our website. It doesn't make it easy to get pro"
"xified"
@@ -142,11 +143,14 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
""
" Another abs link"
""
+ ""
+ "\n"
+ "skip\n"
"