From 1a0ec018113f9254b78e181fe26193664e546a48 Mon Sep 17 00:00:00 2001 From: David Pastor Herranz Date: Thu, 18 Sep 2025 09:34:38 +0200 Subject: [PATCH 1/2] ANDROID-16839 Fix loggerazzi reports --- .../main/java/com/telefonica/loggerazzi/LoggerazziRule.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt b/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt index bf2619b..7188e58 100644 --- a/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt +++ b/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt @@ -53,7 +53,6 @@ open class GenericLoggerazziRule( val testName = "${description?.className}_${description?.methodName}" val fileName = "${testName}.${System.nanoTime()}" - val recordedLogs: List if (InstrumentationRegistry.getArguments().getString("record") != "true" && !isTestIgnored) { val goldenFile = InstrumentationRegistry.getInstrumentation().context.assets.open( @@ -61,17 +60,19 @@ open class GenericLoggerazziRule( ) val goldenStringLogs = String(goldenFile.readBytes()).takeIf { it.isNotEmpty() }?.split("\n") ?: emptyList() val comparison = compare(goldenStringLogs) + writeRecordedLogsToFile(fileName, comparison.recordedLogs) if (!comparison.success) { val compareFile = File(failuresDir, fileName) compareFile.createNewFile() compareFile.writeText(comparison.failure!!) throw AssertionError("Logs do not match:\n${comparison.failure}") } - recordedLogs = comparison.recordedLogs } else { - recordedLogs = recorder.getRecordedLogs() + writeRecordedLogsToFile(fileName,recorder.getRecordedLogs()) } + } + private fun writeRecordedLogsToFile(fileName: String, recordedLogs: List) { val log = recordedLogs.joinToString("\n") { stringMapper.fromLog(it) } val testFile = File(recordedDir, fileName) testFile.createNewFile() From dc143421b4319a12865b133b9d6177faf5e94fdc Mon Sep 17 00:00:00 2001 From: dpastor Date: Thu, 18 Sep 2025 09:39:52 +0200 Subject: [PATCH 2/2] Update loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt b/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt index 7188e58..8317bca 100644 --- a/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt +++ b/loggerazzi/src/main/java/com/telefonica/loggerazzi/LoggerazziRule.kt @@ -68,7 +68,7 @@ open class GenericLoggerazziRule( throw AssertionError("Logs do not match:\n${comparison.failure}") } } else { - writeRecordedLogsToFile(fileName,recorder.getRecordedLogs()) + writeRecordedLogsToFile(fileName, recorder.getRecordedLogs()) } }