Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2017-06-01 13:38:03 +02:00

View File

@@ -65,6 +65,7 @@ public class LoggersEndpointTests extends AbstractEndpointTests<LoggersEndpoint>
LogLevel.WARN, LogLevel.INFO, LogLevel.DEBUG, LogLevel.TRACE);
}
@Test
public void invokeWhenNameSpecifiedShouldReturnLevels() throws Exception {
given(getLoggingSystem().getLoggerConfiguration("ROOT"))
.willReturn(new LoggerConfiguration("ROOT", null, LogLevel.DEBUG));
@@ -73,6 +74,7 @@ public class LoggersEndpointTests extends AbstractEndpointTests<LoggersEndpoint>
assertThat(levels.getEffectiveLevel()).isEqualTo("DEBUG");
}
@Test
public void setLogLevelShouldSetLevelOnLoggingSystem() throws Exception {
getEndpointBean().setLogLevel("ROOT", LogLevel.DEBUG);
verify(getLoggingSystem()).setLogLevel("ROOT", LogLevel.DEBUG);