From 58492b3ebc5c6044cec7a19e066cca55e727bfff Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 2 May 2017 12:14:00 +0200 Subject: [PATCH] fixed merge --- .../org/eclipse/jetty/util/RolloverFileOutputStreamTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java index 6d2d487021e..043f974fc55 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/RolloverFileOutputStreamTest.java @@ -83,13 +83,14 @@ public class RolloverFileOutputStreamTest public void testMidnightRolloverCalc_PDT_Issue1507() { 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); assertThat("Midnight", toString(midnight), is("2017.04.27-12:00:00.0 AM PDT")); 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.30-12:00:00.0 AM PDT", 86_400_000L}, {"2017.05.01-12:00:00.0 AM PDT", 86_400_000L},