X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter2.cpp;h=4b7036807ffff4899ce70e5fb5888e7f5e58b1d7;hb=f82b19f2b93707657fee804bd1242f2548d51ada;hp=f4a9b3e12cba7f99f99cb575049fdfd647f7da05;hpb=cba94f69f50a7789d498212dd59938087e8cbf9f;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index f4a9b3e..4b70368 100644
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,3 +1,8 @@
+/* $Id: test_filter2.cpp,v 1.9 2005-10-15 14:09:09 adam Exp $
+   Copyright (c) 2005, Index Data.
+
+%LICENSE%
+ */
 
 
 #include "config.hpp"
@@ -13,20 +18,20 @@
 using namespace boost::unit_test;
 
 
-class FilterConstant: public yp2::Filter {
+class FilterConstant: public yp2::filter::Base {
 public:
-    yp2::Package & process(yp2::Package & package) const {
+    void process(yp2::Package & package) const {
 	package.data() = 1234;
-	return package.move();
+	package.move();
     };
 };
 
 
-class FilterDouble: public yp2::Filter {
+class FilterDouble: public yp2::filter::Base {
 public:
-    yp2::Package & process(yp2::Package & package) const {
+    void process(yp2::Package & package) const {
 	package.data() = package.data() * 2;
-	return package.move();
+	package.move();
     };
 };
     
@@ -46,31 +51,30 @@ BOOST_AUTO_TEST_CASE( testfilter2 )
 	    router1.rule(fc);
 	    
 	    router1.rule(fd);
+
+            yp2::Session session;
+            yp2::Origin origin;
+	    yp2::Package pack(session, origin);
 	    
-	    yp2::Package pack_in;
-	    
-	    yp2::Package pack_out;
-	    
-	    pack_out = pack_in.router(router1).move(); 
+	    pack.router(router1).move(); 
 	    
-            BOOST_CHECK (pack_out.data() == 2468);
+            BOOST_CHECK (pack.data() == 2468);
             
         }
         
         {
-            
 	    yp2::RouterChain router2;
 	    
 	    router2.rule(fd);
 	    router2.rule(fc);
 	    
-	    yp2::Package pack_in;
-	    
-	    yp2::Package pack_out;
-	    
-	    pack_out = pack_in.router(router2).move();
+            yp2::Session session;
+            yp2::Origin origin;
+	    yp2::Package pack(session, origin);
+	 
+            pack.router(router2).move();
      
-            BOOST_CHECK (pack_out.data() == 1234);
+            BOOST_CHECK (pack.data() == 1234);
             
 	}
 
@@ -89,6 +93,7 @@ BOOST_AUTO_TEST_CASE( testfilter2 )
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */