Improve element checking in XML config reader

[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 039eca5..000ee0b 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.6 2005-12-08 15:34:08 adam Exp $
+/* $Id: test_router_flexml.cpp,v 1.7 2005-12-08 22:32:58 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -28,23 +28,22 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
     {
         std::string xmlconf = "<?xml version=\"1.0\"?>\n"
             "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">\n"
-            "<start route=\"start\"/>\n"
-            "<filters>\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>\n"
-            "</filters>\n"
-            "<routes>\n"  
-            "<route id=\"start\">\n"
-            "<filter refid=\"front_default\"/>\n"
-            "<filter refid=\"log_cout\"/>\n"
-            "</route>\n"
-            "</routes>\n"
+            "  <start route=\"start\"/>\n"
+            "  <filters>\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>\n"
+            "  </filters>\n"
+            "  <routes>\n"  
+            "    <route id=\"start\">\n"
+            "      <filter refid=\"front_default\"/>\n"
+            "      <filter refid=\"log_cout\"/>\n"
+            "    </route>\n"
+            "  </routes>\n"
             "</yp2>\n";
-       
         yp2::RouterFleXML rflexml(xmlconf);
     }
     catch ( ... ) {
@@ -58,10 +57,12 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
     try
     {
         std::string xmlconf_invalid = "<?xml version=\"1.0\"?>\n"
-            "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">\n"
-            "<start route=\"start\"/>\n"
-            "<filters>\n";
-
+            "<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"
+            "      <port>210</port>\n";
+        
         yp2::RouterFleXML rflexml(xmlconf_invalid);
     }
     catch ( yp2::RouterFleXML::XMLError &e) {
@@ -79,21 +80,21 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
     {
         std::string xmlconf = "<?xml version=\"1.0\"?>\n"
             "<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"
+            "  <y:start route=\"start\"/>\n"
+            "  <y:filters>\n"
+            "    <y:filter id=\"front_default\" type=\"frontend-net\">\n"
             "      <port>210</port>\n"
-            "    </filter>\n"
-            "    <filter id=\"log_cout\" type=\"log\">\n"
+            "    </y:filter>\n"
+            "    <y:filter id=\"log_cout\" type=\"log\">\n"
             "      <logfile>mylog.log</logfile>\n"
-            "    </filter>\n"
-            "  </filters>\n"
-            "  <routes>\n"  
-            "    <route id=\"start\">\n"
-            "      <filter refid=\"front_default\"/>\n"
-            "      <filter refid=\"log_cout\"/>\n"
-            "    </route>\n"
-            "  </routes>\n"
+            "    </y:filter>\n"
+            "  </y:filters>\n"
+            "  <y:routes>\n"  
+            "    <y:route id=\"start\">\n"
+            "      <y:filter refid=\"front_default\"/>\n"
+            "      <y:filter refid=\"log_cout\"/>\n"
+            "    </y:route>\n"
+            "  </y:routes>\n"
             "</y:yp2>\n";
        
         yp2::RouterFleXML rflexml(xmlconf);
@@ -104,7 +105,6 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
 }
 
 
-
 /*
  * Local variables:
  * c-basic-offset: 4