Skip to content

Commit

Permalink
[tests] Check for actual line ending before asserting content (#2134)
Browse files Browse the repository at this point in the history
This case covers LF on Windows and CRLF on Unix systems
  • Loading branch information
Playacem authored Feb 24, 2024
1 parent bcba586 commit 7da42d0
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions javalin/src/test/java/io/javalin/TestMultipartForms.kt
Original file line number Diff line number Diff line change
Expand Up @@ -322,15 +322,21 @@ class TestMultipartForms {

@Test
fun `fileutil works`() {
val content = if (File.separatorChar == '\\') TEXT_FILE_CONTENT_CRLF else TEXT_FILE_CONTENT_LF
val assertContent = { actual: String ->
if (CRLF in actual) {
assertThat(actual).isEqualTo(TEXT_FILE_CONTENT_CRLF)
} else {
assertThat(actual).isEqualTo(TEXT_FILE_CONTENT_LF)
}
}
val prefix = "src/test/resources/upload-test";
FileUtil.readFile("$prefix/text.txt").let { assertThat(it).isEqualTo(content) }
FileUtil.readResource("/upload-test/text.txt").let { assertThat(it).isEqualTo(content) }
FileUtil.readFile("$prefix/text.txt").let { assertContent(it) }
FileUtil.readResource("/upload-test/text.txt").let { assertContent(it) }
File("$prefix/text.txt").inputStream().use { inputStream ->
FileUtil.streamToFile(inputStream, "$prefix/text-copy.txt")
}
val file = File("$prefix/text-copy.txt")
assertThat(file.readText()).isEqualTo(content)
file.deleteOnExit()
assertContent(file.readText())
}
}

0 comments on commit 7da42d0

Please sign in to comment.