Fix additional check in tests when constructor shrinking is turned off
Bug: b/246679983
Change-Id: I0fee4e13bd8c15e0c17d3e0cfd0fe2a6671d7add
diff --git a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
index 436e50e..582adfc 100644
--- a/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/ForwardingConstructorShakingOnDexWithClassMergingTest.java
@@ -13,7 +13,6 @@
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.google.common.collect.Iterables;
@@ -58,16 +57,12 @@
.assertSuccessWithOutputLines("Hello, world!");
}
- private boolean canHaveNonReboundConstructorInvoke() {
- return parameters.isDexRuntime()
- && parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.L);
- }
-
private void inspect(CodeInspector inspector) {
ClassSubject aSubClassSubject = inspector.clazz(ASub.class);
assertThat(aSubClassSubject, isPresent());
assertEquals(
- canHaveNonReboundConstructorInvoke() ? 0 : 1, aSubClassSubject.allMethods().size());
+ parameters.canHaveNonReboundConstructorInvoke() ? 0 : 1,
+ aSubClassSubject.allMethods().size());
}
public static class Main {
diff --git a/src/test/java/com/android/tools/r8/shaking/methods/pblc/PublicMethodsTest.java b/src/test/java/com/android/tools/r8/shaking/methods/pblc/PublicMethodsTest.java
index 477a310..54e57dd 100644
--- a/src/test/java/com/android/tools/r8/shaking/methods/pblc/PublicMethodsTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/methods/pblc/PublicMethodsTest.java
@@ -10,7 +10,6 @@
import com.android.tools.r8.NoVerticalClassMerging;
import com.android.tools.r8.shaking.methods.MethodsTestBase;
-import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.codeinspector.ClassSubject;
import com.android.tools.r8.utils.codeinspector.CodeInspector;
import com.google.common.collect.ImmutableList;
@@ -67,8 +66,7 @@
}
private boolean willShrinkConstructors(Shrinker shrinker) {
- return shrinker.isR8Full()
- && parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.L);
+ return shrinker.isR8Full() && parameters.canHaveNonReboundConstructorInvoke();
}
private static BiConsumer<CodeInspector, Shrinker> applyInspectorIf(
