X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=8cfbf87ead04f7eabfbd2e60f70c52a2d0263e81;hb=ad428707d2a52bbe4db21e47c5ebb26e13598484;hp=000ee0b44ffaa823d8dc95270e0cbb475e708e41;hpb=111438f9a883ac784b4ce743a7e83fb8a5b3ff4d;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 000ee0b..8cfbf87 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_router_flexml.cpp,v 1.7 2005-12-08 22:32:58 adam Exp $
+/* $Id: test_router_flexml.cpp,v 1.9 2006-01-04 11:55:32 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -10,6 +10,7 @@
 
 #include "filter.hpp"
 #include "router_flexml.hpp"
+#include "filter_factory.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
@@ -30,11 +31,14 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">\n"
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
-            "    <filter id=\"front_default\" type=\"frontend-net\">\n"
+            "    <filter id=\"front_default\" type=\"frontend_net\">\n"
             "      <port>210</port>\n"
             "    </filter>\n"
-            "    <filter id=\"log_cout\" type=\"log\">\n"
-            "      <logfile>mylog.log</logfile>\n"
+            "    <filter id=\"log_cout1\" type=\"log\">\n"
+            "      <logfile>mylog1.log</logfile>\n"
+            "    </filter>\n"
+            "    <filter id=\"log_cout2\" type=\"log\">\n"
+            "      <logfile>mylog2.log</logfile>\n"
             "    </filter>\n"
             "  </filters>\n"
             "  <routes>\n"  
@@ -46,6 +50,14 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "</yp2>\n";
         yp2::RouterFleXML rflexml(xmlconf);
     }
+    catch ( yp2::RouterFleXML::XMLError &e) {
+        std::cout << "XMLError: " << e.what() << "\n";
+        BOOST_CHECK (false);
+    }
+    catch ( yp2::FilterFactoryException &e) {
+        std::cout << "FilterFactoryException: " << e.what() << "\n";
+        BOOST_CHECK (false);
+    }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
@@ -60,7 +72,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
             "<y:yp2 xmlns:y=\"http://indexdata.dk/yp2/config/1\">\n"
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
-            "    <filter id=\"front_default\" type=\"frontend-net\">\n"
+            "    <filter id=\"front_default\" type=\"frontend_net\">\n"
             "      <port>210</port>\n";
         
         yp2::RouterFleXML rflexml(xmlconf_invalid);
@@ -82,7 +94,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
             "<y:yp2 xmlns:y=\"http://indexdata.dk/yp2/config/1\">\n"
             "  <y:start route=\"start\"/>\n"
             "  <y:filters>\n"
-            "    <y:filter id=\"front_default\" type=\"frontend-net\">\n"
+            "    <y:filter id=\"front_default\" type=\"frontend_net\">\n"
             "      <port>210</port>\n"
             "    </y:filter>\n"
             "    <y:filter id=\"log_cout\" type=\"log\">\n"