demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Relax test to accept files with CRLF line endings (#4126)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2024-03-03 13:05:16 +01:00 committed by GitHub
parent 81805ae6d9
commit bca1010c0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImplTest.java
View File

@ -205,7 +205,7 @@ public class YamlModelRepositoryImplTest {
String actualFileContent = Files.readString(fullModelPath); String actualFileContent = Files.readString(fullModelPath);
String expectedFileContent = Files.readString(SOURCE_PATH.resolve("addToModelExpectedContent.yaml")); String expectedFileContent = Files.readString(SOURCE_PATH.resolve("addToModelExpectedContent.yaml"));
assertThat(actualFileContent, is(expectedFileContent)); assertThat(actualFileContent, is(expectedFileContent.replaceAll("\r\n", "\n")));
} }
@Test @Test
@ -221,7 +221,7 @@ public class YamlModelRepositoryImplTest {
String actualFileContent = Files.readString(fullModelPath); String actualFileContent = Files.readString(fullModelPath);
String expectedFileContent = Files.readString(SOURCE_PATH.resolve("updateInModelExpectedContent.yaml")); String expectedFileContent = Files.readString(SOURCE_PATH.resolve("updateInModelExpectedContent.yaml"));
assertThat(actualFileContent, is(expectedFileContent)); assertThat(actualFileContent, is(expectedFileContent.replaceAll("\r\n", "\n")));
} }
@Test @Test
@ -237,7 +237,7 @@ public class YamlModelRepositoryImplTest {
String actualFileContent = Files.readString(fullModelPath); String actualFileContent = Files.readString(fullModelPath);
String expectedFileContent = Files.readString(SOURCE_PATH.resolve("removeFromModelExpectedContent.yaml")); String expectedFileContent = Files.readString(SOURCE_PATH.resolve("removeFromModelExpectedContent.yaml"));
assertThat(actualFileContent, is(expectedFileContent)); assertThat(actualFileContent, is(expectedFileContent.replaceAll("\r\n", "\n")));
} }
@Test @Test