roborazzi-compose/src/main/java/com/github/takahirom/roborazzi/RoborazziCompose.kt (1)

65-83: Guard against parallel test interference when mutating global qualifiers.

RuntimeEnvironment.setQualifiers affects global state. If Robolectric tests run in parallel forks/threads, interleaving could cause flaky dimensions. Consider serializing the critical section that mutates qualifiers.

Minimal approach:

• Add a process-wide lock.
• Wrap the save/launch/capture/restore sequence in synchronized.

Add this at top-level (outside any function):

private val qualifiersLock = Any()

Then wrap the refactored body:

synchronized(qualifiersLock) {
  // save -> launch -> capture -> afterCapture -> restore
}

This is defensive but prevents rare race conditions when multiple captures with different qualifiers run concurrently.

sample-android/src/test/java/com/github/takahirom/roborazzi/sample/boxed/PreviewSizeRetentionBugTest.kt (1)

35-36: Update test docstring to reflect current intent (regression, not expected failure).

Now that the fix is in place, this test validates the regression and should pass. Consider renaming the method or updating the comment to avoid confusion.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

sample-android/src/test/java/com/github/takahirom/roborazzi/sample/boxed/PreviewSizeRetentionBugTest.kt (1)

103-111: Nice: migrated to JUnit assertions and ensured cleanup with try/finally.

• Replacing Kotlin assert with JUnit assertions makes the tests reliable regardless of JVM -ea flags.
• try/finally cleanup guarantees artifact deletion even when assertions fail.

Also applies to: 133-136, 168-171, 231-238, 172-175, 239-242

sample-android/src/test/java/com/github/takahirom/roborazzi/sample/boxed/PreviewSizeRetentionBugTest.kt (3)

64-67: Optional: avoid decoding full bitmap; read dimensions only (memory-friendly).

To reduce memory overhead and avoid retaining a Bitmap, decode bounds only.

-        val bitmap = BitmapFactory.decodeFile(filePath)
-            ?: throw AssertionError("Failed to decode bitmap: $filePath")
-        return bitmap.width to bitmap.height
+        val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+        BitmapFactory.decodeFile(filePath, options)
+        val width = options.outWidth
+        val height = options.outHeight
+        if (width <= 0 || height <= 0) {
+            throw AssertionError("Failed to decode image dimensions: $filePath")
+        }
+        return width to height

---

70-70: Nit: rename tests to reflect current intent (regression tests that pass post-fix).

Names like “shouldFailBeforeFix” can confuse future readers when the test passes in main. Consider framing as a regression test.

-    fun testPreviewSizeRetentionBug_shouldFailBeforeFix() {
+    fun regression_previewSizeDoesNotLeakBetweenCaptures() {

-    fun testMultiplePreviewsWithSameCode_simulatesComposablePreviewScanner() {
+    fun regression_sizeIsolation_simulatesComposablePreviewScanner() {

Also applies to: 180-180

---

224-238: Stronger invariant: compare “default” sizes to a baseline default capture.

Asserting “not equal” verifies the leak is gone, but a more robust check is:

• Capture a baseline “default” (no size) before any sized preview,
• After each sized capture, capture again with default and assert it equals the baseline size.

This guards against coincidental equality/inequality and asserts the intended behavior precisely.

If you’d like, I can draft a variant that records a baseline default size and asserts equality against it for previews 2 and 4.

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro