Account for single caller inlining and bridge removal in tests
Change-Id: I5625a2c7f1549bad54afd8ab5ab79d21f3ce8a89
diff --git a/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java b/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
index df8c213..28d5037 100644
--- a/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/apimodel/ApiModelBridgeToLibraryMethodTest.java
@@ -39,8 +39,6 @@
.setMinApi(parameters)
.addKeepMainRule(TestClassWithApiLevelCheck.class)
.addAndroidBuildVersion()
- .allowDiagnosticWarningMessages(
- parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.L))
.run(parameters.getRuntime(), TestClassWithApiLevelCheck.class)
.applyIf(
parameters.isCfRuntime() || parameters.getApiLevel().isLessThan(AndroidApiLevel.N),
diff --git a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
index 8b8a42f..6a4a983 100644
--- a/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/desugaring/interfacemethods/InvokeSuperInDefaultMethodResolvingToLibraryTest.java
@@ -91,8 +91,6 @@
.addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.T))
.setMinApi(parameters)
.addKeepMainRule(TestClass.class)
- .allowDiagnosticWarningMessages(
- parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.L))
.run(parameters.getRuntime(), TestClass.class)
.applyIf(
parameters.isDexRuntime()
@@ -114,8 +112,6 @@
.setMinApi(parameters)
.addKeepMainRule(TestClassWithApiLevelCheck.class)
.addAndroidBuildVersion(parameters.getApiLevel())
- .allowDiagnosticWarningMessages(
- parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.L))
.run(parameters.getRuntime(), TestClassWithApiLevelCheck.class)
.assertSuccessWithOutputLines(getExpectedOutputForApiCheck());
}
diff --git a/src/test/java/com/android/tools/r8/memberrebinding/InvokeSuperToEmptyDefaultInterfaceMethodInLibraryTest.java b/src/test/java/com/android/tools/r8/memberrebinding/InvokeSuperToEmptyDefaultInterfaceMethodInLibraryTest.java
index 49278af..9587f07 100644
--- a/src/test/java/com/android/tools/r8/memberrebinding/InvokeSuperToEmptyDefaultInterfaceMethodInLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/memberrebinding/InvokeSuperToEmptyDefaultInterfaceMethodInLibraryTest.java
@@ -17,6 +17,7 @@
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.MethodReferenceUtils;
+import com.google.common.collect.ImmutableList;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -84,7 +85,9 @@
runResult -> runResult.assertFailureWithErrorThatThrows(VerifyError.class),
runResult ->
runResult.assertSuccessWithOutputLines(
- hasDefaultInterfaceMethodsSupport(parameters) ? "Call!" : "Skip!"));
+ hasDefaultInterfaceMethodsSupport(parameters)
+ ? ImmutableList.of("In override!", "Call!")
+ : ImmutableList.of("Skip!")));
}
private boolean shouldReportDiagnostic() {
@@ -134,6 +137,7 @@
@Override
@NeverInline
public void foo() {
+ System.out.println("In override!");
I.super.foo();
}
}
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
index 3c81c62..a3bc5b4 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
@@ -138,8 +138,6 @@
.apply(this::configureR8)
.setMinApi(parameters)
.addKeepMainRule(TestClass.class)
- .allowDiagnosticWarningMessages(
- parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.L))
.run(parameters.getRuntime(), TestClass.class)
.applyIf(
runtimeWithJavaTime(parameters),
