X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=ddfe832f726a55d2c968afb21c48dadd006ecffa;hb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;hp=9325f05db7db79ebafc90997bd284ba0b55ae7b5;hpb=e9420d437bd61c8683058af046a8dd90c859b6bc;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index 9325f05..ddfe832 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_filter2.cpp,v 1.13 2005-10-26 10:55:26 marc 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 <libxml/parser.h>
@@ -19,20 +19,18 @@
 
 using namespace boost::unit_test;
 
+namespace mp = metaproxy_1;
 
-class FilterConstant: public yp2::filter::Base {
+class FilterConstant: public mp::filter::Base {
 public:
     FilterConstant() : m_constant(1234) { };
-    void process(yp2::Package & package) const {
+    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;
 };
@@ -75,88 +73,54 @@ 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 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.append(fc);
 	    
 	    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.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);
             
 	}
 
@@ -171,13 +135,13 @@ 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;
+        mp::filter::Base *base = &fc;
 
         std::string some_xml = "<?xml version=\"1.0\"?>\n"
             "<filter type=\"constant\">\n"