X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=8bb4224fd0e98de9703fa13bd8266af49820cbef;hb=1648ce02e4909b932a908beaeae93fd41515b9e5;hp=c5159dd4963a3f7e9d3a85ab70b621d62f35f8b8;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp index c5159dd..8bb4224 100644 --- a/src/test_filter2.cpp +++ b/src/test_filter2.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter2.cpp,v 1.18 2006-03-16 10:40:59 adam Exp $ +/* $Id: test_filter2.cpp,v 1.21 2006-09-14 19:53:57 marc Exp $ Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include @@ -25,15 +25,11 @@ class FilterConstant: public mp::filter::Base { public: FilterConstant() : m_constant(1234) { }; void process(mp::Package & package) const { - package.data() = m_constant; package.move(); }; void configure(const xmlNode* ptr = 0); int get_constant() const { return m_constant; }; private: - bool parse_xml_text(const xmlNode *xml_ptr, bool &val); - bool parse_xml_text(const xmlNode *xml_ptr, std::string &val); -private: const xmlNode *m_ptr; int m_constant; }; @@ -76,44 +72,11 @@ void FilterConstant::configure(const xmlNode* ptr) } } -bool FilterConstant::parse_xml_text(const xmlNode *xml_ptr, bool &val) -{ - std::string v; - if (!parse_xml_text(xml_ptr, v)) - return false; - if (v.length() == 1 && v[0] == '1') - val = true; - else - val = false; - return true; -} - -bool FilterConstant::parse_xml_text(const xmlNode *xml_ptr, std::string &val) -{ - xmlNodePtr ptr = (xmlNodePtr) xml_ptr; - bool found = false; - std::string v; - for(ptr = ptr->children; ptr; ptr = ptr->next) - if (ptr->type == XML_TEXT_NODE) - { - xmlChar *t = ptr->content; - if (t) - { - v += (const char *) t; - found = true; - } - } - if (found) - val = v; - return found; -} - // This filter dose not have a configure function class FilterDouble: public mp::filter::Base { public: void process(mp::Package & package) const { - package.data() = package.data() * 2; package.move(); }; }; @@ -139,7 +102,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 ) pack.router(router1).move(); - BOOST_CHECK_EQUAL(pack.data(), 2468); + //BOOST_CHECK_EQUAL(pack.data(), 2468); } @@ -155,7 +118,7 @@ BOOST_AUTO_UNIT_TEST( testfilter2_1 ) pack.router(router2).move(); - BOOST_CHECK_EQUAL(pack.data(), 1234); + //BOOST_CHECK_EQUAL(pack.data(), 1234); }