Skip to content

Commit 37a4df0

Browse files
dhonti-axpejeslat
andauthored
ANDROID-17148 -- Fix double extension when generating files in Snapshot Testing library (#16)
* ANDROID-17148/fix-double-extension: Remove ".txt" extra extension when log file is creating * Fix issues after moving loggerazzi fixes --------- Co-authored-by: Jesús Latorre <[email protected]>
1 parent 4db357f commit 37a4df0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

android-snaptesting/src/main/java/com/telefonica/androidsnaptesting/logs/LogsRule.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ public open class GenericLogsRule<LogType>(
4747
val testName = "${description?.className}_${description?.methodName}"
4848
val fileName = "${testName}.txt.${System.nanoTime()}"
4949

50-
val recordedLogs: List<LogType>
51-
5250
if (InstrumentationRegistry.getArguments().getString("record") != "true" && !isTestIgnored) {
5351
val goldenFile = directories.context.assets.open("${directories.goldenFilesDir}/${testName}.txt")
5452
val goldenStringLogs = String(goldenFile.readBytes()).takeIf { it.isNotEmpty() }?.split("\n") ?: emptyList()
5553
val comparison = compare(goldenStringLogs)
54+
writeRecordedLogsToFile(fileName, comparison.recordedLogs)
5655
if (!comparison.success) {
5756
val compareFile = File(directories.failuresDir, fileName)
5857
compareFile.createNewFile()
5958
compareFile.writeText(comparison.failure!!)
6059
throw AssertionError("Logs do not match:\n${comparison.failure}")
6160
}
62-
recordedLogs = comparison.recordedLogs
6361
} else {
64-
recordedLogs = recorder.getRecordedLogs()
62+
writeRecordedLogsToFile(fileName, recorder.getRecordedLogs())
6563
}
64+
}
6665

66+
private fun writeRecordedLogsToFile(fileName: String, recordedLogs: List<LogType>) {
6767
val log = recordedLogs.joinToString("\n") { stringMapper.fromLog(it) }
6868
val testFile = File(directories.recordedDir, fileName)
6969
testFile.createNewFile()

include-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ class AndroidSnaptestingPlugin @Inject constructor(
149149
}
150150
if (lastRecordedFile != null) {
151151
lastRecordedFile
152-
.renameTo(File(recordedDir, "$key.txt"))
152+
.renameTo(File(recordedDir, key))
153153
File(failuresDir, lastRecordedFile.name)
154154
.takeIf { it.exists() }
155-
?.renameTo(File(failuresDir, "$key.txt"))
155+
?.renameTo(File(failuresDir, key))
156156
}
157157
}
158158
}

0 commit comments

Comments
 (0)