X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=ccd07b4699420bb18b180a927e47e323d0c8954b;hb=e9530d6289df9b848e4901d7c73f5a2f27706d66;hp=8adbd86bcd97abfceb66b13fc2a300e04ea917cd;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index 8adbd86..ccd07b4 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter2.cpp,v 1.23 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 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,10 +12,9 @@ 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 <libxml/parser.h>
 #include <libxml/tree.h>
@@ -30,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <iostream>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -42,7 +40,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;
@@ -50,10 +48,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");
     
@@ -96,8 +94,8 @@ public:
     };
 };
 
-    
-BOOST_AUTO_UNIT_TEST( testfilter2_1 ) 
+
+BOOST_AUTO_TEST_CASE( testfilter2_1 ) 
 {
     try {
 	FilterConstant fc;
@@ -148,7 +146,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 )
 
 }
 
-BOOST_AUTO_UNIT_TEST( testfilter2_2 ) 
+BOOST_AUTO_TEST_CASE( testfilter2_2 ) 
 {
     try {
 	FilterConstant fc;
@@ -171,7 +169,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_2 )
         {
             xmlNodePtr root_element = xmlDocGetRootElement(doc);
             
-            base->configure(root_element);
+            base->configure(root_element, true);
             
             xmlFreeDoc(doc);
         }