ajust for timezone shifts

Signed-off-by: Ceki Gulcu <[email protected]>
qos-ch · Sep 6, 2024 · 4ebf044 · 4ebf044
1 parent 138953e
commit 4ebf044
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/...re/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java b/...re/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java
@@ -14,14 +14,17 @@
 package ch.qos.logback.core.rolling;
 
 import static ch.qos.logback.core.CoreConstants.DAILY_DATE_PATTERN;
+import static ch.qos.logback.core.CoreConstants.STRICT_ISO8601_PATTERN;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileFilter;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -56,6 +59,8 @@ public class TimeBasedRollingWithArchiveRemoval_Test extends ScaffoldingForRolli
     RollingFileAppender<Object> rfa = new RollingFileAppender<Object>();
     TimeBasedRollingPolicy<Object> tbrp = new TimeBasedRollingPolicy<Object>();
 
+    DateTimeFormatter STRICT_DATE_PARSER = DateTimeFormatter.ofPattern(STRICT_ISO8601_PATTERN);
+
     // by default tbfnatp is an instance of
     // DefaultTimeBasedFileNamingAndTriggeringPolicy
     TimeBasedFileNamingAndTriggeringPolicy<Object> tbfnatp = new DefaultTimeBasedFileNamingAndTriggeringPolicy<Object>();
@@ -290,7 +295,9 @@ public void dailySizeBasedRolloverWithSizeCap() {
         this.slashCount = computeSlashCount(DAILY_DATE_PATTERN);
 
         // 2016-03-05 00:14:39 CET
-        long simulatedTime = 1457133279186L;
+        //long simulatedTime = 1457133279186L;
+        long simulatedTime = getSimulatedTimeFromString("2016-03-05T00:14:39,186");
+
         ConfigParameters params = new ConfigParameters(simulatedTime);
         String fileNamePattern = randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i";
         params.maxHistory(60).fileNamePattern(fileNamePattern).simulatedNumberOfPeriods(10).sizeCap(sizeCap);
@@ -311,11 +318,23 @@ public int compare(File f0, File f1) {
         foundFiles.forEach(f -> la.add(f.length()));
         System.out.println("Sum: "+la.sum());
 
+        // adding fileSize to sizeCap may make sense
         assertTrue(la.sum() < sizeCap);
 
         checkFileCount(expectedFileCount + 1);
     }
 
+    /**
+     * The returned millis is based on local time
+     * @param dateStr
+     * @return
+     */
+    private long getSimulatedTimeFromString(String dateStr) {
+        LocalDateTime localDateTime = LocalDateTime.parse(dateStr, STRICT_DATE_PARSER);
+        long simulatedTime = localDateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+        return simulatedTime;
+    }
+
     @Test
     public void dailyChronologSizeBasedRollover() {
         SizeAndTimeBasedFileNamingAndTriggeringPolicy<Object> sizeAndTimeBasedFileNamingAndTriggeringPolicy = new SizeAndTimeBasedFileNamingAndTriggeringPolicy<Object>();