Added unit tests for refreshFrom day truncation

Author: gmsdelmundo

src/main/java/com/uid2/admin/salt/TargetDate.java

@@ -7,7 +7,7 @@
 import java.util.Objects;
 
 public class TargetDate {
-    private final static long DAY_IN_MS = Duration.ofDays(1).toMillis();
+    private static final long DAY_IN_MS = Duration.ofDays(1).toMillis();
 
     private final LocalDate date;
     private final long epochMs;

src/test/java/com/uid2/admin/salt/SaltRotationTest.java

@@ -29,7 +29,7 @@
 import ch.qos.logback.classic.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SaltRotationTest {
+class SaltRotationTest {
     @Mock
     private IKeyGenerator keyGenerator;
     private SaltRotation saltRotation;
@@ -50,7 +50,7 @@ void setup() {
     }
 
     @AfterEach
-    void tearDown() throws Exception {
+    void teardown() throws Exception {
         appender.stop();
         mocks.close();
     }
@@ -209,13 +209,16 @@ void rotateSaltsRotateSaltsInsufficientOutdatedSalts() throws Exception {
 
     @ParameterizedTest
     @CsvSource({
-            "5, 30", // Soon after rotation, use 30 days post rotation
-            "40, 60", // >30 days after rotation use the next increment of 30 days
-            "60, 90", // Exactly at multiple of 30 days post rotation, use next increment of 30 days
+            "5, 0, 30", // Soon after rotation, use 30 days post rotation
+            "5, 100, 30", // Soon after rotation, use 30 days post rotation with some offset
+            "40, 0, 60", // >30 days after rotation use the next increment of 30 days
+            "40, 100, 60", // >30 days after rotation use the next increment of 30 days with some offset
+            "60, 0, 90", // Exactly at multiple of 30 days post rotation, use next increment of 30 days
+            "60, 100, 90" // Exactly at multiple of 30 days post rotation, use next increment of 30 days with some offset
     })
-    void testRefreshFromCalculation(int lastRotationDaysAgo, int refreshFromDaysFromRotation) throws Exception {
+    void testRefreshFromCalculation(int lastRotationDaysAgo, int lastRotationMsOffset, int refreshFromDaysFromRotation) throws Exception {
         var lastRotation = daysEarlier(lastRotationDaysAgo);
-        SaltBuilder saltBuilder = SaltBuilder.start().lastUpdated(lastRotation);
+        SaltBuilder saltBuilder = SaltBuilder.start().lastUpdated(lastRotation.asInstant().plusMillis(lastRotationMsOffset));
         var lastSnapshot = SaltSnapshotBuilder.start()
                 .entries(saltBuilder)
                 .build();

src/test/java/com/uid2/admin/salt/helper/SaltBuilder.java

@@ -32,11 +32,21 @@ public SaltBuilder lastUpdated(TargetDate lastUpdated) {
         return this;
     }
 
+    public SaltBuilder lastUpdated(Instant lastUpdated) {
+        this.lastUpdated = lastUpdated;
+        return this;
+    }
+
     public SaltBuilder refreshFrom(TargetDate refreshFrom) {
         this.refreshFrom = refreshFrom.asInstant();
         return this;
     }
 
+    public SaltBuilder refreshFrom(Instant refreshFrom) {
+        this.refreshFrom = refreshFrom;
+        return this;
+    }
+
     public SaltBuilder currentSalt(String currentSalt) {
         this.currentSalt = currentSalt;
         return this;

src/test/java/com/uid2/admin/salt/helper/TargetDateUtil.java

@@ -2,9 +2,12 @@
 
 import com.uid2.admin.salt.TargetDate;
 
-public class TargetDateUtil {
+public final class TargetDateUtil {
     private static final TargetDate TARGET_DATE = TargetDate.of(2025, 1, 1);
 
+    private TargetDateUtil() {
+    }
+
     public static TargetDate daysEarlier(int days) {
         return TARGET_DATE.minusDays(days);
     }