commit c512b16ffb6a9128d13fd20fc63c85817ccfb8c0
author Sebastien Hertz <shertz@google.com> Wed Oct 04 18:24:33 2017 +0200
committer Sebastien Hertz <shertz@google.com> Wed Oct 04 18:24:33 2017 +0200
tree 1208a734cb71cbadb0acde7a8f8b454473ae7e35
parent ad7a3d5ae010555a59ef80bd746dc8c328fdab41

Fix R8RunSmaliTestsTest

Follow-up ce162f3ba18765eb525026f349692d4229acc7f8 by fixing key
access to the different maps where we now look up the DexVm.Version
type.

Change-Id: I9ac6b4f5bb8ded36c0d6aa73d45490c21f12f623

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

diff --git a/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java b/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
index cf0b71e..1a8f68a 100644
--- a/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunSmaliTestsTest.java
@@ -7,6 +7,7 @@
 
 import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.ToolHelper.DexVm.Version;
+import com.android.tools.r8.dex.Marker.Tool;
 import com.android.tools.r8.shaking.ProguardRuleParserException;
 import com.android.tools.r8.utils.StringUtils;
 import com.google.common.collect.ImmutableList;
@@ -151,28 +152,29 @@
     String generated = outputPath + "/classes.dex";
     String output = "";
 
-    if (dalvikVerificationError.containsKey(ToolHelper.getDexVm())
-        && dalvikVerificationError.get(ToolHelper.getDexVm()).contains(directoryName)) {
+    DexVm.Version dexVmVersion = ToolHelper.getDexVm().getVersion();
+    if (dalvikVerificationError.containsKey(dexVmVersion)
+        && dalvikVerificationError.get(dexVmVersion).contains(directoryName)) {
       try {
         ToolHelper.runArtNoVerificationErrors(generated, mainClass);
       } catch (AssertionError e) {
         assert e.toString().contains("VerifyError");
       }
       return;
-    } else if (originalFailingOnArtVersions.containsKey(ToolHelper.getDexVm())
-        && originalFailingOnArtVersions.get(ToolHelper.getDexVm()).contains(directoryName)) {
+    } else if (originalFailingOnArtVersions.containsKey(dexVmVersion)
+        && originalFailingOnArtVersions.get(dexVmVersion).contains(directoryName)) {
       // If the original smali code fails on the target VM, only run the code produced by R8.
       output = ToolHelper.runArtNoVerificationErrors(generated, mainClass);
-    } else if (customProcessedOutputExpectation.containsKey(ToolHelper.getDexVm())
-        && customProcessedOutputExpectation.get(ToolHelper.getDexVm()).containsKey(directoryName)) {
+    } else if (customProcessedOutputExpectation.containsKey(dexVmVersion)
+        && customProcessedOutputExpectation.get(dexVmVersion).containsKey(directoryName)) {
       // If the original and the processed code have different expected output, only run
       // the code produced by R8.
       expectedOutput =
-          customProcessedOutputExpectation.get(ToolHelper.getDexVm()).get(directoryName);
+          customProcessedOutputExpectation.get(dexVmVersion).get(directoryName);
       output = ToolHelper.runArtNoVerificationErrors(generated, mainClass);
     } else {
-      if (failingOnArtVersions.containsKey(ToolHelper.getDexVm())
-          && failingOnArtVersions.get(ToolHelper.getDexVm()).contains(directoryName)) {
+      if (failingOnArtVersions.containsKey(dexVmVersion)
+          && failingOnArtVersions.get(dexVmVersion).contains(directoryName)) {
         thrown.expect(Throwable.class);
       }
       output =