commit 224c3fdc3eab951f6c6e38dc0a6c74b74d5421f5
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jan 04 09:02:32 2019 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Jan 04 09:02:32 2019 +0100
tree d2431e8d41a34db5b187f757827657cf3fadd992
parent 85a2b0a6773f29eff67f9fad16e05211caf9dccb

Update expected outcome of InvalidTypesTest

Change-Id: If60bc480d5bfe5bd3a5eb53fed546438517a2ca3

src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java

diff --git a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
index 4248497..6906b76 100644
--- a/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/InvalidTypesTest.java
@@ -14,6 +14,8 @@
 import com.android.tools.r8.ProguardTestRunResult;
 import com.android.tools.r8.R8TestRunResult;
 import com.android.tools.r8.TestRunResult;
+import com.android.tools.r8.ToolHelper;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
 import com.android.tools.r8.errors.Unreachable;
 import com.android.tools.r8.jasmin.JasminBuilder;
 import com.android.tools.r8.jasmin.JasminBuilder.ClassBuilder;
@@ -279,8 +281,21 @@
       } else if (compiler == Compiler.PROGUARD) {
         return StringUtils.joinLines("Hello!", "Unexpected outcome of checkcast", "Goodbye!", "");
       } else if (compiler == Compiler.DX || compiler == Compiler.D8) {
-        return StringUtils.joinLines("Hello!", "Unexpected outcome of checkcast", "Goodbye!", "");
+        if (ToolHelper.getDexVm().getVersion() == Version.V4_0_4
+            || ToolHelper.getDexVm().getVersion() == Version.V4_4_4) {
+          return StringUtils.joinLines("Hello!", "Goodbye!", "");
+        } else if (ToolHelper.getDexVm().getVersion() == Version.V7_0_0) {
+          return StringUtils.joinLines(
+              "Hello!",
+              "Unexpected outcome of checkcast",
+              "Unexpected outcome of instanceof",
+              "Goodbye!",
+              "");
+        } else {
+          return StringUtils.joinLines("Hello!", "Unexpected outcome of checkcast", "Goodbye!", "");
+        }
       } else {
+        assert compiler == Compiler.JAVAC;
         return StringUtils.joinLines("Hello!", "Goodbye!", "");
       }
     } else {