ppkarwasz commented on code in PR #1173:
URL: https://github.com/apache/logging-log4j2/pull/1173#discussion_r1060208429
##########
log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/PatternProcessorTest.java:
##########
@@ -56,155 +60,142 @@ public void testDontInterpretBackslashAsEscape() {
@ResourceLock(value = Resources.LOCALE, mode = ResourceAccessMode.READ)
public void testGetNextTimeHourlyReturnsFirstMinuteOfNextHour() {
final PatternProcessor pp = new
PatternProcessor("logs/app-%d{yyyy-MM-dd-HH}.log.gz");
- final Calendar initial = Calendar.getInstance();
- initial.set(2014, Calendar.MARCH, 4, 10, 31, 59); // Tue, March 4,
2014, 10:31
- final long actual = pp.getNextTime(initial.getTimeInMillis(), 1,
false);
-
- // expect Wed, March 4, 2014, 11:00
- final Calendar expected = Calendar.getInstance();
- expected.set(2014, Calendar.MARCH, 4, 11, 0, 0);
- expected.set(Calendar.MILLISECOND, 0);
- assertEquals(format(expected.getTimeInMillis()), format(actual));
+ Instant initial = parseLocalDateTime("2014-03-04T10:31:59");
+ final long actual = pp.getNextTime(initial.toEpochMilli(), 1, false);
+
+ Instant expected = parseLocalDateTime("2014-03-04T11:00:00");
+ assertEquals(expected, Instant.ofEpochMilli(actual));
}
@Test
@ResourceLock(value = Resources.LOCALE, mode = ResourceAccessMode.READ)
public void testGetNextTimeHourlyReturnsFirstMinuteOfNextHour2() {
final PatternProcessor pp = new
PatternProcessor("logs/app-%d{yyyy-MM-dd-HH}.log.gz");
- final Calendar initial = Calendar.getInstance();
- initial.set(2014, Calendar.MARCH, 4, 23, 31, 59); // Tue, March 4,
2014, 23:31
- final long actual = pp.getNextTime(initial.getTimeInMillis(), 1,
false);
-
- // expect Wed, March 5, 2014, 00:00
- final Calendar expected = Calendar.getInstance();
- expected.set(2014, Calendar.MARCH, 5, 0, 0, 0);
- expected.set(Calendar.MILLISECOND, 0);
- assertEquals(format(expected.getTimeInMillis()), format(actual));
+ Instant initial = parseLocalDateTime("2014-03-04T23:31:59");
+ final long actual = pp.getNextTime(initial.toEpochMilli(), 1, false);
+
+ Instant expected = parseLocalDateTime("2014-03-05T00:00:00");
+ assertEquals(expected, Instant.ofEpochMilli(actual));
+ }
+
+ @Test
+ @ResourceLock(value = Resources.LOCALE, mode = ResourceAccessMode.READ)
+ public void testGetNextTimeHourlyReturnsFirstMinuteOfNextHourDstStart() {
+ // America/Chicago 2014 - DST start - Mar 9 02:00
+ // during winter GMT-6
+ // during summer GMT-5
+ final PatternProcessor pp = new
PatternProcessor("logs/app-%d{yyyy-MM-dd-HH}{America/Chicago}.log.gz");
+ Instant initial =
OffsetDateTime.parse("2014-03-09T01:31:59-06").toInstant();
Review Comment:
```suggestion
Instant initial =
OffsetDateTime.parse("2014-03-09T01:31:59-06:00").toInstant();
```
JRE 8 does not support all ISO 8601 offset formats.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
