X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=fb3c0a3ccf4ebe447903aed66983e934c60b846d;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=b0130f05c1e85a266a2de3d8754148c52011e572;hpb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index b0130f0..fb3c0a3 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter2.cpp,v 1.25 2008-02-20 15:07:53 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   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
@@ -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 "router_chain.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/router_chain.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, bool test_only);
+    void configure(const xmlNode* ptr, bool test_only, const char *path);
     int get_constant() const { return m_constant; };
 private:
     const xmlNode *m_ptr;
@@ -51,15 +49,16 @@ private:
 };
 
 
-void FilterConstant::configure(const xmlNode* ptr, bool test_only)
+void FilterConstant::configure(const xmlNode* ptr, bool test_only,
+                               const char *path)
 {
     m_ptr = ptr;
 
     BOOST_CHECK_EQUAL (ptr->type, XML_ELEMENT_NODE);
     BOOST_CHECK_EQUAL(std::string((const char *) ptr->name), "filter");
-    
+
     const struct _xmlAttr *attr;
-    
+
     for (attr = ptr->properties; attr; attr = attr->next)
     {
         BOOST_CHECK_EQUAL( std::string((const char *)attr->name), "type");
@@ -72,15 +71,15 @@ void FilterConstant::configure(const xmlNode* ptr, bool test_only)
     {
         if (p->type != XML_ELEMENT_NODE)
             continue;
-        
+
         BOOST_CHECK_EQUAL (p->type, XML_ELEMENT_NODE);
         BOOST_CHECK_EQUAL(std::string((const char *) p->name), "value");
-        
+
         const xmlNode *val = p->children;
         BOOST_CHECK(val);
         if (!val)
             continue;
-        
+
         BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE);
         BOOST_CHECK_EQUAL(std::string((const char *)val->content), "2");
 
@@ -89,16 +88,18 @@ void FilterConstant::configure(const xmlNode* ptr, bool test_only)
 }
 
 // This filter dose not have a configure function
-    
+
 class FilterDouble: public mp::filter::Base {
 public:
     void process(mp::Package & package) const {
 	package.move();
     };
+    void configure(const xmlNode * ptr, bool test_only,
+                   const char *path) { };
 };
 
 
-BOOST_AUTO_TEST_CASE( testfilter2_1 ) 
+BOOST_AUTO_TEST_CASE( testfilter2_1 )
 {
     try {
 	FilterConstant fc;
@@ -106,36 +107,36 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
 
 	{
 	    mp::RouterChain router1;
-	    
+
 	    // test filter set/get/exception
 	    router1.append(fc);
-	    
+
 	    router1.append(fd);
 
             mp::Session session;
             mp::Origin origin;
 	    mp::Package pack(session, origin);
-	    
-	    pack.router(router1).move(); 
-	    
+
+	    pack.router(router1).move();
+
             //BOOST_CHECK_EQUAL(pack.data(), 2468);
-            
+
         }
-        
+
         {
 	    mp::RouterChain router2;
-	    
+
 	    router2.append(fd);
 	    router2.append(fc);
-	    
+
             mp::Session session;
             mp::Origin origin;
 	    mp::Package pack(session, origin);
-	 
+
             pack.router(router2).move();
-     
+
             //BOOST_CHECK_EQUAL(pack.data(), 1234);
-            
+
 	}
 
     }
@@ -149,7 +150,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
 
 }
 
-BOOST_AUTO_TEST_CASE( testfilter2_2 ) 
+BOOST_AUTO_TEST_CASE( testfilter2_2 )
 {
     try {
 	FilterConstant fc;
@@ -161,7 +162,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_2 )
             "<filter type=\"constant\">\n"
             " <value>2</value>\n"
             "</filter>";
-        
+
         // std::cout << some_xml  << std::endl;
 
         xmlDocPtr doc = xmlParseMemory(some_xml.c_str(), some_xml.size());
@@ -171,9 +172,9 @@ BOOST_AUTO_TEST_CASE( testfilter2_2 )
         if (doc)
         {
             xmlNodePtr root_element = xmlDocGetRootElement(doc);
-            
-            base->configure(root_element, true);
-            
+
+            base->configure(root_element, true, 0);
+
             xmlFreeDoc(doc);
         }
 
@@ -192,8 +193,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
  */
+