X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FLog.test.cc;h=0fbbfb9e387db0a7c78494b22e49a1b704b96d21;hb=412024ed31a4ab4eaea7a4165a434f8efebee325;hp=000164ef1064affe6265d3bd3cae0bf7aa13daed;hpb=61419d9a2e1060f7ede22fa19fd9d0b401bbc87a;p=senf.git

diff --git a/Utils/Logger/Log.test.cc b/Utils/Logger/Log.test.cc
index 000164e..0fbbfb9 100644
--- a/Utils/Logger/Log.test.cc
+++ b/Utils/Logger/Log.test.cc
@@ -1,8 +1,8 @@
-// $Id: Log.test.cc 369 2007-08-01 07:51:36Z tho $
+// $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -27,89 +27,59 @@
 //#include "Log.test.ih"
 
 // Custom includes
-#include <sstream>
-
-// We need to put all tests into this single file to not violate the ODR
-
-#define _senf_LOG_STREAM logstream
-namespace {
-    std::stringstream logstream;
-}
-
-#define SENF_LOG_CONF (( (senf)(log)(Debug), (_), NOTICE ))
-
-#include "Logger.hh"
-
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
+#include "main.test.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-namespace not_anonymous {
-    
-    struct Foo
-    {
-        SENF_LOG_CLASS_AREA();
-
-        static void log() {
-            SENF_LOG(("Foo::log"));
-        }
-    };
-
-    SENF_LOG_DEF_ALIAS( LogCritical, (senf::log::Debug) (senf::log::CRITICAL) );
-    SENF_LOG_DEF_STREAM( myStream, senf::log::MESSAGE, senf::log::MESSAGE, senf::log::MESSAGE );
-    SENF_LOG_DEF_AREA( myArea );
-
-}
-using namespace not_anonymous;
-
 BOOST_AUTO_UNIT_TEST(logger)
 {
+    senf::log::StringTarget target;
+
+    target.route<senf::log::Debug>();
+
+    // We cannot easily check the exact log string since that includes the current date/time
+    
     SENF_LOG_DEFAULT_STREAM(senf::log::Debug);
     SENF_LOG_DEFAULT_AREA(senf::log::DefaultArea);
     SENF_LOG_DEFAULT_LEVEL(senf::log::VERBOSE);
 
-    // should be disabled
     SENF_LOG(("Log message"));
+    BOOST_CHECK( target.str().empty() );
+    target.clear();
+
     SENF_LOG((senf::log::VERBOSE)("Log message 2"));
-    // should be enabled
+    BOOST_CHECK( target.str().empty() );
+    target.clear();
+    
     SENF_LOG((senf::log::IMPORTANT)("Important message"));
-    SENF_LOG((LogCritical) ("Another log message: " << 10));
+    std::cerr << target.str();
+    BOOST_CHECK( ! target.str().empty() );
+    target.clear();
+
+    SENF_LOG((senf::log::test::LogCritical) ("Another log message: " << 10));
+    std::cerr << target.str();
+    BOOST_CHECK( ! target.str().empty() );
+    target.clear();
 
     SENF_LOG_BLOCK((senf::log::Debug) (senf::log::IMPORTANT) ({
         log << "Last message";
         log << " continued here";
     }));
-
-    Foo::log();
-    SENF_LOG((Foo)("Foo area"));
-
-    BOOST_CHECK_EQUAL( logstream.str(), 
-                       "Important message\n"
-                       "Another log message: 10\n"
-                       "Last message continued here\n"
-                       "Foo::log\n" );
-}
-
-BOOST_AUTO_UNIT_TEST(streamRegistry)
-{
-    char const * streams[] = { "not_anonymous::myStream", "senf::log::Debug" };
-
-    BOOST_CHECK_EQUAL_COLLECTIONS( senf::log::StreamRegistry::instance().begin(),
-                                   senf::log::StreamRegistry::instance().end(),
-                                   streams, streams+sizeof(streams)/sizeof(streams[0]) );
-    BOOST_CHECK_EQUAL( senf::log::detail::StreamBase::nStreams, 2u );
-}
-
-BOOST_AUTO_UNIT_TEST(areaRegistry)
-{
-    char const * areas[] = { "", "not_anonymous::Foo", "not_anonymous::myArea" };
-
-    BOOST_CHECK_EQUAL_COLLECTIONS( senf::log::AreaRegistry::instance().begin(),
-                                   senf::log::AreaRegistry::instance().end(),
-                                   areas, areas+sizeof(areas)/sizeof(areas[0]) );
-
+    std::cerr << target.str();
+    BOOST_CHECK( ! target.str().empty() );
+    target.clear();
+
+    senf::log::test::Foo::log();
+    std::cerr << target.str();
+    BOOST_CHECK( ! target.str().empty() );
+    target.clear();
+
+    SENF_LOG((senf::log::test::Foo)("Foo area"));
+    BOOST_CHECK( target.str().empty() );
+    target.clear();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////