X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=c5159dd4963a3f7e9d3a85ab70b621d62f35f8b8;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=c1d34b2902a408608af37c19f6ab7fecc959b9ea;hpb=c3805961da509f3e6dc69d5134bd6512be4a8be8;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index c1d34b2..c5159dd 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,5 +1,5 @@
-/* $Id: test_filter2.cpp,v 1.11 2005-10-24 10:16:33 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_filter2.cpp,v 1.18 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, 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>
@@ -19,11 +19,12 @@
 
 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();
     };
@@ -109,54 +110,52 @@ bool FilterConstant::parse_xml_text(const xmlNode *xml_ptr, std::string &val)
 
 // 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);
             
 	}
 
@@ -171,13 +170,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"