Skip to content

Commit

Permalink
Ensure JULBridgeTests resets root logging level after test (#100441) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-vieira committed Oct 6, 2023
1 parent 544b2b7 commit c9b922f
Showing 1 changed file with 7 additions and 4 deletions.
Expand Up @@ -21,17 +21,17 @@
import org.junit.BeforeClass;

import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.instanceOf;

public class JULBridgeTests extends ESTestCase {

private static final java.util.logging.Logger logger = java.util.logging.Logger.getLogger("");
private static java.util.logging.Level savedLevel;
private static java.util.logging.Handler[] savedHandlers;
private static Handler[] savedHandlers;

@BeforeClass
public static void saveLoggerState() {
Expand Down Expand Up @@ -60,17 +60,20 @@ public static void restoreLoggerState() {

private void assertLogged(Runnable loggingCode, LoggingExpectation... expectations) {
Logger testLogger = LogManager.getLogger("");
Loggers.setLevel(testLogger, Level.ALL);
Level savedLevel = testLogger.getLevel();
MockLogAppender mockAppender = new MockLogAppender();
mockAppender.start();

try {
Loggers.setLevel(testLogger, Level.ALL);
mockAppender.start();
Loggers.addAppender(testLogger, mockAppender);
for (var expectation : expectations) {
mockAppender.addExpectation(expectation);
}
loggingCode.run();
mockAppender.assertAllExpectationsMatched();
} finally {
Loggers.setLevel(testLogger, savedLevel);
Loggers.removeAppender(testLogger, mockAppender);
mockAppender.stop();
}
Expand Down

0 comments on commit c9b922f

Please sign in to comment.