Add SessionCaptureStrategyTest

romtsn · romtsn · commit 09fb0e4d3fde · 2024-07-23T22:55:06.000+02:00
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/ReplayCache.kt
@@ -294,7 +294,7 @@ public class ReplayCache internal constructor(
             }
         }
 
-        internal fun fromDisk(options: SentryOptions, replayId: SentryId): LastSegmentData? {
+        internal fun fromDisk(options: SentryOptions, replayId: SentryId, replayCacheProvider: ((replayId: SentryId, recorderConfig: ScreenshotRecorderConfig) -> ReplayCache)? = null): LastSegmentData? {
             val replayCacheDir = makeReplayCacheDir(options, replayId)
             val lastSegmentFile = File(replayCacheDir, ONGOING_SEGMENT)
             if (!lastSegmentFile.exists()) {
@@ -348,7 +348,7 @@ public class ReplayCache internal constructor(
                 scaleFactorY = 1.0f
             )
 
-            val cache = ReplayCache(options, replayId, recorderConfig)
+            val cache = replayCacheProvider?.invoke(replayId, recorderConfig) ?: ReplayCache(options, replayId, recorderConfig)
             cache.replayCacheDir?.listFiles { dir, name ->
                 if (name.endsWith(".jpg")) {
                     val file = File(dir, name)
diff --git a/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt b/sentry-android-replay/src/main/java/io/sentry/android/replay/capture/BaseCaptureStrategy.kt
@@ -117,7 +117,7 @@ internal abstract class BaseCaptureStrategy(
                     File(cacheDir).listFiles { dir, name ->
                         if (name.startsWith("replay_") &&
                             !name.contains(replayId.toString()) &&
-                            !name.contains(unfinishedReplayId)
+                            !(unfinishedReplayId.isNotBlank() && name.contains(unfinishedReplayId))
                         ) {
                             FileUtils.deleteRecursively(File(dir, name))
                         }
@@ -134,15 +134,13 @@ internal abstract class BaseCaptureStrategy(
         currentSegment = segmentId
         currentReplayId = replayId
 
-        // TODO: replace it with dateProvider.currentTimeMillis to also test it
         segmentTimestamp = DateUtils.getCurrentDateTime()
         replayStartTimestamp.set(dateProvider.currentTimeMillis)
 
         finalizePreviousReplay()
     }
 
     override fun resume() {
-        // TODO: replace it with dateProvider.currentTimeMillis to also test it
         segmentTimestamp = DateUtils.getCurrentDateTime()
     }
 
@@ -341,7 +339,7 @@ internal abstract class BaseCaptureStrategy(
             }
             val breadcrumbs = PersistingScopeObserver.read(options, BREADCRUMBS_FILENAME, List::class.java, Breadcrumb.Deserializer()) as? List<Breadcrumb>
 
-            val lastSegment = ReplayCache.fromDisk(options, previousReplayId) ?: return@submitSafely
+            val lastSegment = ReplayCache.fromDisk(options, previousReplayId, replayCacheProvider) ?: return@submitSafely
             val segment = createSegment(
                 duration = lastSegment.duration,
                 currentSegmentTimestamp = lastSegment.timestamp,
diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/ReplayIntegrationTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/ReplayIntegrationTest.kt
@@ -36,7 +36,6 @@ import kotlin.test.assertTrue
 @RunWith(AndroidJUnit4::class)
 @Config(sdk = [26])
 class ReplayIntegrationTest {
-    // write tests for ReplayIntegration with mocked context and other android things
     @get:Rule
     val tmpDir = TemporaryFolder()
 
diff --git a/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt b/sentry-android-replay/src/test/java/io/sentry/android/replay/capture/SessionCaptureStrategyTest.kt

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ public class ReplayCache internal constructor(`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
`297`		`- internal fun fromDisk(options: SentryOptions, replayId: SentryId): LastSegmentData? {`
	`297`	`+ internal fun fromDisk(options: SentryOptions, replayId: SentryId, replayCacheProvider: ((replayId: SentryId, recorderConfig: ScreenshotRecorderConfig) -> ReplayCache)? = null): LastSegmentData? {`
`298`	`298`	`val replayCacheDir = makeReplayCacheDir(options, replayId)`
`299`	`299`	`val lastSegmentFile = File(replayCacheDir, ONGOING_SEGMENT)`
`300`	`300`	`if (!lastSegmentFile.exists()) {`
`@@ -348,7 +348,7 @@ public class ReplayCache internal constructor(`
`348`	`348`	`scaleFactorY = 1.0f`
`349`	`349`	`)`
`350`	`350`
`351`		`- val cache = ReplayCache(options, replayId, recorderConfig)`
	`351`	`+ val cache = replayCacheProvider?.invoke(replayId, recorderConfig) ?: ReplayCache(options, replayId, recorderConfig)`
`352`	`352`	`cache.replayCacheDir?.listFiles { dir, name ->`
`353`	`353`	`if (name.endsWith(".jpg")) {`
`354`	`354`	`val file = File(dir, name)`