X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=fb34da012cdae9eb000ab8ecf05c499c0afa091c;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=3313d5483bfc33dc79e3492376986f676bea25ad;hpb=6bc88ade75f56744b360e623243de9b5eafa0c3d;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index 3313d54..fb34da0 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter2.cpp,v 1.10 2005-10-24 09:53:06 adam Exp $
+/* $Id: test_filter2.cpp,v 1.16 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -9,7 +9,7 @@
 
 #include "config.hpp"
 #include "filter.hpp"
-#include "router.hpp"
+#include "router_chain.hpp"
 #include "package.hpp"
 
 #include <iostream>
@@ -22,51 +22,59 @@ using namespace boost::unit_test;
 
 class FilterConstant: public yp2::filter::Base {
 public:
+    FilterConstant() : m_constant(1234) { };
     void process(yp2::Package & package) const {
-	package.data() = 1234;
+	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");
-        }
-    }
+    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;
 };
 
 
+void FilterConstant::configure(const xmlNode* ptr)
+{
+    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");
+
+        m_constant = atoi((const char *) val->content);
+    }
+}
+
 bool FilterConstant::parse_xml_text(const xmlNode  *xml_ptr, bool &val)
 {
     std::string v;
@@ -110,21 +118,19 @@ public:
 };
 
     
-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;
 	    
 	    // test filter set/get/exception
-	    router1.rule(fc);
+	    router1.append(fc);
 	    
-	    router1.rule(fd);
+	    router1.append(fd);
 
             yp2::Session session;
             yp2::Origin origin;
@@ -139,8 +145,8 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
         {
 	    yp2::RouterChain router2;
 	    
-	    router2.rule(fd);
-	    router2.rule(fc);
+	    router2.append(fd);
+	    router2.append(fc);
 	    
             yp2::Session session;
             yp2::Origin origin;
@@ -163,18 +169,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);
+
+        yp2::filter::Base *base = &fc;
 
         std::string some_xml = "<?xml version=\"1.0\"?>\n"
             "<filter type=\"constant\">\n"
             " <value>2</value>\n"
             "</filter>";
         
-        std::cout << some_xml  << std::endl;
+        // std::cout << some_xml  << std::endl;
 
         xmlDocPtr doc = xmlParseMemory(some_xml.c_str(), some_xml.size());
 
@@ -184,10 +192,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";