projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configure from XML
[metaproxy-moved-to-github.git]
/
src
/
test_filter2.cpp
diff --git
a/src/test_filter2.cpp
b/src/test_filter2.cpp
index
f91e143
..
b6f8e21
100644
(file)
--- a/
src/test_filter2.cpp
+++ b/
src/test_filter2.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2009 Index Data
+ Copyright (C) 2005-2013 Index Data
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Metaproxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-16,13
+16,14
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.hpp"
+
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include "config.hpp"
-#include "filter.hpp"
+#include <metaproxy/filter.hpp>
#include "router_chain.hpp"
#include "router_chain.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
#include <iostream>
#include <iostream>
@@
-40,7
+41,7
@@
public:
void process(mp::Package & package) const {
package.move();
};
void process(mp::Package & package) const {
package.move();
};
- void configure(const xmlNode* ptr, bool test_only);
+ void configure(const xmlNode* ptr, bool test_only, const char *path);
int get_constant() const { return m_constant; };
private:
const xmlNode *m_ptr;
int get_constant() const { return m_constant; };
private:
const xmlNode *m_ptr;
@@
-48,15
+49,16
@@
private:
};
};
-void FilterConstant::configure(const xmlNode* ptr, bool test_only)
+void FilterConstant::configure(const xmlNode* ptr, bool test_only,
+ const char *path)
{
m_ptr = ptr;
BOOST_CHECK_EQUAL (ptr->type, XML_ELEMENT_NODE);
BOOST_CHECK_EQUAL(std::string((const char *) ptr->name), "filter");
{
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;
const struct _xmlAttr *attr;
-
+
for (attr = ptr->properties; attr; attr = attr->next)
{
BOOST_CHECK_EQUAL( std::string((const char *)attr->name), "type");
for (attr = ptr->properties; attr; attr = attr->next)
{
BOOST_CHECK_EQUAL( std::string((const char *)attr->name), "type");
@@
-69,15
+71,15
@@
void FilterConstant::configure(const xmlNode* ptr, bool test_only)
{
if (p->type != XML_ELEMENT_NODE)
continue;
{
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");
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;
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");
BOOST_CHECK_EQUAL(val->type, XML_TEXT_NODE);
BOOST_CHECK_EQUAL(std::string((const char *)val->content), "2");
@@
-86,16
+88,18
@@
void FilterConstant::configure(const xmlNode* ptr, bool test_only)
}
// This filter dose not have a configure function
}
// This filter dose not have a configure function
-
+
class FilterDouble: public mp::filter::Base {
public:
void process(mp::Package & package) const {
package.move();
};
class FilterDouble: public mp::filter::Base {
public:
void process(mp::Package & package) const {
package.move();
};
+ void configure(const xmlNode * ptr, bool test_only,
+ const char *path) { };
};
};
-BOOST_AUTO_TEST_CASE( testfilter2_1 )
+BOOST_AUTO_TEST_CASE( testfilter2_1 )
{
try {
FilterConstant fc;
{
try {
FilterConstant fc;
@@
-103,36
+107,36
@@
BOOST_AUTO_TEST_CASE( testfilter2_1 )
{
mp::RouterChain router1;
{
mp::RouterChain router1;
-
+
// test filter set/get/exception
router1.append(fc);
// test filter set/get/exception
router1.append(fc);
-
+
router1.append(fd);
mp::Session session;
mp::Origin origin;
mp::Package pack(session, origin);
router1.append(fd);
mp::Session session;
mp::Origin origin;
mp::Package pack(session, origin);
-
- pack.router(router1).move();
-
+
+ pack.router(router1).move();
+
//BOOST_CHECK_EQUAL(pack.data(), 2468);
//BOOST_CHECK_EQUAL(pack.data(), 2468);
-
+
}
}
-
+
{
mp::RouterChain router2;
{
mp::RouterChain router2;
-
+
router2.append(fd);
router2.append(fc);
router2.append(fd);
router2.append(fc);
-
+
mp::Session session;
mp::Origin origin;
mp::Package pack(session, origin);
mp::Session session;
mp::Origin origin;
mp::Package pack(session, origin);
-
+
pack.router(router2).move();
pack.router(router2).move();
-
+
//BOOST_CHECK_EQUAL(pack.data(), 1234);
//BOOST_CHECK_EQUAL(pack.data(), 1234);
-
+
}
}
}
}
@@
-146,7
+150,7
@@
BOOST_AUTO_TEST_CASE( testfilter2_1 )
}
}
-BOOST_AUTO_TEST_CASE( testfilter2_2 )
+BOOST_AUTO_TEST_CASE( testfilter2_2 )
{
try {
FilterConstant fc;
{
try {
FilterConstant fc;
@@
-158,7
+162,7
@@
BOOST_AUTO_TEST_CASE( testfilter2_2 )
"<filter type=\"constant\">\n"
" <value>2</value>\n"
"</filter>";
"<filter type=\"constant\">\n"
" <value>2</value>\n"
"</filter>";
-
+
// std::cout << some_xml << std::endl;
xmlDocPtr doc = xmlParseMemory(some_xml.c_str(), some_xml.size());
// std::cout << some_xml << std::endl;
xmlDocPtr doc = xmlParseMemory(some_xml.c_str(), some_xml.size());
@@
-168,9
+172,9
@@
BOOST_AUTO_TEST_CASE( testfilter2_2 )
if (doc)
{
xmlNodePtr root_element = xmlDocGetRootElement(doc);
if (doc)
{
xmlNodePtr root_element = xmlDocGetRootElement(doc);
-
- base->configure(root_element, true);
-
+
+ base->configure(root_element, true, 0);
+
xmlFreeDoc(doc);
}
xmlFreeDoc(doc);
}