commit 4cc08a661582ad5462c9643b024162a0e74ef7a4
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Aug 13 08:12:56 2019 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Aug 13 08:56:05 2019 +0000
tree 11776e694eb048ca8faecb16ae368c54be862d47
parent 5faa5a1f196ee39f4fce5e4c502158d0546ef048

Read bytes of test class instead of passed in class when running tests

The original javac compiled content is what we would like to use as
input for tests when testing various compilers. Otherwise, when using
applymapping on all test we can see unexpected results.

Change-Id: Icfb5b0d9508619a8c9f138c61d2a9681b6041727

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index ef77717..f958a28 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -16,7 +16,6 @@
 import com.android.tools.r8.dex.ApplicationReader;
 import com.android.tools.r8.errors.Unreachable;
 import com.android.tools.r8.graph.AssemblyWriter;
-import com.android.tools.r8.graph.Code;
 import com.android.tools.r8.graph.DexApplication;
 import com.android.tools.r8.graph.DexItemFactory;
 import com.android.tools.r8.graph.GraphLense;
@@ -576,13 +575,7 @@
   }
 
   public static byte[] getClassAsBytes(Class clazz) throws IOException {
-    String s = clazz.getSimpleName() + ".class";
-    Class outer = clazz.getEnclosingClass();
-    while (outer != null) {
-      s = outer.getSimpleName() + '$' + s;
-      outer = outer.getEnclosingClass();
-    }
-    return ByteStreams.toByteArray(clazz.getResourceAsStream(s));
+    return Files.readAllBytes(getClassFileForTestClass(clazz));
   }
 
   public static long getClassByteCrc(Class clazz) {