Merge branch '2.0.x'

pull/13286/merge
Stephane Nicoll 7 years ago
commit 188ba14c17

@ -92,7 +92,7 @@ public class OriginTrackedPropertiesLoaderTests {
@Test @Test
public void getMalformedUnicodeProperty() throws Exception { public void getMalformedUnicodeProperty() throws Exception {
// gh-2716 // gh-12716
this.thrown.expect(IllegalStateException.class); this.thrown.expect(IllegalStateException.class);
this.thrown.expectMessage("Malformed \\uxxxx encoding"); this.thrown.expectMessage("Malformed \\uxxxx encoding");
new OriginTrackedPropertiesLoader(new ClassPathResource( new OriginTrackedPropertiesLoader(new ClassPathResource(

Loading…
Cancel
Save