Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent logging in ignoreResourceNotFound scenarios

Browse Source 
Issue: SPR-15218
(cherry picked from commit 448ea4c)
This commit is contained in:
Juergen Hoeller
2017-02-10 10:41:10 +01:00
parent 941f3e7166
commit d6216fb74a
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -388,7 +388,7 @@ public class PropertySourcesPropertyResolverTests {
}
catch (IllegalArgumentException ex) {
assertThat(ex.getMessage(), containsString(
"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
}
assertThat(pr.getProperty("p6"), equalTo("v1:v2:def"));
try {
@@ -420,7 +420,7 @@ public class PropertySourcesPropertyResolverTests {
}
catch (IllegalArgumentException ex) {
assertThat(ex.getMessage(), containsString(
"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
}
// relax the treatment of unresolvable nested placeholders
@@ -436,7 +436,7 @@ public class PropertySourcesPropertyResolverTests {
}
catch (IllegalArgumentException ex) {
assertThat(ex.getMessage(), containsString(
"Could not resolve placeholder 'bogus' in string value \"${p1}:${p2}:${bogus}\""));
"Could not resolve placeholder 'bogus' in value \"${p1}:${p2}:${bogus}\""));
}
}