# HG changeset patch # User Jaroslav Tulach # Date 1421755291 -3600 # Node ID 9830c8b761ced3a0341de0e981d55b09b3c27387 # Parent e80693152d8b4b978f4ca619d8ca6f91ce18dceb Define StictMath as a delegate to Math diff -r e80693152d8b -r 9830c8b761ce rt/emul/mini/src/main/java/java/lang/Math.java --- a/rt/emul/mini/src/main/java/java/lang/Math.java Tue Jan 20 12:26:35 2015 +0100 +++ b/rt/emul/mini/src/main/java/java/lang/Math.java Tue Jan 20 13:01:31 2015 +0100 @@ -25,6 +25,7 @@ package java.lang; +import org.apidesign.bck2brwsr.core.ExtraJavaScript; import org.apidesign.bck2brwsr.core.JavaScriptBody; @@ -85,6 +86,10 @@ * @since JDK1.0 */ +@ExtraJavaScript( + resource="/org/apidesign/vm4brwsr/emul/lang/java_lang_Math.js", + processByteCode=true +) public final class Math { /** diff -r e80693152d8b -r 9830c8b761ce rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Math.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/emul/mini/src/main/resources/org/apidesign/vm4brwsr/emul/lang/java_lang_Math.js Tue Jan 20 13:01:31 2015 +0100 @@ -0,0 +1,5 @@ + +vm['java_lang_StrictMath'] = vm.java_lang_Math; +if (typeof exports !== 'undefined') { + exports['java_lang_StrictMath'] = vm.java_lang_Math; +} diff -r e80693152d8b -r 9830c8b761ce rt/vm/src/test/java/org/apidesign/vm4brwsr/MathStrictTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/MathStrictTest.java Tue Jan 20 13:01:31 2015 +0100 @@ -0,0 +1,27 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * 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; + +/** + */ +public class MathStrictTest extends MathTest { + @Override + protected Class mathClass() { + return StrictMath.class; + } +} diff -r e80693152d8b -r 9830c8b761ce rt/vm/src/test/java/org/apidesign/vm4brwsr/MathTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/MathTest.java Tue Jan 20 13:01:31 2015 +0100 @@ -0,0 +1,115 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * 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 org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** Checks behavior on Math class. + * + * @author Jaroslav Tulach + */ +public class MathTest { + @Test public void rintNegativeUp() throws Exception { + final double cnts = -453904.634; + assertExec("Should round up to end with 5", mathClass(), "rint__DD", + -453905.0, cnts + ); + } + + protected Class mathClass() { + return Math.class; + } + + @Test public void rintNegativeDown() throws Exception { + final double cnts = -453904.434; + assertExec("Should round up to end with 4", mathClass(), "rint__DD", + -453904.0, cnts + ); + } + + @Test public void rintPositiveUp() throws Exception { + final double cnts = 453904.634; + assertExec("Should round up to end with 5", mathClass(), "rint__DD", + 453905.0, cnts + ); + } + @Test public void rintPositiveDown() throws Exception { + final double cnts = 453904.434; + assertExec("Should round up to end with 4", mathClass(), "rint__DD", + 453904.0, cnts + ); + } + @Test public void rintOneHalf() throws Exception { + final double cnts = 1.5; + assertExec("Should round up to end with 2", mathClass(), "rint__DD", + 2.0, cnts + ); + } + @Test public void rintNegativeOneHalf() throws Exception { + final double cnts = -1.5; + assertExec("Should round up to end with 2", mathClass(), "rint__DD", + -2.0, cnts + ); + } + @Test public void rintTwoAndHalf() throws Exception { + final double cnts = 2.5; + assertExec("Should round up to end with 2", mathClass(), "rint__DD", + 2.0, cnts + ); + } + @Test public void rintNegativeTwoOneHalf() throws Exception { + final double cnts = -2.5; + assertExec("Should round up to end with 2", mathClass(), "rint__DD", + -2.0, cnts + ); + } + + @Test public void ieeeReminder1() throws Exception { + assertExec("Same result 1", mathClass(), "IEEEremainder__DDD", + Math.IEEEremainder(10.0, 4.5), 10.0, 4.5 + ); + } + + @Test public void ieeeReminder2() throws Exception { + assertExec("Same result 1", mathClass(), "IEEEremainder__DDD", + Math.IEEEremainder(Integer.MAX_VALUE, -4.5), Integer.MAX_VALUE, -4.5 + ); + } + + private static TestVM code; + + @BeforeClass + public static void compileTheCode() throws Exception { + StringBuilder sb = new StringBuilder(); + code = TestVM.compileClass(sb); + } + @AfterClass + public static void releaseTheCode() { + code = null; + } + + private void assertExec( + String msg, Class clazz, String method, + Object ret, Object... args + ) throws Exception { + code.assertExec(msg, clazz, method, ret, args); + } + +} diff -r e80693152d8b -r 9830c8b761ce rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java --- a/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Tue Jan 20 12:26:35 2015 +0100 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Tue Jan 20 13:01:31 2015 +0100 @@ -79,89 +79,6 @@ ); } - @Test public void rintNegativeUp() throws Exception { - final double cnts = -453904.634; - assertExec( - "Should round up to end with 5", - Math.class, "rint__DD", - -453905.0, cnts - ); - } - - @Test public void rintNegativeDown() throws Exception { - final double cnts = -453904.434; - assertExec( - "Should round up to end with 4", - Math.class, "rint__DD", - -453904.0, cnts - ); - } - - @Test public void rintPositiveUp() throws Exception { - final double cnts = 453904.634; - assertExec( - "Should round up to end with 5", - Math.class, "rint__DD", - 453905.0, cnts - ); - } - @Test public void rintPositiveDown() throws Exception { - final double cnts = 453904.434; - assertExec( - "Should round up to end with 4", - Math.class, "rint__DD", - 453904.0, cnts - ); - } - @Test public void rintOneHalf() throws Exception { - final double cnts = 1.5; - assertExec( - "Should round up to end with 2", - Math.class, "rint__DD", - 2.0, cnts - ); - } - @Test public void rintNegativeOneHalf() throws Exception { - final double cnts = -1.5; - assertExec( - "Should round up to end with 2", - Math.class, "rint__DD", - -2.0, cnts - ); - } - @Test public void rintTwoAndHalf() throws Exception { - final double cnts = 2.5; - assertExec( - "Should round up to end with 2", - Math.class, "rint__DD", - 2.0, cnts - ); - } - @Test public void rintNegativeTwoOneHalf() throws Exception { - final double cnts = -2.5; - assertExec( - "Should round up to end with 2", - Math.class, "rint__DD", - -2.0, cnts - ); - } - - @Test public void ieeeReminder1() throws Exception { - assertExec( - "Same result 1", - Math.class, "IEEEremainder__DDD", - Math.IEEEremainder(10.0, 4.5), 10.0, 4.5 - ); - } - - @Test public void ieeeReminder2() throws Exception { - assertExec( - "Same result 1", - Math.class, "IEEEremainder__DDD", - Math.IEEEremainder(Integer.MAX_VALUE, -4.5), Integer.MAX_VALUE, -4.5 - ); - } - @Test public void divAndRound() throws Exception { assertExec( "Should be rounded to one",