X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=54b52f2c85aa5865c119fdec6a0e30a0c9e6fc47;hb=964ec58fa0d8664752262cef2f2707f10b16ba9c;hp=360246a71e620021164f05da8ff7d79cd7798b64;hpb=a8b25eb1e4dee0290182ca69fe49a01557c58811;p=metaproxy-moved-to-github.git diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp index 360246a..54b52f2 100644 --- a/src/test_filter_rewrite.cpp +++ b/src/test_filter_rewrite.cpp @@ -43,7 +43,6 @@ 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; @@ -110,8 +109,11 @@ 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 @@ -130,6 +132,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) "" "" "" "" @@ -141,12 +144,13 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) " Another abs link" "" "" - "" + "\n" + "skip\n" ""; const char *resp_expected = "HTTP/1.1 200 OK\r\n" - "Content-Length: 605\r\n" + "Content-Length: 686\r\n" "Content-Type: text/html\r\n" "Link: ; rel=absolute\r\n" "Link: ; rel=relative\r\n" @@ -159,6 +163,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) "" "" "" "" @@ -170,7 +175,8 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) " Another abs link" "" "" - "" + "\n" + "skip\n" ""; Z_GDU *gdu_res; @@ -210,7 +216,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) { //compare buffers std::cout << "Expected result:\n" << resp_expected << "\n"; - std::cout << "Got result:\n" << "\n"; + std::cout << "Got result:\n"; fflush(stdout); fwrite(resp_result, 1, resp_result_len, stdout); fflush(stdout); @@ -226,12 +232,10 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) } } - BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) { try { - std::cout << "Running non-xml config test case" << std::endl; mp::RouterChain router; mp::filter::HttpRewrite fhr; @@ -357,7 +361,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) { //compare buffers std::cout << "Expected result:\n" << resp_expected << "\n"; - std::cout << "Got result:\n" << "\n"; + std::cout << "Got result:\n"; fflush(stdout); fwrite(resp_result, 1, resp_result_len, stdout); fflush(stdout);