commit 3457c34bbdd9eec887dc25f4803744fa9b2cfb12
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Mar 10 09:02:25 2021 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Mar 10 09:02:25 2021 +0100
tree 07211a884c665a82e7bae1f5dfcba249a8fc005c
parent 7d3d464af1dbb852172c9bca9730480140c91024

Fix ApplyMappingClassPathInterfaceInheritTest on release branch

1) We do not lookup the class path class from so the class-path class
was not referenced
2) We do not have repackaging so the class is obfuscated to a's

Bug: 181887416
Change-Id: I68b418eb313528f99629932fbbc255115f5e2c47

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

diff --git a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
index 5270eab..0d26c2b 100644
--- a/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
+++ b/src/test/java/com/android/tools/r8/naming/applymapping/ApplyMappingClassPathInterfaceInheritTest.java
@@ -63,7 +63,7 @@
         .run(parameters.getRuntime(), Main.class)
         .applyIf(
             minifyLibrary,
-            r -> r.assertSuccessWithOutputLines("a.a"),
+            r -> r.assertSuccessWithOutputLines("a.a.a.a.a.a.a"),
             r -> r.assertSuccessWithOutputLines(ClassPathI.class.getTypeName()));
   }
 
@@ -74,11 +74,7 @@
   public static class Main {
 
     public static void main(String[] args) throws ClassNotFoundException {
-      System.out.println(
-          Class.forName(
-                  "com.android.tools.r8.naming.applymapping"
-                      + ".ApplyMappingClassPathInterfaceInheritTest$ClassPathI")
-              .getName());
+      System.out.println(Class.forName(ClassPathI.class.getName()).getName());
     }
   }
 }