X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=7dfcaaeae6a75977161ea9b153402855ab9664b0;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=2ab42af8452afab425a32ab7ad8a6495dd92cc7f;hpb=8a595f41f5eaaa7ef846a697cfe4466ea57d224a;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index 2ab42af..7dfcaae 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,8 +1,9 @@
-/* $Id: test_filter_factory.cpp,v 1.2 2005-10-29 17:58:14 marc Exp $
+/* $Id: test_filter_factory.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
- */
+
+*/
 
 
 #include <iostream>
@@ -21,9 +22,6 @@ using namespace boost::unit_test;
 class XFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-    std::string name(){
-        return std::string("xfilter");
-        }   
 };
 
 
@@ -31,13 +29,9 @@ yp2::filter::Base* xfilter_creator(){
     return new XFilter;
 }
 
-
 class YFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-    std::string name(){
-        return std::string("yfilter");
-        }   
 };
 
 yp2::filter::Base* yfilter_creator(){
@@ -45,37 +39,66 @@ yp2::filter::Base* yfilter_creator(){
 }
 
 
-
-//int main(int argc, char **argv)
-BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
+BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
 {
     try {
         
-        yp2::filter::FilterFactory  ffactory;
+        yp2::FilterFactory  ffactory;
         
-        BOOST_CHECK_EQUAL(ffactory.add_creator("xfilter", xfilter_creator),
+        XFilter xf;
+        YFilter yf;
+
+        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("xfilter"),
+        BOOST_CHECK_EQUAL(ffactory.drop_creator(xfid),
                           true);
-        BOOST_CHECK_EQUAL(ffactory.add_creator("xfilter", xfilter_creator),
+        BOOST_CHECK_EQUAL(ffactory.add_creator(xfid, xfilter_creator),
                           true);
-        BOOST_CHECK_EQUAL(ffactory.add_creator("yfilter", yfilter_creator),
+        BOOST_CHECK_EQUAL(ffactory.add_creator(yfid, yfilter_creator),
                           true);
         
-        yp2::filter::Base* xfilter = ffactory.create("xfilter");
-        yp2::filter::Base* yfilter = ffactory.create("yfilter");
-        
-        //BOOST_CHECK_EQUAL(xfilter->name(), std::string("xfilter"));
-        //BOOST_CHECK_EQUAL(yfilter->name(), std::string("yfilter"));
-        
-        }
+        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);
+    }
     catch ( ... ) {
+        throw;
         BOOST_CHECK (false);
     }
         
     std::exit(0);
 }
 
+// get function - right val in assignment
+//std::string name() const {
+//return m_name;
+//  return "Base";
+//}
+
+// set function - left val in assignment
+//std::string & name() {
+//    return m_name;
+//}
+
+// set function - can be chained
+//Base & name(const std::string & name){
+//  m_name = name;
+//  return *this;
+//}
+
 
 /*
  * Local variables: