logging: add numbered INFO* log level values

[folly.git] / folly / experimental / logging / test / LogLevelTest.cpp

diff --git a/folly/experimental/logging/test/LogLevelTest.cpp b/folly/experimental/logging/test/LogLevelTest.cpp
index 0537948d1dff3fd703af598cd40914da2f3fe6a4..cc3a0a342f9610017cd33eb94c53db35346d7086 100644 (file)
--- a/folly/experimental/logging/test/LogLevelTest.cpp
+++ b/folly/experimental/logging/test/LogLevelTest.cpp
@@ -31,9 +31,11 @@ TEST(LogLevel, fromString) {
   EXPECT_EQ(LogLevel::NONE, stringToLogLevel("NoNe"));
   EXPECT_EQ(LogLevel::NONE, stringToLogLevel("LogLevel::none"));
 
-  EXPECT_EQ(LogLevel::DEBUG, stringToLogLevel("debug"));
-  EXPECT_EQ(LogLevel::DEBUG, stringToLogLevel("dEBug"));
-  EXPECT_EQ(LogLevel::DEBUG, stringToLogLevel("loglevel::dEBug"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("debug"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("dEBug"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("Dbg"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("loglevel::dEBug"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("loglevel::DBG"));
 
   EXPECT_EQ(LogLevel::INFO, stringToLogLevel("info"));
   EXPECT_EQ(LogLevel::INFO, stringToLogLevel("INFO"));
@@ -46,11 +48,20 @@ TEST(LogLevel, fromString) {
   EXPECT_EQ(LogLevel::ERR, stringToLogLevel("err"));
   EXPECT_EQ(LogLevel::ERR, stringToLogLevel("eRr"));
   EXPECT_EQ(LogLevel::ERR, stringToLogLevel("error"));
+  EXPECT_EQ(LogLevel::ERR, stringToLogLevel("ERR"));
   EXPECT_EQ(LogLevel::ERR, stringToLogLevel("ERROR"));
 
   EXPECT_EQ(LogLevel::CRITICAL, stringToLogLevel("critical"));
   EXPECT_EQ(LogLevel::CRITICAL, stringToLogLevel("CRITICAL"));
 
+  EXPECT_EQ(LogLevel::DFATAL, stringToLogLevel("dfatal"));
+  EXPECT_EQ(LogLevel::DFATAL, stringToLogLevel("DFatal"));
+  EXPECT_EQ(LogLevel::DFATAL, stringToLogLevel("DFATAL"));
+
+  EXPECT_EQ(LogLevel::FATAL, stringToLogLevel("fatal"));
+  EXPECT_EQ(LogLevel::FATAL, stringToLogLevel("FaTaL"));
+  EXPECT_EQ(LogLevel::FATAL, stringToLogLevel("FATAL"));
+
   EXPECT_EQ(LogLevel::MAX_LEVEL, stringToLogLevel("max"));
   EXPECT_EQ(LogLevel::MAX_LEVEL, stringToLogLevel("Max_Level"));
   EXPECT_EQ(LogLevel::MAX_LEVEL, stringToLogLevel("LogLevel::MAX"));
@@ -60,12 +71,22 @@ TEST(LogLevel, fromString) {
   EXPECT_EQ(LogLevel::DBG5, stringToLogLevel("dbg5"));
   EXPECT_EQ(LogLevel::DBG5, stringToLogLevel("DBG5"));
   EXPECT_EQ(LogLevel::DBG9, stringToLogLevel("DBG9"));
-  EXPECT_EQ(LogLevel::DEBUG + 1, stringToLogLevel("DBG99"));
-  EXPECT_EQ(LogLevel::DEBUG, stringToLogLevel("900"));
-  EXPECT_EQ(LogLevel::DEBUG, stringToLogLevel("LogLevel(900)"));
+  EXPECT_EQ(LogLevel::DBG + 1, stringToLogLevel("DBG998"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("DBG999"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("1000"));
+  EXPECT_EQ(LogLevel::DBG, stringToLogLevel("LogLevel(1000)"));
+
+  EXPECT_EQ(LogLevel::INFO0, stringToLogLevel("info0"));
+  EXPECT_EQ(LogLevel::INFO5, stringToLogLevel("INFO5"));
+  EXPECT_EQ(LogLevel::INFO5, stringToLogLevel("INFO5"));
+  EXPECT_EQ(LogLevel::INFO9, stringToLogLevel("info9"));
+  EXPECT_EQ(LogLevel::INFO + 1, stringToLogLevel("Info998"));
+  EXPECT_EQ(LogLevel::INFO, stringToLogLevel("INFO999"));
+  EXPECT_EQ(LogLevel::INFO, stringToLogLevel("2000"));
+  EXPECT_EQ(LogLevel::INFO6, stringToLogLevel("LogLevel(2993)"));
 
   EXPECT_THROW(stringToLogLevel("foobar"), std::range_error);
-  EXPECT_THROW(stringToLogLevel("dbg"), std::range_error);
+  EXPECT_THROW(stringToLogLevel("dbgx"), std::range_error);
   EXPECT_THROW(stringToLogLevel("dbgxyz"), std::range_error);
   EXPECT_THROW(stringToLogLevel("dbg-1"), std::range_error);
   EXPECT_THROW(stringToLogLevel("dbg12345"), std::range_error);
@@ -73,25 +94,33 @@ TEST(LogLevel, fromString) {
 }
 
 TEST(LogLevel, toString) {
-  EXPECT_EQ(
-      "LogLevel::UNINITIALIZED", logLevelToString(LogLevel::UNINITIALIZED));
-  EXPECT_EQ("LogLevel::NONE", logLevelToString(LogLevel::NONE));
-  EXPECT_EQ("LogLevel::INFO", logLevelToString(LogLevel::INFO));
-  EXPECT_EQ("LogLevel::WARN", logLevelToString(LogLevel::WARN));
-  EXPECT_EQ("LogLevel::WARN", logLevelToString(LogLevel::WARNING));
-  EXPECT_EQ("LogLevel::DEBUG", logLevelToString(LogLevel::DEBUG));
-  EXPECT_EQ("LogLevel::ERR", logLevelToString(LogLevel::ERR));
-  EXPECT_EQ("LogLevel::CRITICAL", logLevelToString(LogLevel::CRITICAL));
-  EXPECT_EQ("LogLevel::MAX_LEVEL", logLevelToString(LogLevel::MAX_LEVEL));
-
-  EXPECT_EQ("LogLevel::DBG0", logLevelToString(LogLevel::DBG0));
-  EXPECT_EQ("LogLevel::DBG2", logLevelToString(LogLevel::DBG2));
-  EXPECT_EQ("LogLevel::DBG5", logLevelToString(LogLevel::DBG5));
-  EXPECT_EQ("LogLevel::DBG9", logLevelToString(LogLevel::DBG9));
-  EXPECT_EQ("LogLevel::DBG97", logLevelToString(static_cast<LogLevel>(903)));
-  EXPECT_EQ("LogLevel::DBG64", logLevelToString(LogLevel::DBG4 - 60));
-
-  EXPECT_EQ("LogLevel(1234)", logLevelToString(static_cast<LogLevel>(1234)));
+  EXPECT_EQ("UNINITIALIZED", logLevelToString(LogLevel::UNINITIALIZED));
+  EXPECT_EQ("NONE", logLevelToString(LogLevel::NONE));
+  EXPECT_EQ("INFO", logLevelToString(LogLevel::INFO));
+  EXPECT_EQ("WARN", logLevelToString(LogLevel::WARN));
+  EXPECT_EQ("WARN", logLevelToString(LogLevel::WARNING));
+  EXPECT_EQ("DEBUG", logLevelToString(LogLevel::DBG));
+  EXPECT_EQ("ERR", logLevelToString(LogLevel::ERR));
+  EXPECT_EQ("CRITICAL", logLevelToString(LogLevel::CRITICAL));
+  EXPECT_EQ("DFATAL", logLevelToString(LogLevel::DFATAL));
+  EXPECT_EQ("FATAL", logLevelToString(LogLevel::FATAL));
+  EXPECT_EQ("FATAL", logLevelToString(LogLevel::MAX_LEVEL));
+
+  EXPECT_EQ("DBG0", logLevelToString(LogLevel::DBG0));
+  EXPECT_EQ("DBG2", logLevelToString(LogLevel::DBG2));
+  EXPECT_EQ("DBG5", logLevelToString(LogLevel::DBG5));
+  EXPECT_EQ("DBG9", logLevelToString(LogLevel::DBG9));
+  EXPECT_EQ("DBG96", logLevelToString(static_cast<LogLevel>(1903)));
+  EXPECT_EQ("DBG64", logLevelToString(LogLevel::DBG4 - 60));
+
+  EXPECT_EQ("INFO0", logLevelToString(LogLevel::INFO0));
+  EXPECT_EQ("INFO2", logLevelToString(LogLevel::INFO2));
+  EXPECT_EQ("INFO5", logLevelToString(LogLevel::INFO5));
+  EXPECT_EQ("INFO9", logLevelToString(LogLevel::INFO9));
+  EXPECT_EQ("INFO86", logLevelToString(static_cast<LogLevel>(2913)));
+  EXPECT_EQ("INFO57", logLevelToString(LogLevel::INFO7 - 50));
+
+  EXPECT_EQ("LogLevel(123)", logLevelToString(static_cast<LogLevel>(123)));
 }
 
 TEST(LogLevel, toStringAndBack) {
@@ -107,7 +136,7 @@ TEST(LogLevel, toStringAndBack) {
   // Check all of the named levels
   checkLevel(LogLevel::UNINITIALIZED);
   checkLevel(LogLevel::NONE);
-  checkLevel(LogLevel::DEBUG);
+  checkLevel(LogLevel::DBG);
   checkLevel(LogLevel::DBG0);
   checkLevel(LogLevel::DBG1);
   checkLevel(LogLevel::DBG2);
@@ -123,7 +152,8 @@ TEST(LogLevel, toStringAndBack) {
   checkLevel(LogLevel::WARNING);
   checkLevel(LogLevel::ERR);
   checkLevel(LogLevel::CRITICAL);
-  checkLevel(LogLevel::MAX_LEVEL);
+  checkLevel(LogLevel::DFATAL);
+  checkLevel(LogLevel::FATAL);
 
   // Try with some random integer values
   for (uint32_t numIters = 0; numIters < 10000; ++numIters) {