root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix SortedPropertiesTests on JDK 9+

This commit is contained in:
Sam Brannen 2019-05-30 10:41:49 +02:00
parent eacc531cf7
commit f66eef1f88
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/test/java/org/springframework/core/SortedPropertiesTests.java
View File

@ -132,8 +132,11 @@ public class SortedPropertiesTests {
String[] lines = lines(baos); String[] lines = lines(baos);
assertThat(lines).containsExactly( // assertThat(lines).isNotEmpty();
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>", // // Leniently match first line due to differences between JDK 8 and JDK 9+.
String regex = "<\\?xml .*\\?>";
assertThat(lines[0]).matches(regex);
assertThat(lines).filteredOn(line -> !line.matches(regex)).containsExactly( //
"<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">", // "<!DOCTYPE properties SYSTEM \"http://java.sun.com/dtd/properties.dtd\">", //
"<properties>", // "<properties>", //
"<entry key=\"color\">blue</entry>", // "<entry key=\"color\">blue</entry>", //