-/* $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>
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";
+ };
};
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(){
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);
}
}
+
+
+
+ // 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