commit 9c106b26720c36a744799d9ef0a455a6287728f3
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 08:15:38 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Mar 04 07:17:04 2021 +0000
tree 7b4cdd1cf32afa44fea4cbcd082b51fe2ad1c8cc
parent 8bcb2fafe203f8b8048559dca00aa2b063f51664

Update NonVirtualOverrideTest expectation

Change-Id: Ide06adb549ca17e40ac8e711bae8aa65e1c5526d

src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java b/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
index 6f6ad5a..f98e5ea 100644
--- a/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/NonVirtualOverrideTest.java
@@ -44,25 +44,21 @@
 public class NonVirtualOverrideTest extends TestBase {
 
   private final TestParameters parameters;
-  private final boolean enableClassInlining;
   private final boolean enableVerticalClassMerging;
 
   static class Dimensions {
 
     private final Backend backend;
-    private final boolean enableClassInlining;
     private final boolean enableVerticalClassMerging;
 
-    public Dimensions(
-        Backend backend, boolean enableClassInlining, boolean enableVerticalClassMerging) {
+    public Dimensions(Backend backend, boolean enableVerticalClassMerging) {
       this.backend = backend;
-      this.enableClassInlining = enableClassInlining;
       this.enableVerticalClassMerging = enableVerticalClassMerging;
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(backend, enableClassInlining, enableVerticalClassMerging);
+      return Objects.hash(backend, enableVerticalClassMerging);
     }
 
     @Override
@@ -72,23 +68,19 @@
       }
       Dimensions other = (Dimensions) o;
       return this.backend == other.backend
-          && this.enableClassInlining == other.enableClassInlining
           && this.enableVerticalClassMerging == other.enableVerticalClassMerging;
     }
   }
 
-  @Parameterized.Parameters(name = "Backend: {0}, class inlining: {1}, vertical class merging: {2}")
+  @Parameterized.Parameters(name = "{0}, vertical class merging: {1}")
   public static Collection<Object[]> data() {
     return buildParameters(
         getTestParameters().withAllRuntimes().build(),
-        BooleanUtils.values(),
         BooleanUtils.values());
   }
 
-  public NonVirtualOverrideTest(
-      TestParameters parameters, boolean enableClassInlining, boolean enableVerticalClassMerging) {
+  public NonVirtualOverrideTest(TestParameters parameters, boolean enableVerticalClassMerging) {
     this.parameters = parameters;
-    this.enableClassInlining = enableClassInlining;
     this.enableVerticalClassMerging = enableVerticalClassMerging;
   }
 
@@ -162,7 +154,6 @@
         .addKeepMainRule(NonVirtualOverrideTestClass.class)
         .addOptionsModification(
             options -> {
-              options.enableClassInlining = dimensions.enableClassInlining;
               options.enableVerticalClassMerging = dimensions.enableVerticalClassMerging;
               options.testing.validInliningReasons = ImmutableSet.of(Reason.FORCE);
             })
@@ -173,18 +164,16 @@
   @Test
   public void test() throws Exception {
     // Run the program on Art after is has been compiled with R8.
-    String referenceResult =
-        expectedResults.apply(!enableClassInlining && isDexVmBetween5_1_1and7_0_0(parameters));
+    String referenceResult = expectedResults.apply(isDexVmBetween5_1_1and7_0_0(parameters));
     R8TestCompileResult compiled =
         compilationResults.apply(
-            new Dimensions(
-                parameters.getBackend(), enableClassInlining, enableVerticalClassMerging));
+            new Dimensions(parameters.getBackend(), enableVerticalClassMerging));
     compiled
         .run(parameters.getRuntime(), NonVirtualOverrideTestClass.class)
         .assertSuccessWithOutput(referenceResult);
 
     // Check that B is present and that it doesn't contain the unused private method m2.
-    if (!enableClassInlining && !enableVerticalClassMerging) {
+    if (!enableVerticalClassMerging) {
       CodeInspector inspector = compiled.inspector();
       ClassSubject classSubject = inspector.clazz(B.class.getName());
       assertThat(classSubject, isPresentAndRenamed());