X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=ddfe832f726a55d2c968afb21c48dadd006ecffa;hb=9f255f52501e9429f643772a186cc7a72a5e8893;hp=3313d5483bfc33dc79e3492376986f676bea25ad;hpb=6bc88ade75f56744b360e623243de9b5eafa0c3d;p=metaproxy-moved-to-github.git diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp index 3313d54..ddfe832 100644 --- a/src/test_filter2.cpp +++ b/src/test_filter2.cpp @@ -1,7 +1,7 @@ -/* $Id: test_filter2.cpp,v 1.10 2005-10-24 09:53:06 adam Exp $ - Copyright (c) 2005, Index Data. +/* $Id: test_filter2.cpp,v 1.20 2006-06-10 14:29:12 adam Exp $ + Copyright (c) 2005-2006, Index Data. -%LICENSE% + See the LICENSE file for details */ #include @@ -9,7 +9,7 @@ #include "config.hpp" #include "filter.hpp" -#include "router.hpp" +#include "router_chain.hpp" #include "package.hpp" #include @@ -19,136 +19,108 @@ using namespace boost::unit_test; +namespace mp = metaproxy_1; -class FilterConstant: public yp2::filter::Base { +class FilterConstant: public mp::filter::Base { public: - void process(yp2::Package & package) const { - package.data() = 1234; + FilterConstant() : m_constant(1234) { }; + void process(mp::Package & package) const { + package.data() = m_constant; package.move(); }; - void configure(const xmlNode* ptr = 0) { - m_ptr = ptr; - - BOOST_CHECK_EQUAL (ptr->type, XML_ELEMENT_NODE); - BOOST_CHECK_EQUAL(std::string((const char *) ptr->name), "filter"); - - const struct _xmlAttr *attr; - - for (attr = ptr->properties; attr; attr = attr->next) - { - BOOST_CHECK_EQUAL( std::string((const char *)attr->name), "type"); - const xmlNode *val = attr->children; - BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE); - BOOST_CHECK_EQUAL(std::string((const char *)val->content), "constant"); - } - const xmlNode *p = ptr->children; - for (; p; p = p->next) - { - if (p->type != XML_ELEMENT_NODE) - continue; - - BOOST_CHECK_EQUAL (p->type, XML_ELEMENT_NODE); - BOOST_CHECK_EQUAL(std::string((const char *) p->name), "value"); - - const xmlNode *val = p->children; - BOOST_CHECK(val); - if (!val) - continue; - - BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE); - BOOST_CHECK_EQUAL(std::string((const char *)val->content), "2"); - } - } -private: - bool parse_xml_text(const xmlNode *xml_ptr, bool &val); - bool parse_xml_text(const xmlNode *xml_ptr, std::string &val); + void configure(const xmlNode* ptr = 0); + int get_constant() const { return m_constant; }; private: const xmlNode *m_ptr; + int m_constant; }; -bool FilterConstant::parse_xml_text(const xmlNode *xml_ptr, bool &val) +void FilterConstant::configure(const xmlNode* ptr) { - 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; -} + m_ptr = ptr; + + BOOST_CHECK_EQUAL (ptr->type, XML_ELEMENT_NODE); + BOOST_CHECK_EQUAL(std::string((const char *) ptr->name), "filter"); + + const struct _xmlAttr *attr; + + for (attr = ptr->properties; attr; attr = attr->next) + { + BOOST_CHECK_EQUAL( std::string((const char *)attr->name), "type"); + const xmlNode *val = attr->children; + BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE); + BOOST_CHECK_EQUAL(std::string((const char *)val->content), "constant"); + } + const xmlNode *p = ptr->children; + for (; p; p = p->next) + { + if (p->type != XML_ELEMENT_NODE) + continue; + + BOOST_CHECK_EQUAL (p->type, XML_ELEMENT_NODE); + BOOST_CHECK_EQUAL(std::string((const char *) p->name), "value"); + + const xmlNode *val = p->children; + BOOST_CHECK(val); + if (!val) + continue; + + BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE); + BOOST_CHECK_EQUAL(std::string((const char *)val->content), "2"); -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; + m_constant = atoi((const char *) val->content); + } } // This filter dose not have a configure function -class FilterDouble: public yp2::filter::Base { +class FilterDouble: public mp::filter::Base { public: - void process(yp2::Package & package) const { + void process(mp::Package & package) const { package.data() = package.data() * 2; package.move(); }; }; -BOOST_AUTO_TEST_CASE( testfilter2_1 ) +BOOST_AUTO_UNIT_TEST( testfilter2_1 ) { try { FilterConstant fc; - fc.name() = "FilterConstant"; FilterDouble fd; - fd.name() = "FilterDouble"; { - yp2::RouterChain router1; + mp::RouterChain router1; // test filter set/get/exception - router1.rule(fc); + router1.append(fc); - router1.rule(fd); + router1.append(fd); - yp2::Session session; - yp2::Origin origin; - yp2::Package pack(session, origin); + mp::Session session; + mp::Origin origin; + mp::Package pack(session, origin); pack.router(router1).move(); - BOOST_CHECK (pack.data() == 2468); + BOOST_CHECK_EQUAL(pack.data(), 2468); } { - yp2::RouterChain router2; + mp::RouterChain router2; - router2.rule(fd); - router2.rule(fc); + router2.append(fd); + router2.append(fc); - yp2::Session session; - yp2::Origin origin; - yp2::Package pack(session, origin); + mp::Session session; + mp::Origin origin; + mp::Package pack(session, origin); pack.router(router2).move(); - BOOST_CHECK (pack.data() == 1234); + BOOST_CHECK_EQUAL(pack.data(), 1234); } @@ -163,18 +135,20 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 ) } - -BOOST_AUTO_TEST_CASE( testfilter2_2 ) +BOOST_AUTO_UNIT_TEST( testfilter2_2 ) { try { FilterConstant fc; + BOOST_CHECK_EQUAL(fc.get_constant(), 1234); + + mp::filter::Base *base = &fc; std::string some_xml = "\n" "\n" " 2\n" ""; - std::cout << some_xml << std::endl; + // std::cout << some_xml << std::endl; xmlDocPtr doc = xmlParseMemory(some_xml.c_str(), some_xml.size()); @@ -184,10 +158,12 @@ BOOST_AUTO_TEST_CASE( testfilter2_2 ) { xmlNodePtr root_element = xmlDocGetRootElement(doc); - fc.configure(root_element); + base->configure(root_element); - FilterDouble fd; + xmlFreeDoc(doc); } + + BOOST_CHECK_EQUAL(fc.get_constant(), 2); } catch (std::exception &e) { std::cout << e.what() << "\n";