All filters declare a yp2_filter_struct - used for both static and

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

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 000ee0b..e6ee8fc 100644 (file)
--- 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.8 2006-01-04 11:19:04 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,7 +31,7 @@ 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"
@@ -46,6 +47,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 +69,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 +91,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"