Telefonica · jeslat · Jun 13, 2025 · Jun 10, 2025
diff --git a/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/Directories.kt b/android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/Directories.kt
@@ -0,0 +1,17 @@
+package com.telefonica.androidsnaptesting
+
+import android.os.Environment
+import androidx.test.platform.app.InstrumentationRegistry
+import java.io.File
+
+internal class Directories {
+
+    internal val context = InstrumentationRegistry.getInstrumentation().context
+    private val downloadDir = File(
+        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
+    )
+    private val androidSnaptestingDir = File(downloadDir, "android-snaptesting/${context.packageName}")
+    internal val failuresDir = File(androidSnaptestingDir, "failures")
+    internal val recordedDir = File(androidSnaptestingDir, "recorded")
+    internal val goldenFilesDir = "android-snaptesting-golden-files"
+}
diff --git a/...onica/androidsnaptesting/LogComparator.kt → .../androidsnaptesting/logs/LogComparator.kt b/...onica/androidsnaptesting/LogComparator.kt → .../androidsnaptesting/logs/LogComparator.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.logs
 
 import java.lang.StringBuilder
 

diff --git a/...fonica/androidsnaptesting/LogsRecorder.kt → ...a/androidsnaptesting/logs/LogsRecorder.kt b/...fonica/androidsnaptesting/LogsRecorder.kt → ...a/androidsnaptesting/logs/LogsRecorder.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.logs
 
 public interface LogsRecorder<LogType> {
     public fun clear()

diff --git a/...telefonica/androidsnaptesting/LogsRule.kt → ...onica/androidsnaptesting/logs/LogsRule.kt b/...telefonica/androidsnaptesting/LogsRule.kt → ...onica/androidsnaptesting/logs/LogsRule.kt
@@ -1,7 +1,8 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.logs
 
-import android.os.Environment
 import androidx.test.platform.app.InstrumentationRegistry
+import com.telefonica.androidsnaptesting.Directories
+import com.telefonica.androidsnaptesting.IgnoreLogs
 import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 import java.io.File
@@ -24,24 +25,17 @@ public open class GenericLogsRule<LogType>(
     private val comparator: LogComparator<LogType> = DefaultLogComparator(),
 ) : TestWatcher() {
 
-    private val context = InstrumentationRegistry.getInstrumentation().context
-
-    private val downloadDir = File(
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
-    )
-    private val androidSnaptestingDir = File(downloadDir, "android-snaptesting/${context.packageName}")
-    private val failuresDir = File(androidSnaptestingDir, "failures")
-    private val recordedDir = File(androidSnaptestingDir, "recorded")
+    private val directories = Directories()
 
     override fun starting(description: Description?) {
         super.starting(description)
 
         recorder.clear()
-        if (!failuresDir.exists()) {
-            failuresDir.mkdirs()
+        if (!directories.failuresDir.exists()) {
+            directories.failuresDir.mkdirs()
         }
-        if (!recordedDir.exists()) {
-            recordedDir.mkdirs()
+        if (!directories.recordedDir.exists()) {
+            directories.recordedDir.mkdirs()
         }
     }
 
@@ -55,23 +49,20 @@ public open class GenericLogsRule<LogType>(
 
         val recordedLogs = recorder.getRecordedLogs()
         val log = recordedLogs.joinToString("\n") { stringMapper.fromLog(it) }
-        val testFile = File(recordedDir, fileName)
+        val testFile = File(directories.recordedDir, fileName)
         testFile.createNewFile()
         testFile.writeText(log)
 
         if (InstrumentationRegistry.getArguments().getString("record") != "true" && !isTestIgnored) {
-            val goldenFile =
-                InstrumentationRegistry.getInstrumentation().context.assets.open(
-                    "android-snaptesting-golden-files/${testName}.txt"
-                )
+            val goldenFile = directories.context.assets.open("${directories.goldenFilesDir}/${testName}.txt")
             val goldenStringLogs = String(goldenFile.readBytes()).takeIf { it.isNotEmpty() }?.split("\n") ?: emptyList()
             val result = comparator.compare(recordedLogs, goldenStringLogs.map { stringMapper.toLog(it) })
             if (result != null) {
-                val compareFile = File(failuresDir, fileName)
+                val compareFile = File(directories.failuresDir, fileName)
                 compareFile.createNewFile()
                 compareFile.writeText(result)
                 throw AssertionError("Logs do not match:\n$result")
             }
         }
     }
-}
+}
diff --git a/...fonica/androidsnaptesting/StringMapper.kt → ...a/androidsnaptesting/logs/StringMapper.kt b/...fonica/androidsnaptesting/StringMapper.kt → ...a/androidsnaptesting/logs/StringMapper.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.logs
 
 public interface StringMapper<LogType> {
     public fun fromLog(log: LogType): String

diff --git a/...efonica/androidsnaptesting/BitmapImage.kt → ...oidsnaptesting/screenshots/BitmapImage.kt b/...efonica/androidsnaptesting/BitmapImage.kt → ...oidsnaptesting/screenshots/BitmapImage.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.screenshots
 
 import android.graphics.Bitmap
 import com.dropbox.differ.Color

diff --git a/...ica/androidsnaptesting/ResultValidator.kt → ...naptesting/screenshots/ResultValidator.kt b/...ica/androidsnaptesting/ResultValidator.kt → ...naptesting/screenshots/ResultValidator.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.screenshots
 
 import com.dropbox.differ.ImageComparator
 import kotlin.math.roundToInt

diff --git a/...ica/androidsnaptesting/ScreenshotsRule.kt → ...naptesting/screenshots/ScreenshotsRule.kt b/...ica/androidsnaptesting/ScreenshotsRule.kt → ...naptesting/screenshots/ScreenshotsRule.kt
@@ -1,10 +1,9 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.screenshots
 
 import android.app.Activity
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.os.Build
-import android.os.Environment
 import androidx.annotation.RequiresApi
 import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.test.captureToImage
@@ -15,6 +14,8 @@ import androidx.test.runner.screenshot.Screenshot
 import com.dropbox.differ.ImageComparator
 import com.dropbox.differ.Mask
 import com.dropbox.differ.SimpleImageComparator
+import com.telefonica.androidsnaptesting.Directories
+import com.telefonica.androidsnaptesting.IgnoreScreenshots
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
@@ -31,24 +32,18 @@ public class ScreenshotsRule(
     private var isTestIgnored: Boolean = false
     private val writeDiffImage = WriteDiffImage()
 
-    private val context = InstrumentationRegistry.getInstrumentation().context
-    private val downloadDir = File(
-        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath
-    )
-    private val androidSnaptestingDir = File(downloadDir, "android-snaptesting/${context.packageName}")
-    private val failuresDir = File(androidSnaptestingDir, "failures")
-    private val recordedDir = File(androidSnaptestingDir, "recorded")
+    private val directories = Directories()
 
     override fun apply(base: Statement, description: Description): Statement {
         className = description.className
         testName = description.methodName
         isTestIgnored = description.getAnnotation(IgnoreScreenshots::class.java) != null
 
-        if (!failuresDir.exists()) {
-            failuresDir.mkdirs()
+        if (!directories.failuresDir.exists()) {
+            directories.failuresDir.mkdirs()
         }
-        if (!recordedDir.exists()) {
-            recordedDir.mkdirs()
+        if (!directories.recordedDir.exists()) {
+            directories.recordedDir.mkdirs()
         }
         return base
     }
@@ -88,7 +83,7 @@ public class ScreenshotsRule(
     }
 
     private fun saveScreenshot(fileName: String, bitmap: Bitmap) {
-        val testFile = File(recordedDir, fileName)
+        val testFile = File(directories.recordedDir, fileName)
         testFile.createNewFile()
         testFile.outputStream().use {
             bitmap.compress(Bitmap.CompressFormat.PNG, 100, it)
@@ -97,7 +92,7 @@ public class ScreenshotsRule(
 
     private fun getGoldenBitmap(resourceName: String): Bitmap {
         val goldenBitmap = try {
-            context.assets.open("android-snaptesting-golden-files/$resourceName").use {
+            directories.context.assets.open("${directories.goldenFilesDir}/$resourceName").use {
                 BitmapFactory.decodeStream(it)
             }
         } catch (e: FileNotFoundException) {
@@ -116,7 +111,7 @@ public class ScreenshotsRule(
         name: String?
     ) {
         if (bitmap.width != goldenBitmap.width || bitmap.height != goldenBitmap.height) {
-            writeDiffImage(failuresDir, fileName, bitmap, goldenBitmap, null)
+            writeDiffImage(directories.failuresDir, fileName, bitmap, goldenBitmap, null)
             throw AssertionError(
                 "$name: Test image (w=${bitmap.width}, h=${bitmap.height}) differs in size" +
                         " from reference image (w=${goldenBitmap.width}, h=${goldenBitmap.height}).\n",
@@ -134,12 +129,12 @@ public class ScreenshotsRule(
         val result = try {
             imageComparator.compare(BitmapImage(goldenBitmap), BitmapImage(bitmap), mask)
         } catch (e: IllegalArgumentException) {
-            writeDiffImage(failuresDir, fileName, bitmap, goldenBitmap, mask)
+            writeDiffImage(directories.failuresDir, fileName, bitmap, goldenBitmap, mask)
             throw AssertionError("Failed to compare images", e)
         }
 
         if (!resultValidator(result)) {
-            writeDiffImage(failuresDir, fileName, bitmap, goldenBitmap, mask)
+            writeDiffImage(directories.failuresDir, fileName, bitmap, goldenBitmap, mask)
             throw AssertionError(
                 "\"$resourceName\" failed to match reference image. ${result.pixelDifferences} pixels differ " +
                         "(${(result.pixelDifferences / result.pixelCount.toFloat()) * 100} %)"

diff --git a/...nica/androidsnaptesting/WriteDiffImage.kt → ...snaptesting/screenshots/WriteDiffImage.kt b/...nica/androidsnaptesting/WriteDiffImage.kt → ...snaptesting/screenshots/WriteDiffImage.kt
@@ -1,4 +1,4 @@
-package com.telefonica.androidsnaptesting
+package com.telefonica.androidsnaptesting.screenshots
 
 import android.graphics.Bitmap
 import android.graphics.Canvas