diff -r cb0efe0cc20e -r 2e3f73b616c2 test/jdk/java/util/Calendar/NarrowNamesTest.java --- a/test/jdk/java/util/Calendar/NarrowNamesTest.java Fri Jun 08 11:38:40 2018 -0700 +++ b/test/jdk/java/util/Calendar/NarrowNamesTest.java Wed Aug 09 14:54:37 2017 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, 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 @@ -21,6 +21,7 @@ * questions. */ +import java.time.LocalDateTime; import java.util.*; import static java.util.GregorianCalendar.*; @@ -49,7 +50,9 @@ HOUR_OF_DAY, 10); test(US, AM_PM, "p", HOUR_OF_DAY, 23); - test(JAJPJP, DAY_OF_WEEK, "\u65e5", + test(JAJPJP, DAY_OF_WEEK, + LocalDateTime.now().isBefore(LocalDateTime.of(2019, 5, 1, 0, 0)) ? + "\u65e5" : "\u706b", // "Sun" for HEISEI, "Tue" for NEWERA YEAR, 24, MONTH, DECEMBER, DAY_OF_MONTH, 23); test(THTH, MONTH, NARROW_STANDALONE, "\u0e18.\u0e04.", YEAR, 2555, MONTH, DECEMBER, DAY_OF_MONTH, 5);