Make test for configuration more platform and settings independent

This commit is contained in:
Roel Spilker committed 2021-12-20 22:34:11 +01:00
1 parent 3d43feb2c0
commit 834e562592
1 file changed
+2 -2
@@ -39,7 +39,7 @@ public class TestConfiguration {
@Test
public void testDisplayVerbose() throws Exception {
@SuppressWarnings(value = {"unchecked", "deprecation"})
@SuppressWarnings(value = {"all", "unchecked", "deprecation"})
Collection<ConfigurationKey<?>> keys = Arrays.asList(ACCESSORS_FLAG_USAGE, ACCESSORS_CHAIN, ACCESSORS_PREFIX, ADD_GENERATED_ANNOTATIONS, ADD_JAVAX_GENERATED_ANNOTATIONS, ANY_CONSTRUCTOR_ADD_CONSTRUCTOR_PROPERTIES, LOG_ANY_FIELD_NAME, COPYABLE_ANNOTATIONS);
String baseName = "test/configuration/resource/configurationRoot/";
@@ -74,7 +74,7 @@ public class TestConfiguration {
}
private void checkContent(File dir, String actual, String type) throws Exception {
String expected = fileToString(new File(dir, type + ".txt")).trim();
String expected = fileToString(new File(dir, type + ".txt")).replace("\r", "").trim();
if (!expected.equals(actual)) {
System.out.printf("**** Expected %s:\n", type);
System.out.println(expected);