X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=ed33113968dd30803f701aa46e346b5b197b9361;hb=0a7f68cbd61a5cd143834ee3c62da6256c8e9648;hp=c8847f572142d4d8a5a29c67777911df01884f59;hpb=b43efd912574977452da0eafc8c346bbf1ee2a20;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index c8847f5..ed33113 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter2.cpp,v 1.24 2007-11-02 17:30:04 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 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
@@ -14,18 +12,18 @@ 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 Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+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 <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include "config.hpp"
-#include "filter.hpp"
+#include <metaproxy/filter.hpp>
 #include "router_chain.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
 
 #include <iostream>
 
@@ -43,7 +41,7 @@ public:
     void process(mp::Package & package) const {
 	package.move();
     };
-    void configure(const xmlNode* ptr = 0);
+    void configure(const xmlNode* ptr, bool test_only);
     int get_constant() const { return m_constant; };
 private:
     const xmlNode *m_ptr;
@@ -51,10 +49,10 @@ private:
 };
 
 
-void FilterConstant::configure(const xmlNode* ptr)
+void FilterConstant::configure(const xmlNode* ptr, bool test_only)
 {
     m_ptr = ptr;
-    
+
     BOOST_CHECK_EQUAL (ptr->type, XML_ELEMENT_NODE);
     BOOST_CHECK_EQUAL(std::string((const char *) ptr->name), "filter");
     
@@ -172,7 +170,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_2 )
         {
             xmlNodePtr root_element = xmlDocGetRootElement(doc);
             
-            base->configure(root_element);
+            base->configure(root_element, true);
             
             xmlFreeDoc(doc);
         }
@@ -192,8 +190,9 @@ BOOST_AUTO_TEST_CASE( testfilter2_2 )
 /*
  * 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
  */
+