X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=600004db4c7c158fd4d69d4e43e8b917f9d9ba0d;hb=7fad8b60f7214dd1405442ed911deaa484be8bb2;hp=6113d32bad6903a967586fee528d5aab2d860dce;hpb=5b2c2b24a2112bd9a66033469031df71f4535e0f;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index 6113d32..600004d 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,20 +1,34 @@
-/* $Id: test_filter2.cpp,v 1.19 2006-05-15 10:12:33 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2012 Index Data
 
-%LICENSE%
- */
+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 <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>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -25,10 +39,9 @@ class FilterConstant: public mp::filter::Base {
 public:
     FilterConstant() : m_constant(1234) { };
     void process(mp::Package & package) const {
-	package.data() = m_constant;
 	package.move();
     };
-    void configure(const xmlNode* ptr = 0);
+    void configure(const xmlNode* ptr, bool test_only, const char *path);
     int get_constant() const { return m_constant; };
 private:
     const xmlNode *m_ptr;
@@ -36,10 +49,11 @@ private:
 };
 
 
-void FilterConstant::configure(const xmlNode* ptr)
+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");
     
@@ -78,13 +92,14 @@ void FilterConstant::configure(const xmlNode* ptr)
 class FilterDouble: public mp::filter::Base {
 public:
     void process(mp::Package & package) const {
-	package.data() = package.data() * 2;
 	package.move();
     };
+    void configure(const xmlNode * ptr, bool test_only,
+                   const char *path) { };
 };
 
-    
-BOOST_AUTO_UNIT_TEST( testfilter2_1 ) 
+
+BOOST_AUTO_TEST_CASE( testfilter2_1 ) 
 {
     try {
 	FilterConstant fc;
@@ -104,7 +119,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 )
 	    
 	    pack.router(router1).move(); 
 	    
-            BOOST_CHECK_EQUAL(pack.data(), 2468);
+            //BOOST_CHECK_EQUAL(pack.data(), 2468);
             
         }
         
@@ -120,7 +135,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 )
 	 
             pack.router(router2).move();
      
-            BOOST_CHECK_EQUAL(pack.data(), 1234);
+            //BOOST_CHECK_EQUAL(pack.data(), 1234);
             
 	}
 
@@ -135,7 +150,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 )
 
 }
 
-BOOST_AUTO_UNIT_TEST( testfilter2_2 ) 
+BOOST_AUTO_TEST_CASE( testfilter2_2 ) 
 {
     try {
 	FilterConstant fc;
@@ -158,7 +173,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_2 )
         {
             xmlNodePtr root_element = xmlDocGetRootElement(doc);
             
-            base->configure(root_element);
+            base->configure(root_element, true, 0);
             
             xmlFreeDoc(doc);
         }
@@ -178,8 +193,9 @@ BOOST_AUTO_UNIT_TEST( 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
  */
+