[2445] Some more cleanups

- renamed test class
- added a subclass of BufferAppender to directly test append()
(and re-enabled the relevant test case)
- minor doxy updates

diff --git a/src/lib/log/buffer_appender_impl.cc b/src/lib/log/buffer_appender_impl.cc
index d0b9fd0bcd094185f20b446343d392f29b51d96b..059500cd8a7822a6dbc5ae00836102ba2005ceac 100644 (file)
--- a/src/lib/log/buffer_appender_impl.cc
+++ b/src/lib/log/buffer_appender_impl.cc
@@ -43,8 +43,6 @@ BufferAppender::flushStdout() {
     // be a good idea; as we can't reliably know whether in what
     // state the logger instance is now (or what the specific logger's
     // settings were).
-    // So we print a raw format (it excludes the time and the pid, and
-    // it prints severity as a number)
     LogEventList::iterator it;
     for (it = stored_.begin(); it != stored_.end(); ++it) {
         const std::string level(it->first);

diff --git a/src/lib/log/buffer_appender_impl.h b/src/lib/log/buffer_appender_impl.h
index 932d1d4a2ace55d298add1be2b6075045ccdce6a..00d3633c5c7b4a08d1630e1e3cfb8a189fc037b9 100644 (file)
--- a/src/lib/log/buffer_appender_impl.h
+++ b/src/lib/log/buffer_appender_impl.h
@@ -43,7 +43,7 @@ typedef boost::shared_ptr<log4cplus::spi::InternalLoggingEvent> LogEventPtr;
 
 /// Convenience typedef for a pair string/logeventptr, the string representing
 /// the logger level, as returned by LogLevelManager::toString() at the
-/// time of logging
+/// time of initial logging
 typedef std::pair<std::string, LogEventPtr> LevelAndEvent;
 
 /// Convenience typedef for a vector of LevelAndEvent instances
@@ -68,8 +68,8 @@ typedef std::vector<LevelAndEvent> LogEventList;
 /// Given this goal, this class has an extra check; it will raise
 /// an exception if \c append() is called after flush().
 ///
-/// If the LogBuffer instance is destroyed before being flushed, it will
-/// dump any event it has left to stdout.
+/// If the BufferAppender instance is destroyed before being flushed,
+/// it will dump any event it has left to stdout.
 class BufferAppender : public log4cplus::Appender {
 public:
     /// \brief Constructor
@@ -81,7 +81,7 @@ public:
     ///
     /// Any remaining events are flushed to stdout (there should
     /// only be any events remaining if flush() was never called)
-    ~BufferAppender();
+    virtual ~BufferAppender();
 
     /// \brief Close the appender
     ///

diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index 1d7de88bfe5b7ea8cbbf8afa3aa407d5e2bba2c7..6862d0cb51c928fd1d752b7caa50c5946462e814 100644 (file)
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -50,7 +50,7 @@ LoggerManagerImpl::processInit() {
     initRootLogger();
 }
 
-// Flush the LogBuffer at the end of processing a new specification
+// Flush the BufferAppenders at the end of processing a new specification
 void
 LoggerManagerImpl::processEnd() {
     flushBufferAppenders();

diff --git a/src/lib/log/tests/buffer_appender_unittest.cc b/src/lib/log/tests/buffer_appender_unittest.cc
index b583290ba0bd3af8b502e0df329002317ddef1f5..78367ca956d4541e10746644409c5eb3533f0849 100644 (file)
--- a/src/lib/log/tests/buffer_appender_unittest.cc
+++ b/src/lib/log/tests/buffer_appender_unittest.cc
@@ -31,10 +31,21 @@ using namespace isc::log::internal;
 namespace isc {
 namespace log {
 
-class LogBufferTest : public ::testing::Test {
+/// \brief Specialized test class
+///
+/// In order to test append() somewhat directly, this
+/// class implements one more method (addEvent)
+class TestBufferAppender : public BufferAppender {
+public:
+    void addEvent(const log4cplus::spi::InternalLoggingEvent& event) {
+        append(event);
+    }
+};
+
+class BufferAppenderTest : public ::testing::Test {
 protected:
-    LogBufferTest() : buffer_appender1(new BufferAppender()),
-                      buffer_appender2(new BufferAppender()),
+    BufferAppenderTest() : buffer_appender1(new TestBufferAppender()),
+                      buffer_appender2(new TestBufferAppender()),
                       appender1(buffer_appender1),
                       appender2(buffer_appender2),
                       logger(log4cplus::Logger::getInstance("buffer"))
@@ -42,7 +53,7 @@ protected:
         logger.setLogLevel(log4cplus::TRACE_LOG_LEVEL);
     }
 
-    ~LogBufferTest() {
+    ~BufferAppenderTest() {
         // If any log messages are left, we don't care, get rid of them,
         // by flushing them to a null appender
         // Given the 'messages should not get lost' approach of the logging
@@ -57,10 +68,8 @@ protected:
         buffer_appender2->flush();
     }
 
-    //LogBuffer buffer_appender1->
-    //LogBuffer buffer_appender2->
-    BufferAppender* buffer_appender1;
-    BufferAppender* buffer_appender2;
+    TestBufferAppender* buffer_appender1;
+    TestBufferAppender* buffer_appender2;
     log4cplus::SharedAppenderPtr appender1;
     log4cplus::SharedAppenderPtr appender2;
     log4cplus::Logger logger;
@@ -68,7 +77,7 @@ protected:
 
 // Test that log events are indeed stored, and that they are
 // flushed to the new appenders of their logger
-TEST_F(LogBufferTest, flush) {
+TEST_F(BufferAppenderTest, flush) {
     ASSERT_EQ(0, buffer_appender1->getBufferSize());
     ASSERT_EQ(0, buffer_appender2->getBufferSize());
 
@@ -94,7 +103,7 @@ TEST_F(LogBufferTest, flush) {
 }
 
 // Once flushed, logging new messages with the same buffer should fail
-TEST_F(LogBufferTest, addAfterFlush) {
+TEST_F(BufferAppenderTest, addAfterFlush) {
     logger.addAppender(appender1);
     buffer_appender1->flush();
     EXPECT_THROW(LOG4CPLUS_INFO(logger, "Foo"), LogBufferAddAfterFlush);
@@ -108,13 +117,12 @@ TEST_F(LogBufferTest, addAfterFlush) {
     ASSERT_EQ(1, buffer_appender2->getBufferSize());
 }
 
-/*
-TEST_F(LogBufferTest, addDirectly) {
+TEST_F(BufferAppenderTest, addDirectly) {
     // A few direct calls
     log4cplus::spi::InternalLoggingEvent event("buffer",
                                                log4cplus::INFO_LOG_LEVEL,
                                                "Bar", "file", 123);
-    buffer_appender1->append(event);
+    buffer_appender1->addEvent(event);
     ASSERT_EQ(1, buffer_appender1->getBufferSize());
 
     // Do one from a smaller scope to make sure destruction doesn't harm
@@ -122,7 +130,7 @@ TEST_F(LogBufferTest, addDirectly) {
         log4cplus::spi::InternalLoggingEvent event2("buffer",
                                                     log4cplus::INFO_LOG_LEVEL,
                                                     "Bar", "file", 123);
-        buffer_appender1->append(event2);
+        buffer_appender1->addEvent(event2);
     }
     ASSERT_EQ(2, buffer_appender1->getBufferSize());
 
@@ -133,7 +141,6 @@ TEST_F(LogBufferTest, addDirectly) {
     ASSERT_EQ(0, buffer_appender1->getBufferSize());
     ASSERT_EQ(2, buffer_appender2->getBufferSize());
 }
-*/
 
 }
 }