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

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index 37b2a57..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.1 2005-10-28 10:35:30 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>
@@ -23,29 +24,82 @@ public:
     void process(yp2::Package & package) const {};
 };
 
+
+yp2::filter::Base* xfilter_creator(){
+    return new XFilter;
+}
+
 class YFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
 };
-    
 
-BOOST_AUTO_TEST_CASE( test_router_flexml_1 )
+yp2::filter::Base* yfilter_creator(){
+    return new YFilter;
+}
+
+
+BOOST_AUTO_UNIT_TEST( test_filter_factory_1 )
 {
-    try{
+    try {
         
-        yp2::filter::FilterFactory  ffactory;
+        yp2::FilterFactory  ffactory;
         
+        XFilter xf;
+        YFilter yf;
 
-        BOOST_CHECK (true);
+        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(filter.name(), std::string("filter1"));
+        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);
         
+        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:
  * c-basic-offset: 4