X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=3b6be2c959c5982ac4fb195f71c623eca90db258;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=4445a0143d2b8a4bf3a4d24474633ac7cef6f00b;hpb=5cc9145ea95e0a778bef7ad2a0ea9c1a4824bcc4;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index 4445a01..3b6be2c 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,17 +1,16 @@
-/* $Id: test_filter_factory.cpp,v 1.5 2005-11-10 23:10:42 adam Exp $
+/* $Id: test_filter_factory.cpp,v 1.11 2006-01-19 09:41:01 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
-
 */
 
-
 #include <iostream>
 #include <stdexcept>
 
 #include "config.hpp"
 #include "filter.hpp"
-#include "filter_factory.hpp"
+#include "package.hpp"
+#include "factory_filter.hpp"
 
 
 #define BOOST_AUTO_TEST_MAIN
@@ -19,31 +18,41 @@
 
 using namespace boost::unit_test;
 
+// XFilter
 class XFilter: public yp2::filter::Base {
 public:
-    void process(yp2::Package & package) const {};
+    void process(yp2::Package & package) const;
 };
 
+void XFilter::process(yp2::Package & package) const
+{
+    package.data() = 1;
+}
 
-yp2::filter::Base* xfilter_creator(){
+static yp2::filter::Base* xfilter_creator(){
     return new XFilter;
 }
 
+// YFilter ...
 class YFilter: public yp2::filter::Base {
 public:
-    void process(yp2::Package & package) const {};
+    void process(yp2::Package & package) const;
 };
 
-yp2::filter::Base* yfilter_creator(){
-    return new YFilter;
+void YFilter::process(yp2::Package & package) const
+{
+    package.data() = 2;
 }
 
+static yp2::filter::Base* yfilter_creator(){
+    return new YFilter;
+}
 
-BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
 {
     try {
         
-        yp2::FilterFactory  ffactory;
+        yp2::FactoryFilter  ffactory;
         
         XFilter xf;
         YFilter yf;
@@ -51,54 +60,63 @@ BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
         const std::string xfid = "XFilter";
         const std::string yfid = "YFilter";
         
-        //std::cout << "Xfilter name: " << xfid << std::endl;
-        //std::cout << "Yfilter name: " << yfid << std::endl;
-
-        BOOST_CHECK_EQUAL(ffactory.add_creator(xfid, xfilter_creator),
-                          true);
-        BOOST_CHECK_EQUAL(ffactory.drop_creator(xfid),
-                          true);
-        BOOST_CHECK_EQUAL(ffactory.add_creator(xfid, xfilter_creator),
-                          true);
-        BOOST_CHECK_EQUAL(ffactory.add_creator(yfid, yfilter_creator),
-                          true);
+        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));
         
         yp2::filter::Base* xfilter = 0;
         xfilter = ffactory.create(xfid);
         yp2::filter::Base* yfilter = 0;
         yfilter = ffactory.create(yfid);
 
-        //BOOST_CHECK_EQUAL(sizeof(xf), sizeof(*xfilter));
-        //BOOST_CHECK_EQUAL(sizeof(yf), sizeof(*yfilter));
-
         BOOST_CHECK(0 != xfilter);
         BOOST_CHECK(0 != yfilter);
+
+        yp2::Package pack;
+        xfilter->process(pack);
+        BOOST_CHECK_EQUAL(pack.data(), 1);
+
+        yfilter->process(pack);
+        BOOST_CHECK_EQUAL(pack.data(), 2);
     }
     catch ( ... ) {
         throw;
         BOOST_CHECK (false);
     }
-        
-    std::exit(0);
 }
 
-// get function - right val in assignment
-//std::string name() const {
-//return m_name;
-//  return "Base";
-//}
+#if HAVE_DL_SUPPORT
+#if HAVE_DLFCN_H
+BOOST_AUTO_UNIT_TEST( test_filter_factory_2 )
+{
+    try {        
+        yp2::FactoryFilter  ffactory;
+        
+        const std::string id = "dl";
+        
+        // first load
+        BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
 
-// set function - left val in assignment
-//std::string & name() {
-//    return m_name;
-//}
+        // test double load
+        BOOST_CHECK(ffactory.add_creator_dl(id, ".libs"));
+                
+        yp2::filter::Base* filter = 0;
+        filter = ffactory.create(id);
 
-// set function - can be chained
-//Base & name(const std::string & name){
-//  m_name = name;
-//  return *this;
-//}
+        BOOST_CHECK(0 != filter);
 
+        yp2::Package pack;
+        filter->process(pack);
+        BOOST_CHECK_EQUAL(pack.data(), 42); // magic from filter_dl ..
+    }
+    catch ( ... ) {
+        throw;
+        BOOST_CHECK (false);
+    }
+}
+#endif
+#endif
 
 /*
  * Local variables: