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

diff --git a/src/test_filter_factory.cpp b/src/test_filter_factory.cpp
index 3b982f1..7dfcaae 100644
--- a/src/test_filter_factory.cpp
+++ b/src/test_filter_factory.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_factory.cpp,v 1.3 2005-10-29 22:23:36 marc Exp $
+/* $Id: test_filter_factory.cpp,v 1.6 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -22,9 +22,6 @@ using namespace boost::unit_test;
 class XFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-     const std::string type() const{
-        return "XFilter";
-    };
 };
 
 
@@ -35,9 +32,6 @@ yp2::filter::Base* xfilter_creator(){
 class YFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-    const std::string type() const{
-        return "YFilter";
-    };
 };
 
 yp2::filter::Base* yfilter_creator(){
@@ -45,19 +39,17 @@ 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;
         
         XFilter xf;
         YFilter yf;
 
-        const std::string xfid = xf.type();
-        const std::string yfid = yf.type();
+        const std::string xfid = "XFilter";
+        const std::string yfid = "YFilter";
         
         //std::cout << "Xfilter name: " << xfid << std::endl;
         //std::cout << "Yfilter name: " << yfid << std::endl;
@@ -71,17 +63,17 @@ BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
         BOOST_CHECK_EQUAL(ffactory.add_creator(yfid, yfilter_creator),
                           true);
         
-        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());
+        yp2::filter::Base* xfilter = 0;
+        xfilter = ffactory.create(xfid);
+        yp2::filter::Base* yfilter = 0;
+        yfilter = ffactory.create(yfid);
 
-        //std::cout << "Xfilter pointer name:  " << xfilter->type() << std::endl;
-        //std::cout << "Yfilter pointer name:  " << yfilter->type() << std::endl;
-        
+        //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);
@@ -90,28 +82,24 @@ BOOST_AUTO_TEST_CASE( test_filter_factory_1 )
     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;
+//}
 
 
-            // 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