# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1360318322 -3600
# Node ID 4fe8b3dfc55f85d7ce67a0f7692db3c40e530f00
# Parent  5c349e067fa83b151f7dad5e039da69e9ed68df8
Proper implementation of System.currentTimeMillis with so desired test

diff -r 5c349e067fa8 -r 4fe8b3dfc55f 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	Fri Feb 08 09:09:12 2013 +0100
+++ b/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java	Fri Feb 08 11:12:02 2013 +0100
@@ -45,7 +45,7 @@
     )
     public static native byte[] expandArray(byte[] arr, int expectedSize);
 
-    @JavaScriptBody(args = {}, body = "return new Date().getMilliseconds();")
+    @JavaScriptBody(args = {}, body = "return new Date().getTime();")
     public static native long currentTimeMillis();
     
     public static long nanoTime() {
diff -r 5c349e067fa8 -r 4fe8b3dfc55f vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vm/src/test/java/org/apidesign/vm4brwsr/SystemTest.java	Fri Feb 08 11:12:02 2013 +0100
@@ -0,0 +1,59 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.vm4brwsr;
+
+import javax.script.Invocable;
+import org.testng.annotations.BeforeClass;
+import static org.testng.Assert.*;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class SystemTest {
+    @Test public void verifyJSTime() throws Exception {
+        long now = System.currentTimeMillis();
+        
+        Object js = TestUtils.execCode(code, codeSeq, "Get js time", 
+            org.apidesign.bck2brwsr.emul.lang.System.class, "currentTimeMillis__J",
+            null
+        );
+        
+        assertTrue(js instanceof Double, "Double " + js);
+        long time = ((Double)js).longValue();
+        
+        long later = System.currentTimeMillis();
+        
+        assertTrue(now <= time, "Lower bound is OK: " + now + " <= " + time);
+        assertTrue(time <= later, "Upper bound is OK: " + time + " <= " + later);
+    }
+    
+    private static CharSequence codeSeq;
+    private static Invocable code;
+    
+    @BeforeClass 
+    public void compileTheCode() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        code = StaticMethodTest.compileClass(sb, "org/apidesign/bck2brwsr/emul/lang/System");
+        codeSeq = sb;
+    }
+    
+}
+
diff -r 5c349e067fa8 -r 4fe8b3dfc55f vm/src/test/java/org/apidesign/vm4brwsr/TestUtils.java
--- a/vm/src/test/java/org/apidesign/vm4brwsr/TestUtils.java	Fri Feb 08 09:09:12 2013 +0100
+++ b/vm/src/test/java/org/apidesign/vm4brwsr/TestUtils.java	Fri Feb 08 11:12:02 2013 +0100
@@ -40,7 +40,7 @@
         if (ret == null && expRes == null) {
             return null;
         }
-        if (expRes.equals(ret)) {
+        if (expRes != null && expRes.equals(ret)) {
             return null;
         }
         if (expRes instanceof Number) {