archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8043387: java/time/test/java/util/TestFormatter.java failed

Browse source 
Reviewed-by: sherman
This commit is contained in:
Naoto Sato 2016-06-15 09:24:16 -07:00
parent 3555038f51
commit a94f94cce1
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jdk/test/java/time/test/java/util/TestFormatter.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -47,7 +47,7 @@ import org.testng.annotations.Test;
/* @test /* @test
* @summary Unit test for j.u.Formatter threeten date/time support * @summary Unit test for j.u.Formatter threeten date/time support
* @bug 8003680 8012638 * @bug 8003680 8043387 8012638
*/ */
@Test @Test
public class TestFormatter { public class TestFormatter {
@ -235,10 +235,6 @@ public class TestFormatter {
} }
} }
private String toZoneIdStr(String expected) {
return expected.replaceAll("(?:GMT|UTC)(?<off>[+\\-]?[0-9]{2}:[0-9]{2})", "${off}");
}
private String toZoneOffsetStr(String expected) { private String toZoneOffsetStr(String expected) {
return expected.replaceAll("(?:GMT|UTC)(?<off>[+\\-]?[0-9]{2}:[0-9]{2})", "${off}") return expected.replaceAll("(?:GMT|UTC)(?<off>[+\\-]?[0-9]{2}:[0-9]{2})", "${off}")
.replaceAll("GMT|UTC|UT", "Z"); .replaceAll("GMT|UTC|UT", "Z");
@ -247,7 +243,7 @@ public class TestFormatter {
private void testZoneId(Locale locale, ChronoZonedDateTime<?> zdt, Calendar cal) { private void testZoneId(Locale locale, ChronoZonedDateTime<?> zdt, Calendar cal) {
String fmtStr = "z:[%tz] z:[%1$Tz] Z:[%1$tZ] Z:[%1$TZ]"; String fmtStr = "z:[%tz] z:[%1$Tz] Z:[%1$tZ] Z:[%1$TZ]";
printFmtStr(locale, fmtStr); printFmtStr(locale, fmtStr);
String expected = toZoneIdStr(test(fmtStr, locale, null, cal)); String expected = test(fmtStr, locale, null, cal);
test(fmtStr, locale, expected, zdt); test(fmtStr, locale, expected, zdt);
// get a new cal with fixed tz // get a new cal with fixed tz
Calendar cal0 = Calendar.getInstance(); Calendar cal0 = Calendar.getInstance();
@ -263,7 +259,7 @@ public class TestFormatter {
// datetime + zid // datetime + zid
fmtStr = "c:[%tc] c:[%1$Tc]"; fmtStr = "c:[%tc] c:[%1$Tc]";
printFmtStr(locale, fmtStr); printFmtStr(locale, fmtStr);
expected = toZoneIdStr(test(fmtStr, locale, null, cal)); expected = test(fmtStr, locale, null, cal);
test(fmtStr, locale, expected, zdt); test(fmtStr, locale, expected, zdt);
} }