projects / metaproxy-moved-to-github.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix Metaproxy stops logging after check config failed MP-590
[metaproxy-moved-to-github.git] / src / test_filter_rewrite.cpp
diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index 68acc0f..110d614 100644 (file)
--- 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 )
             " </request>\n"
             " <response verbose=\"1\">\n"
             "  <rule name=\"null\"/>\n"
+            "  <rule name=\"cx\">\n"
+            "     <rewrite from='^cx' to='cy'/>\n"
+            "  </rule>\n"
             "  <rule name=\"url\">\n"
             "     <rewrite from='foo' to='bar'/>\n"
-            "     <rewrite from='^cx' to='cy'/>\n"
             "     <rewrite from='"
     "(?&lt;proto>https?://)(?&lt;host>[^/?# &quot;&apos;>]+)/(?&lt;path>[^  &quot;&apos;>]+)'\n"
             "            to='${proto}${pxhost}/${pxpath}/${host}/${path}' />\n"
@@ -82,7 +83,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "    <within tag=\"body\" attr=\"background\" rule=\"null\"/>\n"
             "    <within tag=\"script\" attr=\"#text\" type=\"quoted-literal\" rule=\"url\"/>\n"
             "    <within tag=\"style\" attr=\"#text\" rule=\"url\"/>\n"
-            "    <within attr=\"href|src\" rule=\"url\"/>\n"
+            "    <within attr=\"href|src\" rule=\"url,cx\"/>\n"
             "    <within attr=\"onclick\" type=\"quoted-literal\" rule=\"url\"/>\n"
             "  </content>\n"
             "  <content type=\"quoted-literal\" mime=\".*javascript\">\n"
@@ -108,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
@@ -128,6 +132,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "</style>"
             "</head>"
             "<script>var jslink=\"http://targetsite/webservice.xml\";"
+            "for (i = 0; i<foo; i++) ;\n"
             "var some=\"foo\"; foo=1;"
             "</script>"
             "<body>"
@@ -139,12 +144,13 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "  Another abs link</a>"
             "<a href=\"/docs/page4.html\" />"
             "<A href=\"cxcx\" />"
-            "<a HREF=\"cx \" onclick=\"foo(&quot;foo&quot;);\"/>"
+            "<a HREF=\"cx \" onclick=\"foo(&quot;foo&quot;);\"/>\n"
+            "<a href=\"http://www.skiplink.com/page5.html\">skip</a>\n"
             "</body></html>";
 
         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: <http://proxyhost/proxypath/targetsite/file.xml>; rel=absolute\r\n"
             "Link: </dir/file.xml>; rel=relative\r\n"
@@ -157,6 +163,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "</style>"
             "</head>"
             "<script>var jslink=\"http://proxyhost/proxypath/targetsite/webservice.xml\";"
+            "for (i = 0; i<foo; i++) ;\n"
             "var some=\"bar\"; foo=1;"
             "</script>"
             "<body>"
@@ -168,7 +175,8 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "  Another abs link</a>"
             "<a href=\"/docs/page4.html\"/>"
             "<A href=\"cycx\"/>"
-            "<a HREF=\"cy \" onclick=\"foo(&quot;bar&quot;);\"/>"
+            "<a HREF=\"cy \" onclick=\"foo(&quot;bar&quot;);\"/>\n"
+            "<a href=\"http://www.skiplink.com/page5.html\">skip</a>\n"
             "</body></html>";
 
         Z_GDU *gdu_res;
@@ -208,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);
@@ -224,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;
 
@@ -355,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);
Z39.50/Web Router