X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=110d6144037ec4d8d29d7e92f4fb2990c22fd67f;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=6a815599944b4e825aaac008f94a0937fff88efc;hpb=24c59a891cc78bd319b5db6c5ade450585e37ed1;p=metaproxy-moved-to-github.git diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp index 6a81559..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 @@ -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; @@ -68,9 +67,11 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) " \n" " \n" " \n" + " \n" + " \n" + " \n" " \n" " \n" - " \n" " \n" @@ -80,9 +81,13 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) " \n" " \n" " \n" - " \n" + " \n" " \n" - " \n" + " \n" + " \n" + " \n" + " \n" + " \n" " \n" " \n" "\n" @@ -104,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" @@ -125,7 +132,8 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) "" "" "" "" "

Welcome to our website. It doesn't make it easy to get pro" @@ -135,13 +143,14 @@ 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: 564\r\n" + "Content-Length: 686\r\n" "Content-Type: text/html\r\n" "Link: ; rel=absolute\r\n" "Link: ; rel=relative\r\n" @@ -154,7 +163,8 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) "" "" "" "" "

Welcome to our website. It doesn't make it easy to get pro" @@ -164,8 +174,9 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 ) "" " Another abs link" "" - "" - "" + "" + "\n" + "skip\n" ""; Z_GDU *gdu_res; @@ -205,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); @@ -221,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; @@ -261,12 +270,6 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) " \n" " \n" " \n" - " \n" - " \n" - " \n" - " \n" - " \n" - " \n" " \n" " \n" " \n" @@ -298,7 +301,6 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) const char *resp_buf = "HTTP/1.1 200 OK\r\n" - "Content-Length: 140\r\n" "Content-Type: application/javascript\r\n" "Link: ; rel=absolute\r\n" "Link: ; rel=relative\r\n" @@ -307,11 +309,11 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) "my.location = 'http://targetsite/images/bg.png';\n" "my.other = \"http://targetsite/images/fg.png\";\n" "my.thrd = \"other\";\n" - "// http://targetsite/images/bg.png\n"; + "// \"http://targetsite/images/bg.png\n"; const char *resp_expected = "HTTP/1.1 200 OK\r\n" - "Content-Length: 194\r\n" + "Content-Length: 195\r\n" "Content-Type: application/javascript\r\n" "Link: ; rel=absolute\r\n" "Link: ; rel=relative\r\n" @@ -320,7 +322,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 ) "my.location = 'http://proxyhost/proxypath/targetsite/images/bg.png';\n" "my.other = \"http://proxyhost/proxypath/targetsite/images/fg.png\";\n" "my.thrd = \"other\";\n" - "// http://targetsite/images/bg.png\n"; + "// \"http://targetsite/images/bg.png\n"; Z_GDU *gdu_res; mp::odr dec(ODR_DECODE); @@ -359,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);