diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-16 13:28:18 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-16 13:28:18 +0200 |
commit | 700830b1e92e8e54c2181e3b289c773c5e954868 (patch) | |
tree | de899dc28c44030d6dd74024ca88a134d73a8e0b /vespalog | |
parent | 605f904e8d59d8ff3522c195825429a1953f7d02 (diff) |
Make LogLevel implementation obey its doc, which seems reasonable
Diffstat (limited to 'vespalog')
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/LogLevel.java | 13 | ||||
-rw-r--r-- | vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java | 11 |
2 files changed, 21 insertions, 3 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/LogLevel.java b/vespalog/src/main/java/com/yahoo/log/LogLevel.java index 2d63e6babe2..f9cc4e9b7e3 100644 --- a/vespalog/src/main/java/com/yahoo/log/LogLevel.java +++ b/vespalog/src/main/java/com/yahoo/log/LogLevel.java @@ -101,17 +101,24 @@ public class LogLevel extends Level { javaToVespa.put(DEBUG, DEBUG); javaToVespa.put(SPAM, SPAM); - // manually enter the valid log levels we shall recognize - // in VESPA - nameToLevel = new LinkedHashMap<String, Level>(15); + // manually enter the valid log levels we shall recognize in VESPA + nameToLevel = new LinkedHashMap<String, Level>(32); nameToLevel.put("fatal", FATAL); + nameToLevel.put("FATAL", FATAL); nameToLevel.put("error", ERROR); + nameToLevel.put("ERROR", ERROR); nameToLevel.put("warning", WARNING); + nameToLevel.put("WARNING", WARNING); nameToLevel.put("config", CONFIG); + nameToLevel.put("CONFIG", CONFIG); nameToLevel.put("info", INFO); + nameToLevel.put("INFO", INFO); nameToLevel.put("event", EVENT); + nameToLevel.put("EVENT", EVENT); nameToLevel.put("debug", DEBUG); + nameToLevel.put("DEBUG", DEBUG); nameToLevel.put("spam", SPAM); + nameToLevel.put("SPAM", SPAM); } private LogLevel(String name, int value) { diff --git a/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java b/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java index 0a19b900b97..aa9a2b36221 100644 --- a/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java +++ b/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java @@ -55,14 +55,25 @@ public class LogLevelTestCase { @Test public void testNameToLevelMapping () { assertEquals(LogLevel.UNKNOWN, LogLevel.parse("unknown")); + assertEquals(LogLevel.UNKNOWN, LogLevel.parse("UNKNOWN")); assertEquals(LogLevel.FATAL, LogLevel.parse("fatal")); + assertEquals(LogLevel.FATAL, LogLevel.parse("FATAL")); assertEquals(LogLevel.ERROR, LogLevel.parse("error")); + assertEquals(LogLevel.ERROR, LogLevel.parse("ERROR")); assertEquals(LogLevel.WARNING, LogLevel.parse("warning")); + assertEquals(LogLevel.WARNING, LogLevel.parse("WARNING")); assertEquals(LogLevel.INFO, LogLevel.parse("info")); + assertEquals(LogLevel.INFO, LogLevel.parse("INFO")); assertEquals(LogLevel.CONFIG, LogLevel.parse("config")); + assertEquals(LogLevel.CONFIG, LogLevel.parse("CONFIG")); assertEquals(LogLevel.EVENT, LogLevel.parse("event")); + assertEquals(LogLevel.EVENT, LogLevel.parse("EVENT")); assertEquals(LogLevel.DEBUG, LogLevel.parse("debug")); + assertEquals(LogLevel.DEBUG, LogLevel.parse("DEBUG")); assertEquals(LogLevel.SPAM, LogLevel.parse("spam")); + assertEquals(LogLevel.SPAM, LogLevel.parse("SPAM")); + + LogLevel.getLevels().values().forEach(level -> assertEquals(level, LogLevel.parse(level.getName()))); } @Test |