X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=600004db4c7c158fd4d69d4e43e8b917f9d9ba0d;hb=5569554610119ddd1fdd5541c26815b43a09aadf;hp=8bb4224fd0e98de9703fa13bd8266af49820cbef;hpb=48cfd383e1e94fa9d34d8a783b7c0137ae598a9d;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index 8bb4224..600004d 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,20 +1,34 @@
-/* $Id: test_filter2.cpp,v 1.21 2006-09-14 19:53:57 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2012 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 <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;
@@ -27,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, const char *path);
     int get_constant() const { return m_constant; };
 private:
     const xmlNode *m_ptr;
@@ -35,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");
     
@@ -79,10 +94,12 @@ public:
     void process(mp::Package & package) const {
 	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;
@@ -133,7 +150,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 )
 
 }
 
-BOOST_AUTO_UNIT_TEST( testfilter2_2 ) 
+BOOST_AUTO_TEST_CASE( testfilter2_2 ) 
 {
     try {
 	FilterConstant fc;
@@ -156,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);
         }
@@ -176,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
  */
+