X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=b0daf7782f3fa454328a89d40b0456b93743cc05;hb=0264192f26c10308aad161983ea29568c96521a6;hp=039eca55aa3519e21666ab46fe68665f765f7b9e;hpb=6ed3503878603e0bae8ab0ee62bf900b3a60f2ca;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 039eca5..b0daf77 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,7 +1,22 @@
-/* $Id: test_router_flexml.cpp,v 1.6 2005-12-08 15:34:08 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_router_flexml.cpp,v 1.21 2007-11-02 17:47:41 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include "config.hpp"
@@ -10,101 +25,180 @@
 
 #include "filter.hpp"
 #include "router_flexml.hpp"
+#include "factory_static.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #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--; };
 };
-    
 
-BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
+static mp::filter::Base* filter_creator()
+{
+    return new TFilter;
+}
+
+// Pass well-formed XML and valid configuration to it (implicit NS)
+BOOST_AUTO_TEST_CASE( test_router_flexml_1 )
 {
     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);
+            "<metaproxy xmlns=\"http://indexdata.com/metaproxy\""
+            " version=\"1.0\">\n"
+            "  <start route=\"start\"/>\n"
+            "  <filters>\n"
+            "    <filter id=\"front_default\" type=\"frontend_net\">\n"
+            "      <port>@:210</port>\n"
+            "    </filter>\n"
+            "    <filter id=\"log_cout1\" type=\"log\">\n"
+            "      <message>my msg</message>\n"
+            "    </filter>\n"
+            "    <filter id=\"tfilter_id\" type=\"tfilter\"/>\n"
+            "    <filter id=\"log_cout2\" type=\"log\">\n"
+            "      <message>other</message>\n"
+            "    </filter>\n"
+            "  </filters>\n"
+            "  <routes>\n"  
+            "    <route id=\"start\">\n"
+            "      <filter refid=\"front_default\"/>\n"
+            "      <filter refid=\"log_cout1\"/>\n"
+            "      <filter type=\"tfilter\">\n"
+            "      </filter>\n"
+            "      <filter type=\"z3950_client\">\n"
+            "      </filter>\n"
+            "    </route>\n"
+            "  </routes>\n"
+            "</metaproxy>\n";
+
+        mp::FactoryStatic factory;
+        factory.add_creator("tfilter", filter_creator);
+        mp::RouterFleXML rflexml(xmlconf, factory);
+        BOOST_CHECK_EQUAL(tfilter_ref, 2);
+    }
+    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);
 }
 
-BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
+// Pass non-wellformed XML
+BOOST_AUTO_TEST_CASE( 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"
-            "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">\n"
-            "<start route=\"start\"/>\n"
-            "<filters>\n";
-
-        yp2::RouterFleXML rflexml(xmlconf_invalid);
+            "<mp:metaproxy xmlns:mp=\"http://indexdata.com/metaproxy\" version=\"1.0\">\n"
+            "  <start route=\"start\"/>\n"
+            "  <filters>\n"
+            "    <filter id=\"front_default\" type=\"frontend_net\">\n"
+            "      <port>@:210</port>\n";
+        
+        mp::FactoryFilter factory;
+        mp::RouterFleXML rflexml(xmlconf_invalid, factory);
+    }
+    catch ( mp::XMLError &e) {
+        std::cout << "XMLError: " << e.what() << "\n";
+        got_error_as_expected = true;
     }
-    catch ( yp2::RouterFleXML::XMLError &e) {
-        got_xml_error = 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);
 }
 
-BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
+// Pass well-formed XML with explicit NS
+BOOST_AUTO_TEST_CASE( 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"
+            "<mp:metaproxy xmlns:mp=\"http://indexdata.com/metaproxy\""
+            "  version=\"1.0\">\n"
+            "  <mp:start route=\"start\"/>\n"
+            "  <mp:filters>\n"
+            "    <mp:filter id=\"front_default\" type=\"frontend_net\">\n"
+            "      <port>@:210</port>\n"
+            "    </mp:filter>\n"
+            "    <mp:filter id=\"log_cout\" type=\"log\">\n"
+            "      <message>my msg</message>\n"
+            "    </mp:filter>\n"
+            "  </mp:filters>\n"
+            "  <mp:routes>\n"  
+            "    <mp:route id=\"start\">\n"
+            "      <mp:filter refid=\"front_default\"/>\n"
+            "      <mp:filter refid=\"log_cout\"/>\n"
+            "    </mp:route>\n"
+            "  </mp:routes>\n"
+            "</mp:metaproxy>\n";
+       
+        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_TEST_CASE( test_router_flexml_4 )
+{
+    bool got_error_as_expected = false;
+    try
+    {
+        std::string xmlconf = "<?xml version=\"1.0\"?>\n"
+            "<metaproxy xmlns=\"http://indexdata.com/metaproxy\""
+            " version=\"1.0\">\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 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"
-            "      <filter refid=\"log_cout\"/>\n"
             "    </route>\n"
             "  </routes>\n"
-            "</y:yp2>\n";
-       
-        yp2::RouterFleXML rflexml(xmlconf);
+            "</metaproxy>\n";
+
+        mp::FactoryStatic factory;
+        factory.add_creator("tfilter", filter_creator);
+        mp::RouterFleXML rflexml(xmlconf, factory);
     }
-    catch ( ... ) {
-        BOOST_CHECK (false);
+    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:
  * c-basic-offset: 4