Fix red tests
Change-Id: I3ec2cacbea223def8fbeb665fce3399050d3f77b
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
index 4f724d3..1e5bd5b 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingClassStaticizerTest.java
@@ -65,12 +65,16 @@
}
private void assertClassStaticized(CodeInspector codeInspector) {
+ String renamedMethodName = "method$enumunboxing$";
if (parameters.isCfRuntime()) {
// There is no class staticizer in Cf.
- assertThat(codeInspector.clazz(Companion.class).uniqueMethodWithName("method"), isPresent());
+ assertThat(
+ codeInspector.clazz(Companion.class).uniqueMethodWithName(renamedMethodName),
+ isPresent());
return;
}
- MethodSubject method = codeInspector.clazz(CompanionHost.class).uniqueMethodWithName("method");
+ MethodSubject method =
+ codeInspector.clazz(CompanionHost.class).uniqueMethodWithName(renamedMethodName);
assertThat(method, isPresent());
assertEquals("int", method.getMethod().method.proto.parameters.toString());
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
index 1d7f782..807b061 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
@@ -359,7 +359,9 @@
assertEquals(0, invokeCount);
// The enum parameter may get unboxed.
- m = clazz.uniqueMethodWithName("moreControlFlows");
+ m =
+ clazz.uniqueMethodWithName(
+ parameters.isCfRuntime() ? "moreControlFlows" : "moreControlFlows$enumunboxing$");
assertTrue(m.isPresent());
// Verify that a.b() is resolved to an inline instance-get.
