1.1 --- a/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Fri Oct 11 09:58:03 2013 +0200
1.2 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Wed Oct 30 17:15:23 2013 +0100
1.3 @@ -75,7 +75,10 @@
1.4 // in case of Long it is necessary convert it to number
1.5 // since the Long is represented by two numbers in JavaScript
1.6 try {
1.7 - ret = code.invokeMethod(ret, "toFP");
1.8 + final Object toFP = ((ScriptEngine)code).eval("Number.prototype.toFP");
1.9 + if (ret instanceof Long) {
1.10 + ret = code.invokeMethod(toFP, "call", ret);
1.11 + }
1.12 ret = code.invokeFunction("Number", ret);
1.13 } catch (ScriptException ex) {
1.14 fail("Conversion to number failed in " + dumpJS(codeSeq) + ": " + ex.getMessage(), ex);
1.15 @@ -93,6 +96,9 @@
1.16 if (ret == null) {
1.17 return;
1.18 }
1.19 + if (expRes instanceof Integer && ret instanceof Double) {
1.20 + expRes = ((Integer)expRes).doubleValue();
1.21 + }
1.22 if (expRes != null && expRes.equals(ret)) {
1.23 return;
1.24 }