Filter virt_db allows multiple databases.. Each of these is

[metaproxy-moved-to-github.git] / src / test_filter2.cpp

diff --git a/src/test_filter2.cpp b/src/test_filter2.cpp
index b92d043..12d6ef5 100644 (file)
--- a/src/test_filter2.cpp
+++ b/src/test_filter2.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter2.cpp,v 1.12 2005-10-26 10:21:03 marc Exp $
+/* $Id: test_filter2.cpp,v 1.17 2006-01-09 13:43:59 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -118,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;
@@ -140,15 +138,15 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
            
            pack.router(router1).move(); 
            
-            BOOST_CHECK (pack.data() == 2468);
+            BOOST_CHECK_EQUAL(pack.data(), 2468);
             
         }
         
         {
            yp2::RouterChain router2;
            
-           router2.rule(fd);
-           router2.rule(fc);
+           router2.append(fd);
+           router2.append(fc);
            
             yp2::Session session;
             yp2::Origin origin;
@@ -156,7 +154,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
         
             pack.router(router2).move();
      
-            BOOST_CHECK (pack.data() == 1234);
+            BOOST_CHECK_EQUAL(pack.data(), 1234);
             
        }
 
@@ -171,7 +169,7 @@ BOOST_AUTO_TEST_CASE( testfilter2_1 )
 
 }
 
-BOOST_AUTO_TEST_CASE( testfilter2_2 ) 
+BOOST_AUTO_UNIT_TEST( testfilter2_2 ) 
 {
     try {
        FilterConstant fc;