X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_router_flexml.cpp;h=c45828681f284e0add4404ae82bc46ecc791fc40;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=2aac9e568ea9ed6a22d823d8049800f77957faf1;hpb=7467b072bb64f5c8575daa9917cce7df62d832f1;p=metaproxy-moved-to-github.git

diff --git a/src/test_router_flexml.cpp b/src/test_router_flexml.cpp
index 2aac9e5..c458286 100644
--- a/src/test_router_flexml.cpp
+++ b/src/test_router_flexml.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_router_flexml.cpp,v 1.2 2005-10-29 22:23:36 marc Exp $
+/* $Id: test_router_flexml.cpp,v 1.5 2005-12-02 12:21:07 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -19,41 +19,37 @@ using namespace boost::unit_test;
 class TFilter: public yp2::filter::Base {
 public:
     void process(yp2::Package & package) const {};
-    const std::string type() const {
-        return "TFilter";
-    };
 };
     
 
-BOOST_AUTO_TEST_CASE( test_router_flexml_1 )
+BOOST_AUTO_UNIT_TEST( test_router_flexml_1 )
 {
     try{
-        TFilter filter;
-
-        std::string xmlconf = "<?xml version=\"1.0\"?>"
-            "<yp2 xmlns=\"http://indexdata.dk/yp2/config/1\">"
-            "<start route=\"start\"/>"
-            "<filters>"
-            "<filter id=\"front_default\" type=\"frontend-net\">"
-            "<port>210</port>"
-            "</filter>"
-            "<filter id=\"log_cout\" type=\"log\">"
-            "<logfile>mylog.log</logfile>"
-            "</filter>"
-            "</filters>"
-            "<routes>"  
-            "<route id=\"start\">"
-            "<filter refid=\"front_default\"/>"
-            "<filter refid=\"log_cout\"/>"
-            "</route>"
-            "</routes>"
-            "</yp2>";
         
+        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);
         
-
+        
         BOOST_CHECK (true);
-
+        
         //BOOST_CHECK_EQUAL(filter.name(), std::string("filter1"));
         
     }