X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=acb048b93f324b12f9da96372ed102a15cc24ca4;hb=c4acf512739b0efda858ce209dc5bedfa2b7d3c1;hp=81012d4d113b064a914bee4c1593babbfa50bee4;hpb=14d0e634d5061208301502d813d488d1e82f190b;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index 81012d4..acb048b 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,9 +1,23 @@
-/* $Id: test_filter_factory.cpp,v 1.10 2006-01-04 14:30:51 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter_factory.cpp,v 1.17 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
 
-*/
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
 
 #include <iostream>
 #include <stdexcept>
@@ -15,45 +29,47 @@
 
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
 // XFilter
-class XFilter: public yp2::filter::Base {
+class XFilter: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const;
+    void process(mp::Package & package) const;
 };
 
-void XFilter::process(yp2::Package & package) const
+void XFilter::process(mp::Package & package) const
 {
-    package.data() = 1;
+    //package.data() = 1;
 }
 
-static yp2::filter::Base* xfilter_creator(){
+static mp::filter::Base* xfilter_creator(){
     return new XFilter;
 }
 
 // YFilter ...
-class YFilter: public yp2::filter::Base {
+class YFilter: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const;
+    void process(mp::Package & package) const;
 };
 
-void YFilter::process(yp2::Package & package) const
+void YFilter::process(mp::Package & package) const
 {
-    package.data() = 2;
+    //package.data() = 2;
 }
 
-static yp2::filter::Base* yfilter_creator(){
+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 {
         
-        yp2::FactoryFilter  ffactory;
+        mp::FactoryFilter  ffactory;
         
         XFilter xf;
         YFilter yf;
@@ -66,20 +82,20 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
         BOOST_CHECK(ffactory.add_creator(xfid, xfilter_creator));
         BOOST_CHECK(ffactory.add_creator(yfid, yfilter_creator));
         
-        yp2::filter::Base* xfilter = 0;
+        mp::filter::Base* xfilter = 0;
         xfilter = ffactory.create(xfid);
-        yp2::filter::Base* yfilter = 0;
+        mp::filter::Base* yfilter = 0;
         yfilter = ffactory.create(yfid);
 
         BOOST_CHECK(0 != xfilter);
         BOOST_CHECK(0 != yfilter);
 
-        yp2::Package pack;
+        mp::Package pack;
         xfilter->process(pack);
-        BOOST_CHECK_EQUAL(pack.data(), 1);
+        //BOOST_CHECK_EQUAL(pack.data(), 1);
 
         yfilter->process(pack);
-        BOOST_CHECK_EQUAL(pack.data(), 2);
+        //BOOST_CHECK_EQUAL(pack.data(), 2);
     }
     catch ( ... ) {
         throw;
@@ -89,27 +105,27 @@ 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 {        
-        yp2::FactoryFilter  ffactory;
+        mp::FactoryFilter  ffactory;
         
         const std::string id = "dl";
         
         // first load
-        BOOST_CHECK(ffactory.add_creator_dyn(id, ".libs"));
+        BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
 
         // test double load
-        BOOST_CHECK(ffactory.add_creator_dyn(id, ".libs"));
+        BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
                 
-        yp2::filter::Base* filter = 0;
+        mp::filter::Base* filter = 0;
         filter = ffactory.create(id);
 
         BOOST_CHECK(0 != filter);
 
-        yp2::Package pack;
+        mp::Package pack;
         filter->process(pack);
-        BOOST_CHECK_EQUAL(pack.data(), 42); // magic from filter_dl ..
+        //BOOST_CHECK_EQUAL(pack.data(), 42); // magic from filter_dl ..
     }
     catch ( ... ) {
         throw;