Make exception class for XML router

[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 2aac9e5..039eca5 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.2 2005-10-29 22:23:36 marc Exp $
+/* $Id: test_router_flexml.cpp,v 1.6 2005-12-08 15:34:08 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -19,49 +19,92 @@ using namespace boost::unit_test;
 class TFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-    const std::string type() const {
-        return "TFilter";
-    };
 };
     
 
-BOOST_AUTO_TEST_CASE( test_router_flexml_1 )
+BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
 {
-    try{
-        TFilter filter;
-
-        std::string xmlconf = "<?xml version=\"1.0\"?>"
-            "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">"
-            "<start route=\"start\"/>"
-            "<filters>"
-            "<filter id=\"front_default\" type=\"frontend-net\">"
-            "<port>210</port>"
-            "</filter>"
-            "<filter id=\"log_cout\" type=\"log\">"
-            "<logfile>mylog.log</logfile>"
-            "</filter>"
-            "</filters>"
-            "<routes>"  
-            "<route id=\"start\">"
-            "<filter refid=\"front_default\"/>"
-            "<filter refid=\"log_cout\"/>"
-            "</route>"
-            "</routes>"
-            "</yp2>";
-        
+    try
+    {
+        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"
+            "</yp2>\n";
+       
         yp2::RouterFleXML rflexml(xmlconf);
-        
+    }
+    catch ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
 
-        BOOST_CHECK (true);
+BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
+{
+    bool got_xml_error = false;
+    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";
 
-        //BOOST_CHECK_EQUAL(filter.name(), std::string("filter1"));
-        
+        yp2::RouterFleXML rflexml(xmlconf_invalid);
+    }
+    catch ( yp2::RouterFleXML::XMLError &e) {
+        got_xml_error = true;
+    }
+    catch ( ... ) {
+        ;
+    }
+    BOOST_CHECK(got_xml_error);
+}
+
+BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
+{
+    try
+    {
+        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"
+            "      <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"
+            "</y:yp2>\n";
+       
+        yp2::RouterFleXML rflexml(xmlconf);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
+
+
 /*
  * Local variables:
  * c-basic-offset: 4