Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump JUnit Pioneer from 2.1.0 to 2.2.0 for JDK 11+ builds #474

Merged
merged 1 commit into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@
</activation>
<properties>
<mockito.version>5.11.0</mockito.version>
<junit-pioneer.version>2.1.0</junit-pioneer.version>
<junit-pioneer.version>2.2.0</junit-pioneer.version>
</properties>
<build>
<plugins>
Expand Down
30 changes: 28 additions & 2 deletions src/test/java/com/github/valfirst/slf4jtest/LoggingEventTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import java.util.stream.Stream;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.EnumSource;
Expand Down Expand Up @@ -515,23 +517,47 @@ void printToStandardOutWithThrowable(StdOut stdOut) {
@ParameterizedTest
@StdIo
@EnumSource(names = {"TRACE", "DEBUG", "INFO"})
void printInfoAndBelow(Level level, StdOut stdOut, StdErr stdErr) {
@EnabledForJreRange(max = JRE.JAVA_10) // old JUnit Pioneer is used for Java 8-10
void printInfoAndBelowOnJdkUpTo10(Level level, StdOut stdOut, StdErr stdErr) {
LoggingEvent event = new LoggingEvent(level, "message with {}", "argument");
event.print();
assertThat(stdOut.capturedLines(), is(not(emptyArray())));
assertThat(stdErr.capturedLines(), is(arrayContaining("")));
}

@ParameterizedTest
@StdIo
@EnumSource(names = {"TRACE", "DEBUG", "INFO"})
@EnabledForJreRange(min = JRE.JAVA_11) // new JUnit Pioneer is used for Java 11+
void printInfoAndBelow(Level level, StdOut stdOut, StdErr stdErr) {
LoggingEvent event = new LoggingEvent(level, "message with {}", "argument");
event.print();
assertThat(stdOut.capturedLines(), is(not(emptyArray())));
assertThat(stdErr.capturedLines(), is(emptyArray()));
}

@ParameterizedTest
@StdIo
@EnumSource(names = {"WARN", "ERROR"})
void printWarnAndAbove(Level level, StdOut stdOut, StdErr stdErr) {
@EnabledForJreRange(max = JRE.JAVA_10) // old JUnit Pioneer is used for Java 8-10
void printWarnAndAboveOnJdkUpTo10(Level level, StdOut stdOut, StdErr stdErr) {
LoggingEvent event = new LoggingEvent(level, "message with {}", "argument");
event.print();
assertThat(stdErr.capturedLines(), is(not(emptyArray())));
assertThat(stdOut.capturedLines(), is(arrayContaining("")));
}

@ParameterizedTest
@StdIo
@EnumSource(names = {"WARN", "ERROR"})
@EnabledForJreRange(min = JRE.JAVA_11) // new JUnit Pioneer is used for Java 11+
void printWarnAndAbove(Level level, StdOut stdOut, StdErr stdErr) {
LoggingEvent event = new LoggingEvent(level, "message with {}", "argument");
event.print();
assertThat(stdErr.capturedLines(), is(not(emptyArray())));
assertThat(stdOut.capturedLines(), is(emptyArray()));
}

@Test
void nullArgument() {
LoggingEvent event = new LoggingEvent(level, "message with null arg", null, null);
Expand Down
18 changes: 17 additions & 1 deletion src/test/java/com/github/valfirst/slf4jtest/TestLoggerTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static java.util.Collections.singletonList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.emptyArray;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -41,6 +42,8 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.NullSource;
Expand Down Expand Up @@ -817,14 +820,27 @@
@ParameterizedTest
@EnumSource(names = {"WARN", "ERROR"})
@StdIo
void doesNotWhenPrintLevelGreaterThanEventLevel(Level printLevel, StdOut stdOut) {
@EnabledForJreRange(max = JRE.JAVA_10) // old JUnit Pioneer is used for Java 8-10
void doesNotWhenPrintLevelGreaterThanEventLevelOnJdkUpTo10(Level printLevel, StdOut stdOut) {
TestLoggerFactory.getInstance().setPrintLevel(printLevel);

testLogger.info(MESSAGE);

assertThat(stdOut.capturedLines(), is(arrayContaining("")));
}

@ParameterizedTest
@EnumSource(names = {"WARN", "ERROR"})
@StdIo
@EnabledForJreRange(min = JRE.JAVA_11) // new JUnit Pioneer is used for Java 11+
void doesNotWhenPrintLevelGreaterThanEventLevel(Level printLevel, StdOut stdOut) {
TestLoggerFactory.getInstance().setPrintLevel(printLevel);

testLogger.info(MESSAGE);

Check failure

Code scanning / CodeQL

Missing format argument Error test

This format call refers to 3 argument(s) but only supplies 0 argument(s).

assertThat(stdOut.capturedLines(), is(emptyArray()));
}

@Test
void doesNotCaptureWhenCaptureLevelGreaterThanEventLevel() {
TestLoggerFactory.getInstance().setCaptureLevel(WARN);
Expand Down