X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_factory.cpp;h=3b982f117b557888985023191afc4741e3acee15;hb=7467b072bb64f5c8575daa9917cce7df62d832f1;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..3b982f1 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.3 2005-10-29 22:23:36 marc Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
- */
+
+*/
 
 
 #include <iostream>
@@ -21,9 +22,9 @@ 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");
-        }   
+     const std::string type() const{
+        return "XFilter";
+    };
 };
 
 
@@ -31,13 +32,12 @@ 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");
-        }   
+    const std::string type() const{
+        return "YFilter";
+    };
 };
 
 yp2::filter::Base* yfilter_creator(){
@@ -53,23 +53,37 @@ BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
         
         yp2::filter::FilterFactory  ffactory;
         
-        BOOST_CHECK_EQUAL(ffactory.add_creator("xfilter", xfilter_creator),
+        XFilter xf;
+        YFilter yf;
+
+        const std::string xfid = xf.type();
+        const std::string yfid = yf.type();
+        
+        //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 = ffactory.create(xfid);
+        yp2::filter::Base* yfilter = ffactory.create(yfid);
+
+        BOOST_CHECK_EQUAL(xf.type(), xfilter->type());
+        BOOST_CHECK_EQUAL(yf.type(), yfilter->type());
+
+        //std::cout << "Xfilter pointer name:  " << xfilter->type() << std::endl;
+        //std::cout << "Yfilter pointer name:  " << yfilter->type() << std::endl;
         
+
         }
     catch ( ... ) {
+        throw;
         BOOST_CHECK (false);
     }
         
@@ -77,6 +91,27 @@ BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
 }
 
 
+
+
+
+            // 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:
  * c-basic-offset: 4