Browse Source

[trac1024] Rename function resetting root logger characteristics

Shortened the name to resetUnitTestRootLogger() to make it a bit less
of a mouthful.
Stephen Morris 13 years ago
parent
commit
0958095d36

+ 2 - 2
src/lib/log/logger_unittest_support.cc

@@ -80,7 +80,7 @@ b10LoggerDbglevel(int defdbglevel) {
 // variables B10_LOGGER_SEVERITY, B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
 // variables B10_LOGGER_SEVERITY, B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
 
 
 void
 void
-setUnitTestRootLoggerCharacteristics() {
+resetUnitTestRootLogger() {
 
 
     using namespace isc::log;
     using namespace isc::log;
 
 
@@ -168,7 +168,7 @@ void initLogger(isc::log::Severity severity, int dbglevel) {
     // in the environment variables.  (The two-step approach is used as the
     // in the environment variables.  (The two-step approach is used as the
     // setUnitTestRootLoggerCharacteristics() function is used in several
     // setUnitTestRootLoggerCharacteristics() function is used in several
     // places in the BIND 10 tests, and it avoid duplicating code.)
     // places in the BIND 10 tests, and it avoid duplicating code.)
-    setUnitTestRootLoggerCharacteristics();
+    resetUnitTestRootLogger();
 } 
 } 
 
 
 } // namespace log
 } // namespace log

+ 3 - 3
src/lib/log/logger_unittest_support.h

@@ -103,15 +103,15 @@ isc::log::Severity b10LoggerSeverity(isc::log::Severity defseverity);
 int b10LoggerDbglevel(int defdbglevel);
 int b10LoggerDbglevel(int defdbglevel);
 
 
 
 
-/// \brief Reset Logger Characteristics
+/// \brief Reset Root Logger Characteristics
 ///
 ///
-/// This is a simplified interface into the setting of the characteristics
+/// This is a simplified interface into the resetting of the characteristics
 /// of the root logger.  It is aimed for use in unit tests and resets the
 /// of the root logger.  It is aimed for use in unit tests and resets the
 /// characteristics of the root logger to use a severity, debug level and
 /// characteristics of the root logger to use a severity, debug level and
 /// destination set by the environment variables B10_LOGGER_SEVERITY,
 /// destination set by the environment variables B10_LOGGER_SEVERITY,
 /// B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
 /// B10_LOGGER_DBGLEVEL and B10_LOGGER_DESTINATION.
 void
 void
-setUnitTestRootLoggerCharacteristics();
+resetUnitTestRootLogger();
 
 
 } // namespace log
 } // namespace log
 } // namespace isc
 } // namespace isc

+ 1 - 1
src/lib/log/tests/logger_level_impl_unittest.cc

@@ -30,7 +30,7 @@ class LoggerLevelImplTest : public ::testing::Test {
 protected:
 protected:
     LoggerLevelImplTest() {
     LoggerLevelImplTest() {
         // Ensure logging set to default for unit tests
         // Ensure logging set to default for unit tests
-        setUnitTestRootLoggerCharacteristics();
+        resetUnitTestRootLogger();
     }
     }
 
 
     ~LoggerLevelImplTest()
     ~LoggerLevelImplTest()

+ 1 - 1
src/lib/log/tests/logger_level_unittest.cc

@@ -31,7 +31,7 @@ protected:
     LoggerLevelTest() {
     LoggerLevelTest() {
         // Logger initialization is done in main().  As logging tests may
         // Logger initialization is done in main().  As logging tests may
         // alter the default logging output, it is reset here.
         // alter the default logging output, it is reset here.
-        setUnitTestRootLoggerCharacteristics();
+        resetUnitTestRootLogger();
     }
     }
     ~LoggerLevelTest() {
     ~LoggerLevelTest() {
         LoggerManager::reset();
         LoggerManager::reset();

+ 1 - 1
src/lib/log/tests/logger_support_unittest.cc

@@ -23,7 +23,7 @@ protected:
     LoggerSupportTest() {
     LoggerSupportTest() {
         // Logger initialization is done in main().  As logging tests may
         // Logger initialization is done in main().  As logging tests may
         // alter the default logging output, it is reset here.
         // alter the default logging output, it is reset here.
-        setUnitTestRootLoggerCharacteristics();
+        resetUnitTestRootLogger();
     }
     }
     ~LoggerSupportTest() {
     ~LoggerSupportTest() {
     }
     }