From 2a325f2d98e49db873dd94c4db56ed09e48d072b Mon Sep 17 00:00:00 2001 From: Jakub Kalinowski Date: Mon, 16 Dec 2024 21:43:39 +0100 Subject: [PATCH] Replacing \r\n with \n in the CSV export test --- .../uhabits/core/io/HabitsCSVExporterTest.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt index bbe069be8..099fe8de6 100644 --- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt +++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/HabitsCSVExporterTest.kt @@ -18,7 +18,6 @@ */ package org.isoron.uhabits.core.io -import org.apache.commons.io.FileUtils import org.apache.commons.io.IOUtils import org.isoron.uhabits.core.BaseUnitTest import org.isoron.uhabits.core.models.Habit @@ -30,6 +29,7 @@ import java.io.IOException import java.nio.file.Files import java.util.* import java.util.zip.ZipFile +import kotlin.test.assertEquals import kotlin.test.assertTrue class HabitsCSVExporterTest : BaseUnitTest() { @@ -112,11 +112,14 @@ class HabitsCSVExporterTest : BaseUnitTest() { file.deleteOnExit() copyAssetToFile(assetFilename, file) - assertTrue( - FileUtils.contentEquals( - file, - File(String.format("%s/%s", baseDir.absolutePath, s)) - ) - ) + val fileContent = normalizeLineEndings(file.readText()) + val referenceFile = File(String.format("%s/%s", baseDir.absolutePath, s)) + val referenceFileContent = normalizeLineEndings(referenceFile.readText()) + + assertEquals(fileContent, referenceFileContent) + } + + private fun normalizeLineEndings(content: String): String { + return content.replace("\r\n", "\n") } }