Skip to content

Commit 5586c25

Browse files
committed
Merge branch 'master' of github.com:qos-ch/logback
2 parents 5889356 + 7357bcf commit 5586c25

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

logback-classic/src/test/java/ch/qos/logback/classic/pattern/LoggerNameConverterPerfTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.IOException;
44
import java.nio.file.Files;
55
import java.nio.file.Paths;
6+
import java.util.Arrays;
67
import java.util.List;
78
import java.util.stream.Collectors;
89

@@ -56,7 +57,7 @@ public void setUp() {
5657
ocsl.setContext(loggerContext);
5758
ocsl.start();
5859
loggerContext.getStatusManager().add(ocsl);
59-
loggerConverter.setOptionList(List.of("30"));
60+
loggerConverter.setOptionList(Arrays.asList("30"));
6061
loggerConverter.setContext(loggerContext);
6162
loggerConverter.start();
6263
}

logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.ObjectInputStream;
2424
import java.io.ObjectOutputStream;
2525
import java.io.Serializable;
26+
import java.util.Arrays;
2627
import java.util.List;
2728
import java.util.Map;
2829

@@ -165,7 +166,7 @@ public void testWithMarker() throws Exception {
165166
checkForEquality(event, remoteEvent);
166167

167168
assertNotNull(remoteEvent.getMarkerList());
168-
assertEquals(List.of(marker), remoteEvent.getMarkerList());
169+
assertEquals(Arrays.asList(marker), remoteEvent.getMarkerList());
169170
}
170171

171172
@Test
@@ -182,7 +183,7 @@ public void testWithTwoMarkers() throws Exception {
182183
checkForEquality(event, remoteEvent);
183184

184185
assertNotNull(remoteEvent.getMarkerList());
185-
assertEquals(List.of(marker), remoteEvent.getMarkerList());
186+
assertEquals(Arrays.asList(marker), remoteEvent.getMarkerList());
186187
}
187188

188189
@Test

0 commit comments

Comments
 (0)