X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=c81bef741982f13be8126ccb5971e833a052e059;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=8cfbf87ead04f7eabfbd2e60f70c52a2d0263e81;hpb=ad428707d2a52bbe4db21e47c5ebb26e13598484;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 8cfbf87..c81bef7 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,5 +1,5 @@
-/* $Id: test_router_flexml.cpp,v 1.9 2006-01-04 11:55:32 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_router_flexml.cpp,v 1.16 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -10,19 +10,29 @@
 
 #include "filter.hpp"
 #include "router_flexml.hpp"
-#include "filter_factory.hpp"
+#include "factory_static.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
 
-class TFilter: public yp2::filter::Base {
+namespace mp = metaproxy_1;
+
+static int tfilter_ref = 0;
+class TFilter: public mp::filter::Base {
 public:
-    void process(yp2::Package & package) const {};
+    void process(mp::Package & package) const {};
+    TFilter() { tfilter_ref++; };
+    ~TFilter() { tfilter_ref--; };
 };
-    
 
+static mp::filter::Base* filter_creator()
+{
+    return new TFilter;
+}
+
+// Pass well-formed XML and valid configuration to it (implicit NS)
 BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
 {
     try
@@ -32,40 +42,47 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
             "    <filter id=\"front_default\" type=\"frontend_net\">\n"
-            "      <port>210</port>\n"
+            "      <port>@:210</port>\n"
             "    </filter>\n"
             "    <filter id=\"log_cout1\" type=\"log\">\n"
-            "      <logfile>mylog1.log</logfile>\n"
+            "      <message>my msg</message>\n"
             "    </filter>\n"
+            "    <filter id=\"tfilter_id\" type=\"tfilter\"/>\n"
             "    <filter id=\"log_cout2\" type=\"log\">\n"
-            "      <logfile>mylog2.log</logfile>\n"
+            "      <message>other</message>\n"
             "    </filter>\n"
             "  </filters>\n"
             "  <routes>\n"  
             "    <route id=\"start\">\n"
             "      <filter refid=\"front_default\"/>\n"
-            "      <filter refid=\"log_cout\"/>\n"
+            "      <filter refid=\"log_cout1\"/>\n"
+            "      <filter type=\"tfilter\">\n"
+            "      </filter>\n"
+            "      <filter type=\"z3950_client\">\n"
+            "      </filter>\n"
             "    </route>\n"
             "  </routes>\n"
             "</yp2>\n";
-        yp2::RouterFleXML rflexml(xmlconf);
-    }
-    catch ( yp2::RouterFleXML::XMLError &e) {
-        std::cout << "XMLError: " << e.what() << "\n";
-        BOOST_CHECK (false);
+
+        mp::FactoryStatic factory;
+        factory.add_creator("tfilter", filter_creator);
+        mp::RouterFleXML rflexml(xmlconf, factory);
+        BOOST_CHECK_EQUAL(tfilter_ref, 2);
     }
-    catch ( yp2::FilterFactoryException &e) {
-        std::cout << "FilterFactoryException: " << e.what() << "\n";
+    catch ( std::runtime_error &e) {
+        std::cout << "std::runtime error: " << e.what() << "\n";
         BOOST_CHECK (false);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
+    BOOST_CHECK_EQUAL(tfilter_ref, 0);
 }
 
+// Pass non-wellformed XML
 BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
 {
-    bool got_xml_error = false;
+    bool got_error_as_expected = false;
     try
     {
         std::string xmlconf_invalid = "<?xml version=\"1.0\"?>\n"
@@ -73,19 +90,25 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
             "    <filter id=\"front_default\" type=\"frontend_net\">\n"
-            "      <port>210</port>\n";
+            "      <port>@:210</port>\n";
         
-        yp2::RouterFleXML rflexml(xmlconf_invalid);
+        mp::FactoryFilter factory;
+        mp::RouterFleXML rflexml(xmlconf_invalid, factory);
     }
-    catch ( yp2::RouterFleXML::XMLError &e) {
-        got_xml_error = true;
+    catch ( mp::XMLError &e) {
+        std::cout << "XMLError: " << e.what() << "\n";
+        got_error_as_expected = true;
+    }
+    catch ( std::runtime_error &e) {
+        std::cout << "std::runtime error: " << e.what() << "\n";
     }
     catch ( ... ) {
         ;
     }
-    BOOST_CHECK(got_xml_error);
+    BOOST_CHECK(got_error_as_expected);
 }
 
+// Pass well-formed XML with explicit NS
 BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
 {
     try
@@ -95,10 +118,10 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
             "  <y:start route=\"start\"/>\n"
             "  <y:filters>\n"
             "    <y:filter id=\"front_default\" type=\"frontend_net\">\n"
-            "      <port>210</port>\n"
+            "      <port>@:210</port>\n"
             "    </y:filter>\n"
             "    <y:filter id=\"log_cout\" type=\"log\">\n"
-            "      <logfile>mylog.log</logfile>\n"
+            "      <message>my msg</message>\n"
             "    </y:filter>\n"
             "  </y:filters>\n"
             "  <y:routes>\n"  
@@ -109,13 +132,53 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
             "  </y:routes>\n"
             "</y:yp2>\n";
        
-        yp2::RouterFleXML rflexml(xmlconf);
+        mp::FactoryStatic factory;
+        mp::RouterFleXML rflexml(xmlconf, factory);
+    }
+    catch ( std::runtime_error &e) {
+        std::cout << "std::runtime error: " << e.what() << "\n";
+        BOOST_CHECK (false);
     }
     catch ( ... ) {
         BOOST_CHECK (false);
     }
 }
 
+// Pass well-formed XML but bad filter type
+BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
+{
+    bool got_error_as_expected = false;
+    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=\"notknown\">\n"
+            "      <port>@:210</port>\n"
+            "    </filter>\n"
+            "  </filters>\n"
+            "  <routes>\n"  
+            "    <route id=\"start\">\n"
+            "      <filter refid=\"front_default\"/>\n"
+            "    </route>\n"
+            "  </routes>\n"
+            "</yp2>\n";
+
+        mp::FactoryStatic factory;
+        factory.add_creator("tfilter", filter_creator);
+        mp::RouterFleXML rflexml(xmlconf, factory);
+    }
+    catch ( mp::FactoryFilter::NotFound &e) {
+        std::cout << "mp::FactoryFilter::NotFound: " << e.what() << "\n";
+        got_error_as_expected = true;
+    }
+    catch ( std::runtime_error &e) {
+        std::cout << "std::runtime error: " << e.what() << "\n";
+    }
+    BOOST_CHECK(got_error_as_expected);
+}
+
 
 /*
  * Local variables: