commit 9d4e4df0599c00043c661b951b5674d25df37bac
author Roberto Lublinerman <rluble@google.com> Wed Dec 10 14:19:01 2014 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 10 23:07:44 2014 +0000
tree c49cc7653dc32989f16a247c0ba2958bda280f31
parent 43797ae610d1796c9781ec80c3af5917a33f184d

Fix: JsStackEmulatorTest failed under jvm 8.

When running in Java 8 classes are inserted in JProgram in a different
order causing fragile tests like this one to fail.

Change-Id: Ibaee8508fcbff7c4b7a7290fa2d8abb9c5766c6e

dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java

diff --git a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
index 0011f1b..ace6560 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
@@ -46,7 +46,7 @@
 import com.google.gwt.dev.jjs.impl.JavaToJavaScriptMap;
 import com.google.gwt.dev.jjs.impl.MethodInliner;
 import com.google.gwt.dev.jjs.impl.ResolveRuntimeTypeReferences;
-import com.google.gwt.dev.jjs.impl.ResolveRuntimeTypeReferences.IntTypeMapper;
+import com.google.gwt.dev.jjs.impl.ResolveRuntimeTypeReferences.StringTypeMapper;
 import com.google.gwt.dev.jjs.impl.ResolveRuntimeTypeReferences.TypeMapper;
 import com.google.gwt.dev.jjs.impl.ResolveRuntimeTypeReferences.TypeOrder;
 import com.google.gwt.dev.js.ast.JsFunction;
@@ -231,7 +231,7 @@
         "try{throw $location[stackIndex]='EntryPoint.java:'+'5',new RuntimeException" +
         "}catch($e0){$e0=wrap($e0);" +
         "$stackDepth=($location[stackIndex]='EntryPoint.java:'+'6',stackIndex);" +
-        "if(instanceOf($e0,4)){" +
+        "if(instanceOf($e0,'java.lang.RuntimeException')){" +
         "e=$e0;s=($location[stackIndex]='EntryPoint.java:'+'7',e).getMessage()}" +
         "else throw unwrap(($location[stackIndex]='EntryPoint.java:'+'6',$e0))}" +
         "$stackDepth=stackIndex-1" +
@@ -285,7 +285,7 @@
     ImplementCastsAndTypeChecks.exec(jProgram, false);
     ArrayNormalizer.exec(jProgram, false);
 
-    TypeMapper<Integer> typeMapper = new IntTypeMapper();
+    TypeMapper<String> typeMapper = new StringTypeMapper();
     ResolveRuntimeTypeReferences.exec(jProgram, typeMapper, TypeOrder.FREQUENCY);
     Map<StandardSymbolData, JsName> symbolTable =
         new TreeMap<StandardSymbolData, JsName>(new SymbolData.ClassIdentComparator());