commit b10e17330e445d8b6332b0a98971d3b7106d9955
author Søren Gjesse <sgjesse@google.com> Fri Oct 05 14:04:27 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Fri Oct 05 14:04:27 2018 +0200
tree 91d60bb9edc507c77b264ccebae649cff2b97b9f
parent e971da4138d610f550d09f8736dd72b2db6faca7

Fix expectation in test

Dalvik VMs give a NullPointerException when enums are stripped with R8.

Bug:
Change-Id: I43d15feb0441360c89079e58084a1bd8b64146c8

src/test/java/com/android/tools/r8/naming/EnumMinification.java

diff --git a/src/test/java/com/android/tools/r8/naming/EnumMinification.java b/src/test/java/com/android/tools/r8/naming/EnumMinification.java
index 3f6e4e7..a8708eb 100644
--- a/src/test/java/com/android/tools/r8/naming/EnumMinification.java
+++ b/src/test/java/com/android/tools/r8/naming/EnumMinification.java
@@ -11,6 +11,7 @@
 import com.android.tools.r8.R8Command;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm;
 import com.android.tools.r8.ToolHelper.ProcessResult;
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.AndroidApp;
@@ -55,7 +56,9 @@
         result.stderr,
         containsString(
             backend == Backend.DEX
-                ? "java.lang.NoSuchMethodException"
+                ? ToolHelper.getDexVm().isNewerThan(DexVm.ART_4_4_4_HOST)
+                    ? "java.lang.NoSuchMethodException"
+                    : "java.lang.NullPointerException"
                 : "java.lang.IllegalArgumentException"));
   }
 }