X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=7f6761cc3f66c900b5e2f4179e539397ecdea8de;hb=1615e9726fe4457ef6efea73f0d1bed70b18342d;hp=b9190e37a7e0f55cd73b241f58f68b288db2c565;hpb=cae80f85741d2564d918a0e3285c62e51491a7fc;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index b9190e3..7f6761c 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,8 +1,7 @@
-/* $Id: test_filter_factory.cpp,v 1.7 2005-12-10 09:59:10 adam Exp $
-   Copyright (c) 2005, Index Data.
-
-%LICENSE%
+/* $Id: test_filter_factory.cpp,v 1.14 2006-09-14 19:53:57 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
 
+   See the LICENSE file for details
 */
 
 #include <iostream>
@@ -11,41 +10,42 @@
 #include "config.hpp"
 #include "filter.hpp"
 #include "package.hpp"
-#include "filter_factory.hpp"
+#include "factory_filter.hpp"
 
 
 #define BOOST_AUTO_TEST_MAIN
 #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;
 }
 
@@ -53,7 +53,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
 {
     try {
         
-        yp2::FilterFactory  ffactory;
+        mp::FactoryFilter  ffactory;
         
         XFilter xf;
         YFilter yf;
@@ -66,20 +66,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;
@@ -87,24 +87,29 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
     }
 }
 
+#if HAVE_DL_SUPPORT
 #if HAVE_DLFCN_H
 BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
 {
     try {        
-        yp2::FilterFactory  ffactory;
+        mp::FactoryFilter  ffactory;
         
         const std::string id = "dl";
         
-        BOOST_CHECK(ffactory.add_creator_dyn(id, ".libs"));
-        
-        yp2::filter::Base* filter = 0;
+        // 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);
 
         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;
@@ -112,6 +117,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
     }
 }
 #endif
+#endif
 
 /*
  * Local variables: