X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.test.cc;h=1a643b0594f77cb4393dc6c0aa7d2063d4587826;hb=c45c112ae88196ea8da9c5a9efb0e167196744d2;hp=b19f03f378227964f6153ef6c9800b2cd0ef6721;hpb=054f407988120bf96b648ad61068073e22db4f00;p=senf.git

diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc
index b19f03f..1a643b0 100644
--- a/Utils/Logger/Target.test.cc
+++ b/Utils/Logger/Target.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Target.test unit tests */
+    \brief Target unit tests */
 
 //#include "Target.test.hh"
 //#include "Target.test.ih"
@@ -59,6 +59,15 @@ BOOST_AUTO_UNIT_TEST(target)
 {
     senf::log::StringTarget target;
 
+    BOOST_CHECK_THROW( target.route("senf::log::test::myStream", "invalid_area"), 
+            senf::log::Target::InvalidAreaException );
+    BOOST_CHECK_THROW( target.route("invalid_stream", ""),
+            senf::log::Target::InvalidStreamException );
+    BOOST_CHECK_THROW( target.unroute("senf::log::test::myStream", "invalid_area"), 
+            senf::log::Target::InvalidAreaException );
+    BOOST_CHECK_THROW( target.unroute("invalid_stream", ""),
+            senf::log::Target::InvalidStreamException );
+
     target.route<senf::log::Debug>();
     target.route<senf::log::test::myStream, senf::log::DefaultArea>(senf::log::Target::REJECT);
     target.route<senf::log::test::myStream, senf::log::VERBOSE>(senf::log::Target::ACCEPT, 0);
@@ -86,7 +95,7 @@ BOOST_AUTO_UNIT_TEST(target)
     };
 
     BOOST_CHECK_EQUAL_COLLECTIONS( i, i_end, data, data + sizeof(data)/sizeof(data[0]) );
-    BOOST_CHECK_EQUAL( *target.begin(), target[0] );
+    BOOST_CHECK( *target.begin() == target[0] );
 
     target.unroute<senf::log::Debug>();
     target.unroute<senf::log::test::myStream, senf::log::VERBOSE>();
@@ -94,11 +103,11 @@ BOOST_AUTO_UNIT_TEST(target)
     target.unroute("senf::log::test::myStream", "", senf::log::IMPORTANT::value, 
                    senf::log::Target::REJECT);
     target.unroute(1);
-    target.clear();
+    target.flush();
 
     BOOST_CHECK( target.begin() == target.end() );
     BOOST_CHECK( target.empty() );
-    BOOST_CHECK( target.size() == 0 );
+    BOOST_CHECK_EQUAL( target.size(), 0u );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////