archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8233048: WeekFields.ISO is not a singleton

Browse source 
Reviewed-by: joehw, rriggs, scolebourne
This commit is contained in:
Naoto Sato 2020-07-31 09:09:53 -07:00
parent 0f5e57aa8c
commit 58107e52a8
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/java/time/temporal/WeekFields.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2020, 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
@ -210,7 +210,7 @@ public final class WeekFields implements Serializable {
* Note also that the first few days of a calendar year may be in the * Note also that the first few days of a calendar year may be in the
* week-based-year corresponding to the previous calendar year. * week-based-year corresponding to the previous calendar year.
*/ */
public static final WeekFields ISO = new WeekFields(DayOfWeek.MONDAY, 4); public static final WeekFields ISO = WeekFields.of(DayOfWeek.MONDAY, 4);
/** /**
* The common definition of a week that starts on Sunday and the first week * The common definition of a week that starts on Sunday and the first week

9
test/jdk/java/time/test/java/time/temporal/TestIsoWeekFields.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, 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
@ -26,7 +26,9 @@ package test.java.time.temporal;
import static java.time.temporal.ChronoField.DAY_OF_WEEK; import static java.time.temporal.ChronoField.DAY_OF_WEEK;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import java.time.DayOfWeek;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.MonthDay; import java.time.MonthDay;
@ -281,6 +283,11 @@ public class TestIsoWeekFields {
} }
} }
@Test
public void test_ISOSingleton() {
assertTrue(WeekFields.ISO == WeekFields.of(DayOfWeek.MONDAY, 4));
}
private int wbyLen(int wby) { private int wbyLen(int wby) {
return (wby == 2004 || wby == 2009 || wby == 2015 || wby == 2020 ? 53 : 52); return (wby == 2004 || wby == 2009 || wby == 2015 || wby == 2020 ? 53 : 52);
} }