Fix CovariantReturnType tests
Change-Id: I33c25184659f861eeb54baeac56f0508482788d2
diff --git a/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java b/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
index d37c3f8..56a2289 100644
--- a/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
+++ b/src/test/java/com/android/tools/r8/ir/desugar/annotations/CovariantReturnTypeAnnotationTransformerTest.java
@@ -106,7 +106,7 @@
// Version 2 of the library should always work.
succeedsWithOption(input, true, true);
- failsCompilationByDefault(input);
+ failsCompilationWhenDisabled(input);
}
@Test
@@ -130,7 +130,7 @@
// If CovariantReturnType annotations are ignored, then there will be no methods with the
// signatures "L.../B;->method()L.../B;" and "L.../C;->method()L.../C;".
- failsCompilationByDefault(input);
+ failsCompilationWhenDisabled(input);
}
@Test
@@ -224,11 +224,13 @@
.assertSuccessWithOutput(getExpectedOutput());
}
- private void failsCompilationByDefault(List<byte[]> input) throws Exception {
+ private void failsCompilationWhenDisabled(List<byte[]> input) throws Exception {
assertFailsCompilation(
() ->
testForD8(parameters.getBackend())
.addProgramClassFileData(input)
+ .addOptionsModification(
+ options -> options.processCovariantReturnTypeAnnotations = false)
.setMinApi(parameters)
.compileWithExpectedDiagnostics(
diagnostics ->
