X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest_filter_query_rewrite.cpp;h=7567a2165ad1663e6a306eb0710377c9754aa9cf;hb=2adc2ffad5232fcd283a860a5626819982decb94;hp=484bac5770e03fab7229ba654f54789a45b7516e;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_query_rewrite.cpp b/src/test_filter_query_rewrite.cpp
index 484bac5..7567a21 100644
--- a/src/test_filter_query_rewrite.cpp
+++ b/src/test_filter_query_rewrite.cpp
@@ -1,20 +1,32 @@
-/* $Id: test_filter_query_rewrite.cpp,v 1.10 2006-06-10 14:29:12 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2010 Index Data
 
-   See the LICENSE file for details
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
 #include "filter_query_rewrite.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -141,7 +153,7 @@ void check_query_rewrite_search(mp::RouterChain &router,
 }
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite_1 )
+BOOST_AUTO_TEST_CASE( test_filter_query_rewrite_1 )
 {
     try 
     {
@@ -152,7 +164,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite_1 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite2 )
+BOOST_AUTO_TEST_CASE( test_filter_query_rewrite2 )
 {
     try 
     {
@@ -176,7 +188,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite2 )
 }
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 )
+BOOST_AUTO_TEST_CASE( test_filter_query_rewrite3 )
 {
     
 
@@ -187,7 +199,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 )
 
         std::string xmlconf = 
             "<?xml version='1.0'?>\n"
-            "<filter xmlns='http://indexdata.dk/yp2/config/1'\n"
+            "<filter xmlns='http://indexdata.com/metaproxy'\n"
             "        id='qrw1' type='query_rewrite'>\n"
             "</filter>\n"
             ;
@@ -201,7 +213,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 )
 
         // creating and configuring filter
         mp::filter::QueryRewrite f_query_rewrite;
-        f_query_rewrite.configure(root_element);
+        f_query_rewrite.configure(root_element, true);
         
         // remeber to free XML DOM
         xmlFreeDoc(doc);
@@ -230,8 +242,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_query_rewrite3 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+