commit 7de2f942cf61de42ae14f01f8d60723f381bd8ba
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 11 19:10:59 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Apr 11 17:11:23 2019 +0000
tree 588a192a23fc2e7143e1bb173e9e5f68b4a23591
parent 0f82b8033e421004cc5f8e9879835edae9ac11fd

Update text expectation after field minifier change

Change-Id: Ifa07c69e823af7d806f7e4061a2d6fc3d7250202

src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java b/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
index e66b8d7..5009360 100644
--- a/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
+++ b/src/test/java/com/android/tools/r8/naming/ReservedFieldNameInSubClassTest.java
@@ -11,11 +11,13 @@
 
 import com.android.tools.r8.NeverMerge;
 import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.StringUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
 import com.android.tools.r8.utils.codeinspector.FieldSubject;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -27,14 +29,16 @@
 @RunWith(Parameterized.class)
 public class ReservedFieldNameInSubClassTest extends TestBase {
 
+  private final TestParameters parameters;
   private final boolean reserveName;
 
-  @Parameterized.Parameters(name = "Reserve name: {0}")
-  public static Boolean[] data() {
-    return BooleanUtils.values();
+  @Parameterized.Parameters(name = "{0}, reserve name: {1}")
+  public static List<Object[]> data() {
+    return buildParameters(getTestParameters().withAllRuntimes().build(), BooleanUtils.values());
   }
 
-  public ReservedFieldNameInSubClassTest(boolean reserveName) {
+  public ReservedFieldNameInSubClassTest(TestParameters parameters, boolean reserveName) {
+    this.parameters = parameters;
     this.reserveName = reserveName;
   }
 
@@ -42,7 +46,7 @@
   public void test() throws Exception {
     String expectedOutput = StringUtils.lines("Hello world!");
     CodeInspector inspector =
-        testForR8(Backend.DEX)
+        testForR8(parameters.getBackend())
             .addProgramClasses(
                 TestClass.class, A.class, B.class, C.class, I.class, J.class, K.class)
             .enableMergeAnnotations()
@@ -53,7 +57,8 @@
                         + C.class.getTypeName()
                         + "{ java.lang.String a; }"
                     : "")
-            .run(TestClass.class)
+            .setMinApi(parameters.getRuntime())
+            .run(parameters.getRuntime(), TestClass.class)
             .assertSuccessWithOutput(expectedOutput)
             .inspector();
 
@@ -98,9 +103,9 @@
       assertThat(f1FieldSubject, isRenamed());
       assertEquals("a", f1FieldSubject.getFinalName());
 
-      // TODO(b/128973195): B.f2 should be renamed to f instead of a.
+      // TODO(b/128973195): B.f2 should be renamed to f instead of b.
       assertThat(f2FieldSubject, isRenamed());
-      assertEquals("a", f2FieldSubject.getFinalName());
+      assertEquals("b", f2FieldSubject.getFinalName());
 
       // TODO(b/128973195): I.f3 should be renamed to b instead of a.
       assertThat(f3FieldSubject, isRenamed());