Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8303440: The "ZonedDateTime.parse" may not accept the "UTC+XX" zone id
Reviewed-by: iris, jpai, rriggs, lancea
- Loading branch information
Showing
2 changed files
with
81 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
test/jdk/java/time/test/java/time/format/TestUTCParse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/* | ||
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. | ||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
* | ||
* This code is free software; you can redistribute it and/or modify it | ||
* under the terms of the GNU General Public License version 2 only, as | ||
* published by the Free Software Foundation. | ||
* | ||
* This code 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 | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
* or visit www.oracle.com if you need additional information or have any | ||
* questions. | ||
*/ | ||
/* | ||
* @test | ||
* @modules jdk.localedata | ||
* @bug 8303440 | ||
* @summary Test parsing "UTC-XX:XX" text works correctly | ||
*/ | ||
package test.java.time.format; | ||
|
||
import java.time.ZoneId; | ||
import java.time.ZonedDateTime; | ||
import java.time.format.DateTimeFormatter; | ||
import java.time.format.DateTimeFormatterBuilder; | ||
import java.time.format.TextStyle; | ||
import java.time.temporal.TemporalQueries; | ||
import java.util.Locale; | ||
|
||
import org.testng.annotations.DataProvider; | ||
import org.testng.annotations.Test; | ||
import static org.testng.Assert.assertEquals; | ||
|
||
public class TestUTCParse { | ||
|
||
static { | ||
// Assuming CLDR's SHORT name for "America/Los_Angeles" | ||
// produces "UTC\u212208:00" | ||
System.setProperty("java.locale.providers", "CLDR"); | ||
} | ||
|
||
@DataProvider | ||
public Object[][] utcZoneIdStrings() { | ||
return new Object[][] { | ||
{"UTC"}, | ||
{"UTC+01:30"}, | ||
{"UTC-01:30"}, | ||
}; | ||
} | ||
|
||
@Test | ||
public void testUTCShortNameRoundTrip() { | ||
var fmt = DateTimeFormatter.ofPattern("z", Locale.FRANCE); | ||
var zdt = ZonedDateTime.of(2023, 3, 3, 0, 0, 0, 0, ZoneId.of("America/Los_Angeles")); | ||
var formatted = fmt.format(zdt); | ||
assertEquals(formatted, "UTC\u221208:00"); | ||
assertEquals(fmt.parse(formatted).query(TemporalQueries.zoneId()), zdt.getZone()); | ||
} | ||
|
||
@Test(dataProvider = "utcZoneIdStrings") | ||
public void testUTCOffsetRoundTrip(String zidString) { | ||
var fmt = new DateTimeFormatterBuilder() | ||
.appendZoneText(TextStyle.NARROW) | ||
.toFormatter(); | ||
var zid = ZoneId.of(zidString); | ||
assertEquals(fmt.parse(zidString).query(TemporalQueries.zoneId()), zid); | ||
} | ||
} |
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport 17u-dev
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb The target repository
17u-dev
is not a valid target for backports.List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk19u, openjdk/jdk20, openjdk/jdk20u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/shenandoah-jdk8u, openjdk/shenandoah-jdk8u-dev.
Supplying the organization/group prefix is optional.
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk17u-dev
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk11u-dev
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk20u
cfb0a25
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mrserb the backport was successfully created on the branch mrserb-backport-cfb0a25a in my personal fork of openjdk/jdk20u. To create a pull request with this backport targeting openjdk/jdk20u:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk20u: