# HG changeset patch # User Lubomir Nerad # Date 1361815208 -3600 # Node ID 5652acd48509c03471cb30d9b72d95997927497b # Parent cc0e6767259b352bba903b921f1e7519e1602bb7 Added conversion to long for JavaScript implementation of System.currentTimeMillis diff -r cc0e6767259b -r 5652acd48509 emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java --- a/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java Tue Feb 19 15:59:27 2013 +0100 +++ b/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java Mon Feb 25 19:00:08 2013 +0100 @@ -48,6 +48,13 @@ return Float.isInfinite(Float.NEGATIVE_INFINITY); } + @Compare public boolean areTimesEqual() { + long l1 = System.currentTimeMillis(); + long l2 = l1 + 0; + + return l1 == l2; + } + @Factory public static Object[] create() { return VMTest.create(JFXIssuesTest.class); } diff -r cc0e6767259b -r 5652acd48509 emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java --- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java Tue Feb 19 15:59:27 2013 +0100 +++ b/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java Mon Feb 25 19:00:08 2013 +0100 @@ -55,8 +55,12 @@ public static native byte[] expandArray(byte[] arr, int expectedSize); @JavaScriptBody(args = {}, body = "return new Date().getTime();") - public static native long currentTimeMillis(); - + private static native double currentTimeMillisDouble(); + + public static long currentTimeMillis() { + return (long) currentTimeMillisDouble(); + } + public static long nanoTime() { return 1000000L * currentTimeMillis(); } diff -r cc0e6767259b -r 5652acd48509 vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java --- a/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java Tue Feb 19 15:59:27 2013 +0100 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java Mon Feb 25 19:00:08 2013 +0100 @@ -32,7 +32,7 @@ long now = System.currentTimeMillis(); Object js = code.execCode("Get js time", - org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillis__J", + org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillisDouble__D", null );