X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=95b05efa21a4801926d5f3900eb536279efa014b;hb=bb895b8ee8140a706435f3be5e20aa681595485b;hp=5bed848af57eb7fe2e1ed36d686ff172f24f38e4;hpb=0e4bd2f722c9cf0a83e7e4ef3d936c60c9419add;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 5bed848..95b05ef 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,7 +1,7 @@
-/* $Id: test_router_flexml.cpp,v 1.12 2006-01-05 16:39:37 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_router_flexml.cpp,v 1.17 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -17,15 +17,17 @@
 
 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;
 }
@@ -40,16 +42,14 @@ 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"
-            "    </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"  
@@ -64,9 +64,9 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
             "  </routes>\n"
             "</yp2>\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) {
@@ -90,12 +90,12 @@ 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::FactoryFilter factory;
-        yp2::RouterFleXML rflexml(xmlconf_invalid, factory);
+        mp::FactoryFilter factory;
+        mp::RouterFleXML rflexml(xmlconf_invalid, factory);
     }
-    catch ( yp2::RouterFleXML::XMLError &e) {
+    catch ( mp::XMLError &e) {
         std::cout << "XMLError: " << e.what() << "\n";
         got_error_as_expected = true;
     }
@@ -118,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"  
@@ -132,8 +132,8 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_3 )
             "  </y:routes>\n"
             "</y:yp2>\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";
@@ -155,7 +155,7 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
             "  <start route=\"start\"/>\n"
             "  <filters>\n"
             "    <filter id=\"front_default\" type=\"notknown\">\n"
-            "      <port>210</port>\n"
+            "      <port>@:210</port>\n"
             "    </filter>\n"
             "  </filters>\n"
             "  <routes>\n"  
@@ -165,12 +165,12 @@ BOOST_AUTO_UNIT_TEST( test_router_flexml_4 )
             "  </routes>\n"
             "</yp2>\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) {