Trivial implementation of TimeZone.getDefault() - doesn't count with daylightsavings
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/rt/emul/brwsrtest/src/test/java/org/apidesign/bck2brwsr/brwsrtest/TimeZoneTest.java Fri May 20 06:02:44 2016 +0200
1.3 @@ -0,0 +1,55 @@
1.4 +/**
1.5 + * Back 2 Browser Bytecode Translator
1.6 + * Copyright (C) 2012-2015 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.7 + *
1.8 + * This program is free software: you can redistribute it and/or modify
1.9 + * it under the terms of the GNU General Public License as published by
1.10 + * the Free Software Foundation, version 2 of the License.
1.11 + *
1.12 + * This program is distributed in the hope that it will be useful,
1.13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1.14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.15 + * GNU General Public License for more details.
1.16 + *
1.17 + * You should have received a copy of the GNU General Public License
1.18 + * along with this program. Look for COPYING file in the top folder.
1.19 + * If not, see http://opensource.org/licenses/GPL-2.0.
1.20 + */
1.21 +package org.apidesign.bck2brwsr.brwsrtest;
1.22 +
1.23 +import java.util.TimeZone;
1.24 +import org.apidesign.bck2brwsr.vmtest.Compare;
1.25 +import org.apidesign.bck2brwsr.vmtest.VMTest;
1.26 +import org.testng.annotations.Factory;
1.27 +
1.28 +/**
1.29 + *
1.30 + * @author Jaroslav Tulach <jtulach@netbeans.org>
1.31 + */
1.32 +public class TimeZoneTest {
1.33 + boolean started;
1.34 + int miss;
1.35 + int exec;
1.36 +
1.37 + public TimeZoneTest() {
1.38 + }
1.39 +
1.40 + @Compare
1.41 + public int defaultTimeZoneRawOffset() throws Exception {
1.42 + TimeZone zone = TimeZone.getDefault();
1.43 + assert zone != null : "TimeZone.getDefault shouldn't be null";
1.44 + int offset = zone.getRawOffset();
1.45 + if (offset > 0) {
1.46 + return 1;
1.47 + } else if (offset < 0) {
1.48 + return -1;
1.49 + } else {
1.50 + return 0;
1.51 + }
1.52 + }
1.53 +
1.54 + @Factory public static Object[] create() {
1.55 + return VMTest.create(TimeZoneTest.class);
1.56 + }
1.57 +
1.58 +}
2.1 --- a/rt/emul/compact/src/main/java/java/util/TimeZone.java Tue May 10 04:52:05 2016 +0200
2.2 +++ b/rt/emul/compact/src/main/java/java/util/TimeZone.java Fri May 20 06:02:44 2016 +0200
2.3 @@ -40,9 +40,8 @@
2.4
2.5 import java.io.Serializable;
2.6 import java.lang.ref.SoftReference;
2.7 -import java.security.AccessController;
2.8 -import java.security.PrivilegedAction;
2.9 import java.util.concurrent.ConcurrentHashMap;
2.10 +import org.apidesign.bck2brwsr.core.JavaScriptBody;
2.11
2.12 /**
2.13 * <code>TimeZone</code> represents a time zone offset, and also figures out daylight
2.14 @@ -617,8 +616,35 @@
2.15 defaultZone = defaultTimeZone;
2.16 if (defaultZone == null) {
2.17 // Need to initialize the default time zone.
2.18 - defaultZone = TimeZone.NO_TIMEZONE;
2.19 - assert defaultZone != null;
2.20 + defaultZone = new TimeZone() {
2.21 + @Override
2.22 + public int getOffset(int era, int year, int month, int day, int dayOfWeek, int milliseconds) {
2.23 + return getRawOffset();
2.24 + }
2.25 +
2.26 + @Override
2.27 + public void setRawOffset(int offsetMillis) {
2.28 + }
2.29 +
2.30 + @Override
2.31 + public int getRawOffset() {
2.32 + int minutesOff = dateTimezoneOffset();
2.33 + return -60 * 1000 * minutesOff;
2.34 + }
2.35 +
2.36 + @JavaScriptBody(args = { }, body = "return new Date().getTimezoneOffset();")
2.37 + private native int dateTimezoneOffset();
2.38 +
2.39 + @Override
2.40 + public boolean useDaylightTime() {
2.41 + return false;
2.42 + }
2.43 +
2.44 + @Override
2.45 + public boolean inDaylightTime(Date date) {
2.46 + return false;
2.47 + }
2.48 + };
2.49 }
2.50 }
2.51 // Don't clone here.