fixed mocked/non-mocked time in cache cleanup tests #SCL-24107

Author: SrTobi

ideaSupport/src/main/scala/org/jetbrains/sbtidea/download/cachesCleanup/CleanupUtils.scala

@@ -9,6 +9,7 @@ import java.time.temporal.ChronoUnit
 object CleanupUtils {
 
   val DateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("dd MMM yy")
+  @volatile
   private var MockTodayDate: Option[LocalDate] = None
 
   @TestOnly
@@ -21,6 +22,8 @@ object CleanupUtils {
     items.map(presenter).map(ListSeparator + _).mkString("\n").indented(2)
   }
 
+  def cleanupRelevantTime(): LocalDate = MockTodayDate.getOrElse(LocalDate.now())
+
   /**
    * Formats a given date into a human-readable string indicating how long ago it was
    * (e.g., "2 days ago", "1 week ago", "more than 1 month ago").
@@ -29,7 +32,7 @@ object CleanupUtils {
    * @return a string indicating how long ago the given date occurred (e.g., "today", "3 days ago", "more than 2 months ago")
    */
   def formatAgo(date: LocalDate): String = {
-    val now = MockTodayDate.getOrElse(LocalDate.now())
+    val now = cleanupRelevantTime()
 
     val daysAgo = ChronoUnit.DAYS.between(date, now)
     val weeksAgo = daysAgo / 7

ideaSupport/src/main/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldDownloadsDetector.scala

@@ -15,7 +15,7 @@ object OldDownloadsDetector {
    */
   def detectOldDownloads(report: DownloadsReport): Seq[FileMetaInfo] = {
     report.fileInfos.filter { fileInfo =>
-      isLaterThen(fileInfo.metaData.creationDate, RetentionDays)
+      isOlderThan(fileInfo.metaData.creationDate, RetentionDays)
     }
   }
 }

ideaSupport/src/main/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldSdkDetector.scala

@@ -77,18 +77,12 @@ private object OldSdkDetector {
     else
       KeepPreviousReleasesThreshold
 
-    val oldVersionsFromLatest = latestMinorVersions.filter(laterThen(_, KeepLongerLatestMinorVersionsThreshold))
-    val oldVersionsFromOlder = olderMinorVersions.filter(laterThen(_, threshold))
+    val oldVersionsFromLatest = latestMinorVersions.filter(olderThan(_, KeepLongerLatestMinorVersionsThreshold))
+    val oldVersionsFromOlder = olderMinorVersions.filter(olderThan(_, threshold))
 
     oldVersionsFromLatest ++ oldVersionsFromOlder
   }
 
-  private def laterThen(sdk: IntellijSdkDirInfo, duration: FiniteDuration): Boolean =
-    laterThen(sdk.dirInfo.creationDate, duration)
-
-  private def laterThen(date: LocalDate, duration: FiniteDuration): Boolean = {
-    val now = LocalDate.now()
-    val diff = ChronoUnit.DAYS.between(date, now)
-    diff > duration.toDays
-  }
+  private def olderThan(sdk: IntellijSdkDirInfo, duration: FiniteDuration): Boolean =
+    isOlderThan(sdk.dirInfo.creationDate, duration)
 }

ideaSupport/src/main/scala/org/jetbrains/sbtidea/download/cachesCleanup/package.scala

@@ -66,8 +66,8 @@ package object cachesCleanup {
 
 
   private[download]
-  def isLaterThen(date: LocalDate, duration: FiniteDuration): Boolean = {
-    val now = LocalDate.now()
+  def isOlderThan(date: LocalDate, duration: FiniteDuration): Boolean = {
+    val now = CleanupUtils.cleanupRelevantTime()
     val diff = ChronoUnit.DAYS.between(date, now)
     diff > duration.toDays
   }

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldDownloadsCleanupTest.scala

@@ -7,20 +7,21 @@ import org.scalatest.matchers.should.Matchers
 
 import java.nio.file.{Files, Path}
 
-class OldDownloadsCleanupTest extends AnyFunSuite with Matchers with BeforeAndAfterEach {
+class OldDownloadsCleanupTest extends AnyFunSuite with Matchers with BeforeAndAfterEach with WithMockedTime {
 
   // Create a temporary directory for tests
   private var tempDir: Path = _
 
   override def beforeEach(): Unit = {
-    CleanupUtils.setMockTodayDate(MockedTodayDate)
+    super.beforeEach()
     tempDir = Files.createTempDirectory("old-downloads-cleanup-test")
   }
 
   override def afterEach(): Unit = {
     if (tempDir != null && Files.exists(tempDir)) {
       FileUtils.deleteDirectory(tempDir)
     }
+    super.afterEach()
   }
 
   private def createMockedDownloadsReport(fileInfos: Seq[FileMetaInfo]): DownloadsReport = {

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldDownloadsDetectorTest.scala

@@ -5,11 +5,11 @@ import org.scalatest.funsuite.AnyFunSuite
 import java.nio.file.Paths
 import java.time.LocalDate
 
-class OldDownloadsDetectorTest extends AnyFunSuite {
+class OldDownloadsDetectorTest extends AnyFunSuite with WithMockedTime {
 
   test("detectOldDownloads should identify files older than 1 month") {
-    val oldDate = LocalDate.now().minusDays(40)
-    val recentDate = LocalDate.now().minusDays(15)
+    val oldDate = mockedNow().minusDays(40)
+    val recentDate = mockedNow().minusDays(15)
 
     val oldFile = FileMetaInfo(
       Paths.get("/tmp/old-file.zip"),
@@ -33,7 +33,7 @@ class OldDownloadsDetectorTest extends AnyFunSuite {
   }
 
   test("detectOldDownloads should return empty list when no files are old") {
-    val recentDate = LocalDate.now().minusDays(15)
+    val recentDate = mockedNow().minusDays(15)
 
     val recentFile = FileMetaInfo(
       Paths.get("/tmp/recent-file.zip"),

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldSdkCleanupTest.scala

@@ -7,20 +7,21 @@ import org.scalatest.matchers.should.Matchers
 
 import java.nio.file.{Files, Path}
 
-class OldSdkCleanupTest extends AnyFunSuite with Matchers with BeforeAndAfterEach {
+class OldSdkCleanupTest extends AnyFunSuite with Matchers with BeforeAndAfterEach with WithMockedTime {
 
   // Create a temporary directory for tests
   private var tempDir: Path = _
 
   override def beforeEach(): Unit = {
-    CleanupUtils.setMockTodayDate(MockedTodayDate)
+    super.beforeEach()
     tempDir = Files.createTempDirectory("old-sdk-cleanup-test")
   }
 
   override def afterEach(): Unit = {
     if (tempDir != null && Files.exists(tempDir)) {
       FileUtils.deleteDirectory(tempDir)
     }
+    super.afterEach()
   }
 
   private def createMockSdkDirectories(sdkInfos: Seq[IntellijSdkDirInfo]): Seq[Path] = {

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/OldSdkDetectorTest.scala

@@ -4,8 +4,7 @@ import org.jetbrains.sbtidea.download.cachesCleanup.TestUtils.createSdkInfoMock
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 
-class OldSdkDetectorTest extends AnyFunSuite with Matchers {
-
+class OldSdkDetectorTest extends AnyFunSuite with Matchers with WithMockedTime {
   test("detectOldSdks") {
     val sdkInfos = Seq(
       // 242 major version (older than 2 releases from the latest release)

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/TestUtils.scala

@@ -55,7 +55,7 @@ object TestUtils {
     message.replaceAll("Total size: [0-9,.]+\\s*[KMGT]?B", "Total size: SIZE_PLACEHOLDER")
 
   def createFileMetaInfo(file: Path, daysAgo: Int): FileMetaInfo = {
-    val creationDate = LocalDate.now().minusDays(daysAgo)
+    val creationDate = MockedTodayDate.minusDays(daysAgo)
     FileMetaInfo(file, DirectoryMetaData(creationDate))
   }
 

ideaSupport/src/test/scala/org/jetbrains/sbtidea/download/cachesCleanup/WithMockedTime.scala

@@ -0,0 +1,15 @@
+package org.jetbrains.sbtidea.download.cachesCleanup
+
+import org.jetbrains.sbtidea.download.cachesCleanup.TestUtils.MockedTodayDate
+import org.scalatest.{BeforeAndAfterEach, Suite}
+
+import java.time.LocalDate
+
+trait WithMockedTime extends BeforeAndAfterEach { this: Suite =>
+  def mockedNow(): LocalDate = MockedTodayDate
+
+  override def beforeEach(): Unit = {
+    CleanupUtils.setMockTodayDate(MockedTodayDate)
+    super.beforeEach()
+  }
+}