Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge

This commit is contained in:
Greg Wilkins 2017-05-02 12:14:00 +02:00
parent 9cc23b1901
commit 58492b3ebc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java
View File

@ -83,13 +83,14 @@ public class RolloverFileOutputStreamTest
public void testMidnightRolloverCalc_PDT_Issue1507() public void testMidnightRolloverCalc_PDT_Issue1507()
{ {
ZoneId zone = toZoneId("PST"); ZoneId zone = toZoneId("PST");
ZonedDateTime initialDate = toDateTime("2017.04.27-08:00:00.0 PM PDT", zone); ZonedDateTime initialDate = toDateTime("2017.04.26-08:00:00.0 PM PDT", zone);
ZonedDateTime midnight = RolloverFileOutputStream.toMidnight(initialDate); ZonedDateTime midnight = RolloverFileOutputStream.toMidnight(initialDate);
assertThat("Midnight", toString(midnight), is("2017.04.27-12:00:00.0 AM PDT")); assertThat("Midnight", toString(midnight), is("2017.04.27-12:00:00.0 AM PDT"));
Object expected[][] = { Object expected[][] = {
{"2017.04.28-12:00:00.0 AM PDT", 14_400_000L}, // Ensure not negative {"2017.04.27-12:00:00.0 AM PDT", 14_400_000L},
{"2017.04.28-12:00:00.0 AM PDT", 86_400_000L},
{"2017.04.29-12:00:00.0 AM PDT", 86_400_000L}, {"2017.04.29-12:00:00.0 AM PDT", 86_400_000L},
{"2017.04.30-12:00:00.0 AM PDT", 86_400_000L}, {"2017.04.30-12:00:00.0 AM PDT", 86_400_000L},
{"2017.05.01-12:00:00.0 AM PDT", 86_400_000L}, {"2017.05.01-12:00:00.0 AM PDT", 86_400_000L},