# HG changeset patch # User Jaroslav Tulach # Date 1460868739 -7200 # Node ID a064702472ec544c43b105bdab3b17cf5f452fe9 # Parent 17d09f3e5f08ec72740b639ff29e6a416c757b7e Don't convert Date objects to current time millis diff -r 17d09f3e5f08 -r a064702472ec rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotations.java --- a/rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotations.java Mon Mar 28 07:33:11 2016 +0200 +++ b/rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotations.java Sun Apr 17 06:52:19 2016 +0200 @@ -86,4 +86,10 @@ "return impl.@org.apidesign.bck2brwsr.vmtest.impl.HtmlAnnotations::getError()();" ) public static native Double onError(Object impl, Double d); + + @JavaScriptBody(args = { }, body = "return new Date(2016, 4, 1);") + public static native Object april2016(); + + @JavaScriptBody(args = { "date" }, body = "return date.getFullYear()") + public static native int year(Object date); } diff -r 17d09f3e5f08 -r a064702472ec rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotationsTest.java --- a/rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotationsTest.java Mon Mar 28 07:33:11 2016 +0200 +++ b/rt/emul/compacttest/src/test/java/org/apidesign/bck2brwsr/vmtest/impl/HtmlAnnotationsTest.java Sun Apr 17 06:52:19 2016 +0200 @@ -77,6 +77,11 @@ String msg = invoke(fn); assert "*/*".equals(msg) : "String '*/*' as expected: " + msg; } + + @BrwsrTest public void date() throws Exception { + Object april = HtmlAnnotations.april2016(); + assertEquals(HtmlAnnotations.year(april), 2016); + } private static void assertEquals(double real, double exp) { if (real - exp < 0.01) { diff -r 17d09f3e5f08 -r a064702472ec rt/emul/mini/src/main/java/java/lang/Class.java --- a/rt/emul/mini/src/main/java/java/lang/Class.java Mon Mar 28 07:33:11 2016 +0200 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java Sun Apr 17 06:52:19 2016 +0200 @@ -1875,6 +1875,7 @@ + " if (Object.prototype.toString.call(v) === '[object Array]') {\n" + " return vm.org_apidesign_bck2brwsr_emul_lang_System(false).convArray__Ljava_lang_Object_2Ljava_lang_Object_2(v);\n" + " }\n" + + " if (v instanceof Date) return v;\n" + " return v.valueOf();\n" + "}\n" )