commit 1dd6f943fa85997076cb13a3b9ec645573c5c151
author Morten Krogh-Jespersen <mkroghj@google.com> Tue May 14 08:46:57 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue May 14 08:46:57 2019 +0200
tree 0de1dbcd58d7efe013d7ef5d20dbb3c85edfd327
parent 5ceb7a3b3d5724ed5cd08a395ddce56e0c4aede4

Extend applymapping test for static overrides with fields

Bug: 131532229
Bug: 131710444
Change-Id: Ic9197ce4a10fbb70bd6c0324c032e56585822fd0

src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java

diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java
index f77b894..5cdf2fd 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingSameStaticNameTest.java
@@ -21,19 +21,25 @@
       StringUtils.lines(
           A.class.getTypeName() + " -> " + A.class.getTypeName() + ":",
           "  boolean[] jacocoInit() -> a",
+          "  int f1 -> c",
           B.class.getTypeName() + " -> " + B.class.getTypeName() + ":",
-          "  boolean[] jacocoInit() -> b");
+          "  boolean[] jacocoInit() -> b",
+          "  int f1 -> d");
 
   public static class A {
     public static boolean[] a() {
       return null;
     }
+
+    public static int c = 1;
   }
 
   public static class B extends A {
     public static boolean[] b() {
       return null;
     }
+
+    public static int d = 2;
   }
 
   public static class C {}