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

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index b1b79a1..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.15 2006-01-11 14:58:28 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"
@@ -13,30 +28,34 @@
 #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--; };
 };
 
-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"
@@ -60,11 +79,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);
         BOOST_CHECK_EQUAL(tfilter_ref, 2);
     }
     catch ( std::runtime_error &e) {
@@ -78,22 +97,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);
     }
-    catch ( yp2::XMLError &e) {
+    catch ( mp::XMLError &e) {
         std::cout << "XMLError: " << e.what() << "\n";
         got_error_as_expected = true;
     }
@@ -107,31 +126,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"
+            "    </mp:filter>\n"
+            "    <mp:filter id=\"log_cout\" type=\"log\">\n"
             "      <message>my msg</message>\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";
+            "    </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";
        
-        yp2::FactoryStatic factory;
-        yp2::RouterFleXML rflexml(xmlconf, factory);
+        mp::FactoryStatic factory;
+        mp::RouterFleXML rflexml(xmlconf, factory);
     }
     catch ( std::runtime_error &e) {
         std::cout << "std::runtime error: " << e.what() << "\n";
@@ -143,14 +163,15 @@ 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"
-            "  <start route=\"start\"/>\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"
@@ -161,14 +182,14 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
             "      <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);
     }
-    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) {