From 89b3a9cef218c0d6ff3121d3f0c386b0c2f06dbc Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 14 Nov 2019 14:30:21 +0100 Subject: [PATCH] Introduce JavaUtilLoggingConfigurer to configure JUL for tests --- .../logging/JavaUtilLoggingConfigurer.java | 56 +++++++++++++++++++ ...it.platform.launcher.TestExecutionListener | 1 + .../src/test/resources/jul-test.properties | 2 + 3 files changed, 59 insertions(+) create mode 100644 spring-webflux/src/test/java/org/springframework/test_fixtures/logging/JavaUtilLoggingConfigurer.java create mode 100644 spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener create mode 100644 spring-webflux/src/test/resources/jul-test.properties diff --git a/spring-webflux/src/test/java/org/springframework/test_fixtures/logging/JavaUtilLoggingConfigurer.java b/spring-webflux/src/test/java/org/springframework/test_fixtures/logging/JavaUtilLoggingConfigurer.java new file mode 100644 index 0000000000..8a9285b5c0 --- /dev/null +++ b/spring-webflux/src/test/java/org/springframework/test_fixtures/logging/JavaUtilLoggingConfigurer.java @@ -0,0 +1,56 @@ +/* + * Copyright 2002-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.test_fixtures.logging; + +import java.io.InputStream; +import java.util.logging.LogManager; + +import org.junit.platform.launcher.TestExecutionListener; +import org.junit.platform.launcher.TestPlan; + +/** + * JUnit Platform {@link TestExecutionListener} that configures Java Util Logging + * (JUL) from a file named {@code jul-test.properties} in the root of the classpath. + * + *

This allows for projects to configure JUL for a test suite, analogous to + * log4j's support via {@code log4j2-test.xml}. + * + *

This listener can be automatically registered on the JUnit Platform by + * adding the fully qualified name of this class to a file named + * {@code /META-INF/services/org.junit.platform.launcher.TestExecutionListener} + * — for example, under {@code src/test/resources}. + * + * @author Sam Brannen + * @since 5.2.2 + */ +public class JavaUtilLoggingConfigurer implements TestExecutionListener { + + public static final String JUL_TEST_PROPERTIES_FILE = "jul-test.properties"; + + + @Override + public void testPlanExecutionStarted(TestPlan testPlan) { + try (InputStream inputStream = getClass().getClassLoader().getResourceAsStream(JUL_TEST_PROPERTIES_FILE)) { + LogManager.getLogManager().readConfiguration(inputStream); + } + catch (Exception ex) { + System.err.println("WARNING: failed to configure Java Util Logging from classpath resource " + + JUL_TEST_PROPERTIES_FILE); + System.err.println(ex); + } + } +} diff --git a/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener new file mode 100644 index 0000000000..7585af9070 --- /dev/null +++ b/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener @@ -0,0 +1 @@ +org.springframework.test_fixtures.logging.JavaUtilLoggingConfigurer \ No newline at end of file diff --git a/spring-webflux/src/test/resources/jul-test.properties b/spring-webflux/src/test/resources/jul-test.properties new file mode 100644 index 0000000000..fb322f8d3c --- /dev/null +++ b/spring-webflux/src/test/resources/jul-test.properties @@ -0,0 +1,2 @@ +# Console Logging +java.util.logging.ConsoleHandler.level = WARNING -- GitLab