commit 5edcf862a8731326aebb98982835a13fa8ba93eb
author Jinseong Jeon <jsjeon@google.com> Tue Mar 26 11:56:09 2019 -0700
committer Jinseong Jeon <jsjeon@google.com> Wed Mar 27 19:34:30 2019 +0000
tree 880d832fff1c0dbd99785fedd5bc1447ffad8090
parent 436e2f6fb3f58daefe975d71560b8f3cb657902d

Update DoubleInliningInvokeSuperTest to use TestParameters.

Bug: 128987064
Change-Id: Idcd43bf1ae986f88a1f6ad3e13b9953b7dc929e4

src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
index 5d8b1f0..7d76b0f 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/inliner/DoubleInliningInvokeSuperTest.java
@@ -7,22 +7,42 @@
 import com.android.tools.r8.NeverInline;
 import com.android.tools.r8.NeverMerge;
 import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.StringUtils;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 // Regression test for b/128987064
+@RunWith(Parameterized.class)
 public class DoubleInliningInvokeSuperTest extends TestBase {
+  public static final String EXPECTED = StringUtils.lines("8", "8");
+
+  @Parameters(name = "{0}")
+  public static TestParametersCollection params() {
+    return getTestParameters().withAllRuntimes().build();
+  }
+
+  private final TestParameters parameters;
+
+  public DoubleInliningInvokeSuperTest(TestParameters parameters) {
+    this.parameters = parameters;
+  }
 
   @Test
   public void test() throws Exception {
-    testForR8(Backend.DEX)
+    testForR8(parameters.getBackend())
         .addInnerClasses(DoubleInliningInvokeSuperTest.class)
         .addKeepMainRule(TestClass.class)
         .addKeepRules("-keepclassmembers class * { void fooCaller(...); }")
         .enableClassInliningAnnotations()
         .enableInliningAnnotations()
         .enableMergeAnnotations()
-        .run(TestClass.class)
-        .assertSuccess();
+        .apply(parameters::setMinApiForRuntime)
+        .run(parameters.getRuntime(), TestClass.class)
+        .assertSuccessWithOutput(EXPECTED);
   }
 
   @NeverClassInline
@@ -49,13 +69,13 @@
 
     // place-holder to make B#foo to be a double-inline selected target.
     B fooWrapper(Integer x) {
-      int y = System.currentTimeMillis() > 0 ? x * 2 : x;
+      int y = System.currentTimeMillis() > 0 ? x : x * 2;
       return foo(y);
     }
 
     // Another B#foo caller.
     B anotherWrapper(Integer x) {
-      int y = System.currentTimeMillis() > 0 ? x * 2 : x;
+      int y = System.currentTimeMillis() > 0 ? x : x * 2;
       // invoke-super in B#foo is inlined here during double-inlining.
       return foo(y);
     }