From 897376386651e20aa0149ee957d2494aa61c787a Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Tue, 4 Jun 2024 00:12:12 +0200 Subject: [PATCH] Fix line endings conversion errors on windows builds --- compiler/test/ast/TestSourceCode.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/compiler/test/ast/TestSourceCode.kt b/compiler/test/ast/TestSourceCode.kt index b07b9c0a4..2bebb0df9 100644 --- a/compiler/test/ast/TestSourceCode.kt +++ b/compiler/test/ast/TestSourceCode.kt @@ -54,6 +54,11 @@ class TestSourceCode: AnnotationSpec() { shouldThrow { SourceCode.File(fixturesDir) } } + + private fun normalizeLineEndings(text: String): String { + return text.replace("\\R".toRegex(), "\n") + } + @Test fun testFromPathWithExistingPath() { val filename = "ast_simple_main.p8" @@ -61,7 +66,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.File(path) val expectedOrigin = SourceCode.relative(path).toString() src.origin shouldBe expectedOrigin - src.text shouldBe path.toFile().readText() + src.text shouldBe normalizeLineEndings(path.toFile().readText()) src.isFromResources shouldBe false src.isFromFilesystem shouldBe true } @@ -85,7 +90,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.File(path) val expectedOrigin = SourceCode.relative(path).toString() src.origin shouldBe expectedOrigin - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) } @Test @@ -95,7 +100,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.Resource(pathString) src.origin shouldBe "$LIBRARYFILEPREFIX/$pathString" - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) src.isFromResources shouldBe true src.isFromFilesystem shouldBe false } @@ -107,7 +112,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.Resource(pathString) src.origin shouldBe "$LIBRARYFILEPREFIX$pathString" - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) } @Test @@ -117,7 +122,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.Resource(pathString) src.origin shouldBe "$LIBRARYFILEPREFIX/$pathString" - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) src.isFromResources shouldBe true } @@ -128,7 +133,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.Resource(pathString) src.origin shouldBe "$LIBRARYFILEPREFIX$pathString" - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) } @Test @@ -138,7 +143,7 @@ class TestSourceCode: AnnotationSpec() { val src = SourceCode.Resource(pathString) src.origin shouldBe "$LIBRARYFILEPREFIX/prog8lib/math.p8" - src.text shouldBe srcFile.readText() + src.text shouldBe normalizeLineEndings(srcFile.readText()) src.isFromResources shouldBe true }