Update test
Bug: 202074964
Change-Id: I4565a1d981f65ba3ee3bb23377362b5da1ac141c
diff --git a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryMethodTest.java b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryMethodTest.java
index 42b5b50..9da19a0 100644
--- a/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryMethodTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/argumentpropagation/UpwardsInterfacePropagationToLibraryMethodTest.java
@@ -12,6 +12,7 @@
import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.android.tools.r8.utils.StringUtils;
+import com.android.tools.r8.utils.codeinspector.HorizontallyMergedClassesInspector;
import com.google.common.collect.ImmutableList;
import java.util.List;
import org.junit.Test;
@@ -24,7 +25,8 @@
@RunWith(Parameterized.class)
public class UpwardsInterfacePropagationToLibraryMethodTest extends TestBase {
- @Parameter() public TestParameters parameters;
+ @Parameter(0)
+ public TestParameters parameters;
@Parameters(name = "{0}")
public static List<Object[]> data() {
@@ -55,14 +57,11 @@
.addProgramClasses(PROGRAM_CLASSES)
.addKeepMainRule(TestClass.class)
.setMinApi(parameters.getApiLevel())
- .noMinification()
- .addOptionsModification(
- options -> {
- options.horizontalClassMergerOptions().disable();
- })
.enableNoVerticalClassMergingAnnotations()
.enableNeverClassInliningAnnotations()
.enableInliningAnnotations()
+ .addHorizontallyMergedClassesInspector(
+ HorizontallyMergedClassesInspector::assertNoClassesMerged)
.compile()
.addRunClasspathClasses(LibraryClass.class)
.run(parameters.getRuntime(), TestClass.class)
