Fix response rewriting

[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 29bc5ca..7753f0e 100644 (file)
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -29,6 +29,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
 
+#include <yaz/log.h>
+
 #define BOOST_AUTO_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
 
@@ -37,6 +39,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 using namespace boost::unit_test;
 namespace mp = metaproxy_1;
 
+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 )
 {
@@ -71,7 +86,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_2 )
         mp::filter::HttpRewrite::spair_vec vec_res;
         vec_res.push_back(std::make_pair(
         "(?<proto>http\\:\\/\\/s?)(?<host>[^\\/?#]+)\\/(?<path>[^ >]+)",
-        "http://${pxhost}/${pxpath}/${host}/${path}"
+        "THAT WAS MATCHED"
         ));
         
         fhr.configure(vec_req, vec_res);
@@ -128,7 +143,7 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_3 )
             " <response>\n"
             "   <rewrite from='"
     "(?&lt;proto>http\\:\\/\\/s?)(?&lt;host>[^\\/?#]+)\\/(?&lt;path>[^ >]+)'\n"
-            "            to='http://${pxhost}/${pxpath}/${host}/${path}' />\n" 
+            "            to='THAT WAS MATCHED' />\n" 
             " </response>\n"
             "</filter>\n"
             ;