X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=6495f96df86a4d9e1489a6719943c0e9dfd077c3;hb=0098e12fb155644a8befc6c5c5a3d04308128e72;hp=c537eec384aa045fb4eb78817a5a4705e18416f3;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index c537eec..6495f96 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter_factory.cpp,v 1.16 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) 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,21 +12,21 @@ 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 <iostream>
 #include <stdexcept>
 
 #include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
+#include <metaproxy/filter.hpp>
+#include <metaproxy/package.hpp>
 #include "factory_filter.hpp"
 
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -38,6 +36,7 @@ namespace mp = metaproxy_1;
 class XFilter: public mp::filter::Base {
 public:
     void process(mp::Package & package) const;
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
 void XFilter::process(mp::Package & package) const
@@ -53,6 +52,7 @@ static mp::filter::Base* xfilter_creator(){
 class YFilter: public mp::filter::Base {
 public:
     void process(mp::Package & package) const;
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
 void YFilter::process(mp::Package & package) const
@@ -64,23 +64,23 @@ static mp::filter::Base* yfilter_creator(){
     return new YFilter;
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
+BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
 {
     try {
-        
+
         mp::FactoryFilter  ffactory;
-        
+
         XFilter xf;
         YFilter yf;
 
         const std::string xfid = "XFilter";
         const std::string yfid = "YFilter";
-        
+
         BOOST_CHECK(ffactory.add_creator(xfid, xfilter_creator));
         BOOST_CHECK(ffactory.drop_creator(xfid));
         BOOST_CHECK(ffactory.add_creator(xfid, xfilter_creator));
         BOOST_CHECK(ffactory.add_creator(yfid, yfilter_creator));
-        
+
         mp::filter::Base* xfilter = 0;
         xfilter = ffactory.create(xfid);
         mp::filter::Base* yfilter = 0;
@@ -104,19 +104,19 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
 
 #if HAVE_DL_SUPPORT
 #if HAVE_DLFCN_H
-BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
+BOOST_AUTO_TEST_CASE( test_filter_factory_2 )
 {
-    try {        
+    try {
         mp::FactoryFilter  ffactory;
-        
+
         const std::string id = "dl";
-        
+
         // first load
         BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
 
         // test double load
         BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
-                
+
         mp::filter::Base* filter = 0;
         filter = ffactory.create(id);
 
@@ -137,8 +137,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_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
  */
+