diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java index 5b8ceb70d30..d4ee80d787d 100644 --- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java +++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java @@ -4666,8 +4666,10 @@ public final class DateTimeFormatterBuilder { if (length >= position + 3 && context.charEquals(text.charAt(position + 2), 'C')) { // There are localized zone texts that start with "UTC", e.g. // "UTC\u221210:00" (MINUS SIGN instead of HYPHEN-MINUS) in French. - // Exclude those ZoneText cases. - if (!(this instanceof ZoneTextPrinterParser)) { + // Exclude those cases. + if (length == position + 3 || + context.charEquals(text.charAt(position + 3), '+') || + context.charEquals(text.charAt(position + 3), '-')) { return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO); } } else { diff --git a/test/jdk/java/time/test/java/time/format/TestUTCParse.java b/test/jdk/java/time/test/java/time/format/TestUTCParse.java new file mode 100644 index 00000000000..3f991810f8b --- /dev/null +++ b/test/jdk/java/time/test/java/time/format/TestUTCParse.java @@ -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); + } +}