Skip to content

Commit e5f93b7

Browse files
iamstolisiamstolis
committed
Adding a test of zone-rules-based-time-zones option.
1 parent f0b3fe8 commit e5f93b7

File tree

3 files changed

+179
-1
lines changed

3 files changed

+179
-1
lines changed

‎graal-js/mx.graal-js/mx_graal_js.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ def _graal_js_gate_runner(args, tasks):
7474
with Task('UnitTests', tasks, tags=[GraalJsDefaultTags.default, GraalJsDefaultTags.all]) as t:
7575
if t:
7676
noWebAssemblyTestSuite = '^(?!' + webassemblyTestSuite + ')'
77-
unittest(['--regex', noWebAssemblyTestSuite, '--enable-timing', '--very-verbose', '--suite', _suite.name])
77+
commonOptions = ['--enable-timing', '--very-verbose', '--suite', _suite.name]
78+
unittest(['--regex', noWebAssemblyTestSuite] + commonOptions)
79+
unittest(['--regex', 'ZoneRulesProviderTest', '-Djava.time.zone.DefaultZoneRulesProvider=com.oracle.truffle.js.test.runtime.SimpleZoneRulesProvider'] + commonOptions)
7880

7981
with Task('WebAssemblyTests', tasks, tags=['webassembly', GraalJsDefaultTags.all]) as t:
8082
if t:

‎graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/runtime/SimpleZoneRulesProvider.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.js.test.runtime;
42+
43+
import java.time.ZoneOffset;
44+
import java.time.zone.ZoneRules;
45+
import java.time.zone.ZoneRulesProvider;
46+
import java.util.Arrays;
47+
import java.util.HashSet;
48+
import java.util.NavigableMap;
49+
import java.util.Set;
50+
import java.util.TimeZone;
51+
import java.util.TreeMap;
52+
53+
/**
54+
* Simple implementation of {@code ZoneRulesProvider} for testing purposes. The data provided by
55+
* this implementation have nothing to do with the real tzdb data.
56+
*/
57+
public class SimpleZoneRulesProvider extends ZoneRulesProvider {
58+
59+
@Override
60+
protected Set<String> provideZoneIds() {
61+
return new HashSet<>(Arrays.asList(TimeZone.getAvailableIDs()));
62+
}
63+
64+
@Override
65+
protected ZoneRules provideRules(String zoneId, boolean forCaching) {
66+
return ZoneRules.of(ZoneOffset.ofHours(7));
67+
}
68+
69+
@Override
70+
protected NavigableMap<String, ZoneRules> provideVersions(String zoneId) {
71+
NavigableMap<String, ZoneRules> map = new TreeMap<>();
72+
map.put("theOnlyVersion", provideRules(zoneId, false));
73+
return map;
74+
}
75+
76+
}

‎graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/runtime/ZoneRulesProviderTest.java‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*
2+
* Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.js.test.runtime;
42+
43+
import static org.junit.Assert.assertEquals;
44+
import static org.junit.Assume.assumeTrue;
45+
46+
import com.oracle.truffle.js.lang.JavaScriptLanguage;
47+
import com.oracle.truffle.js.runtime.JSContextOptions;
48+
import com.oracle.truffle.js.test.JSTest;
49+
import org.graalvm.polyglot.Context;
50+
import org.junit.Before;
51+
import org.junit.Test;
52+
53+
/**
54+
* Tests of {@code js.zone-rules-based-time-zones} option.
55+
*/
56+
public class ZoneRulesProviderTest {
57+
58+
@Before
59+
public void setUp() {
60+
String provider = System.getProperty("java.time.zone.DefaultZoneRulesProvider");
61+
assumeTrue(SimpleZoneRulesProvider.class.getName().equals(provider));
62+
}
63+
64+
@Test
65+
public void testNoIntl() {
66+
try (Context context = newContext(false)) {
67+
context.eval(JavaScriptLanguage.ID, "date = new Date(Date.UTC(2020, 3, 25, 12, 13, 14))");
68+
// SimpleZoneRulesProvider uses +7 offset for all time-zones
69+
assertResult(context, "date.toString()", "Sat Apr 25 2020 19:13:14 GMT+0700 (CET)");
70+
assertResult(context, "date.toLocaleString()", "Sat Apr 25 2020 19:13:14 GMT+0700 (CET)");
71+
assertResult(context, "date.toTimeString()", "19:13:14 GMT+0700 (CET)");
72+
assertResult(context, "date.toLocaleTimeString()", "19:13:14");
73+
}
74+
}
75+
76+
@Test
77+
public void testIntl() {
78+
try (Context context = newContext(true)) {
79+
context.eval(JavaScriptLanguage.ID, "date = new Date(Date.UTC(2020, 3, 25, 12, 13, 14))");
80+
// SimpleZoneRulesProvider uses +7 offset for all time-zones
81+
assertResult(context, "date.toLocaleString()", "4/25/2020, 7:13:14 PM");
82+
assertResult(context, "date.toLocaleTimeString()", "7:13:14 PM");
83+
assertResult(context, "new Intl.DateTimeFormat('en', { dateStyle: 'long', timeStyle: 'long' }).format(date)", "April 25, 2020 at 7:13:14 PM GMT+7");
84+
}
85+
}
86+
87+
private static Context newContext(boolean intl) {
88+
return JSTest.newContextBuilder().//
89+
option(JSContextOptions.TIME_ZONE_NAME, "Europe/Prague").//
90+
option(JSContextOptions.INTL_402_NAME, Boolean.toString(intl)).//
91+
option(JSContextOptions.ZONE_RULES_BASED_TIME_ZONES_NAME, "true").//
92+
build();
93+
}
94+
95+
private static void assertResult(Context context, String code, String expectedResult) {
96+
String actualResult = context.eval(JavaScriptLanguage.ID, code).toString();
97+
assertEquals(expectedResult, actualResult);
98+
}
99+
100+
}

0 commit comments

Comments
 (0)