X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=d9c254041e42dc1491bce01329fe0480e40a91c3;hb=4a46c6ad125dde75e1e35a09f8388f43eab5bb39;hp=3cf58b6ceeb0988d5f53d04a03658b82968a1586;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 3cf58b6..d9c2540 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_router_flexml.cpp,v 1.20 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 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
@@ -14,20 +12,20 @@ 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.
- */
+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;
@@ -40,6 +38,7 @@ public:
     void process(mp::Package & package) const {};
     TFilter() { tfilter_ref++; };
     ~TFilter() { tfilter_ref--; };
+    void configure(const xmlNode* ptr, bool test_only, const char *path) {};
 };
 
 static mp::filter::Base* filter_creator()
@@ -48,7 +47,7 @@ static mp::filter::Base* filter_creator()
 }
 
 // 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
     {
@@ -68,7 +67,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "      <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"
@@ -82,7 +81,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
 
         mp::FactoryStatic factory;
         factory.add_creator("tfilter", filter_creator);
-        mp::RouterFleXML rflexml(xmlconf, factory);
+        mp::RouterFleXML rflexml(xmlconf, factory, true);
         BOOST_CHECK_EQUAL(tfilter_ref, 2);
     }
     catch ( std::runtime_error &e) {
@@ -96,7 +95,7 @@ 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
@@ -107,9 +106,9 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_2 )
             "  <filters>\n"
             "    <filter id=\"front_default\" type=\"frontend_net\">\n"
             "      <port>@:210</port>\n";
-        
+
         mp::FactoryFilter factory;
-        mp::RouterFleXML rflexml(xmlconf_invalid, factory);
+        mp::RouterFleXML rflexml(xmlconf_invalid, factory, true);
     }
     catch ( mp::XMLError &e) {
         std::cout << "XMLError: " << e.what() << "\n";
@@ -125,7 +124,7 @@ 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
     {
@@ -141,16 +140,16 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
             "      <message>my msg</message>\n"
             "    </mp:filter>\n"
             "  </mp:filters>\n"
-            "  <mp:routes>\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);
+        mp::RouterFleXML rflexml(xmlconf, factory, true);
     }
     catch ( std::runtime_error &e) {
         std::cout << "std::runtime error: " << e.what() << "\n";
@@ -162,7 +161,7 @@ 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
@@ -170,13 +169,13 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
         std::string xmlconf = "<?xml version=\"1.0\"?>\n"
             "<metaproxy xmlns=\"http://indexdata.com/metaproxy\""
             " version=\"1.0\">\n"
-            "  <start route=\"start\"/>\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"
@@ -185,7 +184,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
 
         mp::FactoryStatic factory;
         factory.add_creator("tfilter", filter_creator);
-        mp::RouterFleXML rflexml(xmlconf, factory);
+        mp::RouterFleXML rflexml(xmlconf, factory, true);
     }
     catch ( mp::FactoryFilter::NotFound &e) {
         std::cout << "mp::FactoryFilter::NotFound: " << e.what() << "\n";
@@ -201,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
  */
+