commit 6f5ac9128ca3ff1f80fa8e79d44cd4a88e60edaf
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Mar 11 10:52:43 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Mar 11 10:52:43 2020 +0100
tree 31c68ecf32ac0ef7182531016acc469f6f423d2e
parent 71c472372504ee5d5eefa6f381575306d0e4118f

Rename test classes in GenericSignatureTest to avoid name clashes with r8lib.jar

Change-Id: Ie753cbf4f8e01d82ea501df4acce85a19b3e8a7e

src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java

diff --git a/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java b/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
index 775f030..33321eb 100644
--- a/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
+++ b/src/test/java/com/android/tools/r8/graph/GenericSignatureTest.java
@@ -37,26 +37,30 @@
     AndroidApp app =
         testForD8()
             .debug()
-            .addProgramClassesAndInnerClasses(A.class, B.class, CY.class, CYY.class)
+            .addProgramClassesAndInnerClasses(
+                GenericSignatureTestClassA.class,
+                GenericSignatureTestClassB.class,
+                GenericSignatureTestClassCY.class,
+                GenericSignatureTestClassCYY.class)
             .compile()
             .app;
     AppView<AppInfoWithLiveness> appView = computeAppViewWithLiveness(app);
     DexItemFactory factory = appView.dexItemFactory();
     CodeInspector inspector = new CodeInspector(appView.appInfo().app());
 
-    ClassSubject a = inspector.clazz(A.class);
+    ClassSubject a = inspector.clazz(GenericSignatureTestClassA.class);
     assertThat(a, isPresent());
-    ClassSubject y = inspector.clazz(A.Y.class);
+    ClassSubject y = inspector.clazz(GenericSignatureTestClassA.Y.class);
     assertThat(y, isPresent());
-    ClassSubject yy = inspector.clazz(A.Y.YY.class);
+    ClassSubject yy = inspector.clazz(GenericSignatureTestClassA.Y.YY.class);
     assertThat(yy, isPresent());
-    ClassSubject zz = inspector.clazz(A.Y.ZZ.class);
+    ClassSubject zz = inspector.clazz(GenericSignatureTestClassA.Y.ZZ.class);
     assertThat(zz, isPresent());
-    ClassSubject b = inspector.clazz(B.class);
+    ClassSubject b = inspector.clazz(GenericSignatureTestClassB.class);
     assertThat(b, isPresent());
-    ClassSubject cy = inspector.clazz(CY.class);
+    ClassSubject cy = inspector.clazz(GenericSignatureTestClassCY.class);
     assertThat(cy, isPresent());
-    ClassSubject cyy = inspector.clazz(CYY.class);
+    ClassSubject cyy = inspector.clazz(GenericSignatureTestClassCYY.class);
     assertThat(cyy, isPresent());
 
     DexEncodedMethod method;
@@ -252,7 +256,7 @@
 // and then extended a bit to explore more details, e.g., MethodTypeSignature.
 //
 
-class A<T> {
+class GenericSignatureTestClassA<T> {
   class Y {
 
     class YY {}
@@ -260,7 +264,7 @@
     class ZZ<TT> extends YY {
       public YY yy;
 
-      YY newYY(B... bs) {
+      YY newYY(GenericSignatureTestClassB... bs) {
         return new YY();
       }
 
@@ -301,8 +305,9 @@
   }
 }
 
-class B<T extends A<T>> {}
+class GenericSignatureTestClassB<T extends GenericSignatureTestClassA<T>> {}
 
-class CY<T extends A<T>.Y> {}
+class GenericSignatureTestClassCY<T extends GenericSignatureTestClassA<T>.Y> {}
 
-class CYY<T extends A<T>.Y> extends CY<T> {}
+class GenericSignatureTestClassCYY<T extends GenericSignatureTestClassA<T>.Y>
+    extends GenericSignatureTestClassCY<T> {}