Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed Jul 31, 2020
2 parents faddcb2 + 58107e5 commit 900a1ecffd545a49f796d3d2a7389b1879125725
@@ -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.
*
* This code is free software; you can redistribute it and/or modify it
@@ -210,7 +210,7 @@
* Note also that the first few days of a calendar year may be in the
* 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
@@ -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.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@

import static java.time.temporal.ChronoField.DAY_OF_WEEK;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.MonthDay;
@@ -281,6 +283,11 @@ public void test_addTo_weekBasedYears(TemporalField weekField, TemporalField yea
}
}

@Test
public void test_ISOSingleton() {
assertTrue(WeekFields.ISO == WeekFields.of(DayOfWeek.MONDAY, 4));
}

private int wbyLen(int wby) {
return (wby == 2004 || wby == 2009 || wby == 2015 || wby == 2020 ? 53 : 52);
}

0 comments on commit 900a1ec

Please sign in to comment.