Skip to content

Commit 77bc6e5

Browse files
hvadehrafweikert
authored andcommitted
Fix BazelTestRunner compatibility with jre8
Removes usages of Set.of() that were introduced in javase9 Fixes bazelbuild#18300 Closes bazelbuild#18307. PiperOrigin-RevId: 529369593 Change-Id: Id45afbb1bdee46910f4a9b632f479773c561c0a3
1 parent a16ed83 commit 77bc6e5

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4Bazel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.testing.junit.runner.sharding.ShardingFilters;
2424
import com.google.testing.junit.runner.util.MemoizingSupplier;
2525
import java.io.PrintStream;
26+
import java.util.Collections;
2627
import java.util.Set;
2728
import java.util.function.Supplier;
2829
import org.junit.runner.Request;
@@ -83,7 +84,7 @@ public JUnit4Runner runner() {
8384
stdoutStream,
8485
config,
8586
setOfRunListeners,
86-
Set.of());
87+
Collections.emptySet());
8788
}
8889

8990
/** A builder for instantiating {@link JUnit4Bazel}. */

src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/JUnit4RunnerModule.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import java.io.OutputStream;
3232
import java.io.PrintStream;
3333
import java.nio.file.Path;
34+
import java.util.Collections;
35+
import java.util.HashSet;
3436
import java.util.Set;
3537
import java.util.function.Supplier;
3638
import javax.annotation.Nullable;
@@ -127,17 +129,20 @@ Set<RunListener> setOfRunListeners(
127129
JUnit4Config config,
128130
Supplier<TestSuiteModel> testSuiteModelSupplier,
129131
CancellableRequestFactory cancellableRequestFactory) {
130-
return Set.of(
132+
Set<RunListener> listeners = new HashSet<>();
133+
listeners.add(
131134
new JUnit4TestStackTraceListener(
132-
new SignalHandlers(SignalHandlers.createRealHandlerInstaller()), System.err),
135+
new SignalHandlers(SignalHandlers.createRealHandlerInstaller()), System.err));
136+
listeners.add(
133137
new JUnit4TestXmlListener(
134138
testSuiteModelSupplier,
135139
cancellableRequestFactory,
136140
new SignalHandlers(SignalHandlers.createRealHandlerInstaller()),
137141
new ProvideXmlStreamFactory(() -> config).get(),
138-
System.err),
139-
new JUnit4TestNameListener(provideCurrentRunningTest()),
140-
JUnit4RunnerBaseModule.provideTextListener(stdout()));
142+
System.err));
143+
listeners.add(new JUnit4TestNameListener(provideCurrentRunningTest()));
144+
listeners.add(JUnit4RunnerBaseModule.provideTextListener(stdout()));
145+
return Collections.unmodifiableSet(listeners);
141146
}
142147

143148
CancellableRequestFactory cancellableRequestFactory() {

0 commit comments

Comments
 (0)