X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=d9c254041e42dc1491bce01329fe0480e40a91c3;hb=75eedebe94c90cf8b72499594fa7f5a12f34c192;hp=1a30019f495254090ee5d880229c7be53a71fe4d;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 1a30019..d9c2540 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,58 +1,73 @@
-/* $Id: test_router_flexml.cpp,v 1.13 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-%LICENSE%
- */
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include <iostream>
 #include <stdexcept>
 
-#include "filter.hpp"
+#include <metaproxy/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;
 
+namespace mp = metaproxy_1;
+
 static int tfilter_ref = 0;
-class TFilter: public yp2::filter::Base {
+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--; };
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
-static yp2::filter::Base* filter_creator()
+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 )
+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"
+            "<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"
-            "      <logfile>mylog1.log</logfile>\n"
-            "    </filter>\n"
-            "    <filter id=\"tfilter_id\" type=\"tfilter\">\n"
-            "      <someelement/>\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"  
+            "  <routes>\n"
             "    <route id=\"start\">\n"
             "      <filter refid=\"front_default\"/>\n"
             "      <filter refid=\"log_cout1\"/>\n"
@@ -62,11 +77,11 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "      </filter>\n"
             "    </route>\n"
             "  </routes>\n"
-            "</yp2>\n";
+            "</metaproxy>\n";
 
-        yp2::FactoryStatic factory;
+        mp::FactoryStatic factory;
         factory.add_creator("tfilter", filter_creator);
-        yp2::RouterFleXML rflexml(xmlconf, factory);
+        mp::RouterFleXML rflexml(xmlconf, factory, true);
         BOOST_CHECK_EQUAL(tfilter_ref, 2);
     }
     catch ( std::runtime_error &e) {
@@ -80,22 +95,22 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
 }
 
 // Pass non-wellformed XML
-BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
+BOOST_AUTO_TEST_CASE( test_router_flexml_2 )
 {
     bool got_error_as_expected = false;
     try
     {
         std::string xmlconf_invalid = "<?xml version=\"1.0\"?>\n"
-            "<y:yp2 xmlns:y=\"http://indexdata.dk/yp2/config/1\">\n"
+            "<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";
-        
-        yp2::FactoryFilter factory;
-        yp2::RouterFleXML rflexml(xmlconf_invalid, factory);
+
+        mp::FactoryFilter factory;
+        mp::RouterFleXML rflexml(xmlconf_invalid, factory, true);
     }
-    catch ( yp2::RouterFleXML::XMLError &e) {
+    catch ( mp::XMLError &e) {
         std::cout << "XMLError: " << e.what() << "\n";
         got_error_as_expected = true;
     }
@@ -109,31 +124,32 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
 }
 
 // Pass well-formed XML with explicit NS
-BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
+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"
-            "  <y:start route=\"start\"/>\n"
-            "  <y:filters>\n"
-            "    <y:filter id=\"front_default\" type=\"frontend_net\">\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"
-            "    </y:filter>\n"
-            "    <y:filter id=\"log_cout\" type=\"log\">\n"
-            "      <logfile>mylog.log</logfile>\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::FactoryStatic factory;
-        yp2::RouterFleXML rflexml(xmlconf, factory);
+            "    </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, true);
     }
     catch ( std::runtime_error &e) {
         std::cout << "std::runtime error: " << e.what() << "\n";
@@ -145,32 +161,33 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
 }
 
 // Pass well-formed XML but bad filter type
-BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
+BOOST_AUTO_TEST_CASE( 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"
+            "<metaproxy xmlns=\"http://indexdata.com/metaproxy\""
+            " version=\"1.0\">\n"
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
             "    <filter id=\"front_default\" type=\"notknown\">\n"
             "      <port>@:210</port>\n"
             "    </filter>\n"
             "  </filters>\n"
-            "  <routes>\n"  
+            "  <routes>\n"
             "    <route id=\"start\">\n"
             "      <filter refid=\"front_default\"/>\n"
             "    </route>\n"
             "  </routes>\n"
-            "</yp2>\n";
+            "</metaproxy>\n";
 
-        yp2::FactoryStatic factory;
+        mp::FactoryStatic factory;
         factory.add_creator("tfilter", filter_creator);
-        yp2::RouterFleXML rflexml(xmlconf, factory);
+        mp::RouterFleXML rflexml(xmlconf, factory, true);
     }
-    catch ( yp2::FactoryFilter::NotFound &e) {
-        std::cout << "yp2::FactoryFilter::NotFound: " << e.what() << "\n";
+    catch ( mp::FactoryFilter::NotFound &e) {
+        std::cout << "mp::FactoryFilter::NotFound: " << e.what() << "\n";
         got_error_as_expected = true;
     }
     catch ( std::runtime_error &e) {
@@ -183,8 +200,9 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+