Skip to content

Commit 43ef6b1

Browse files
authored
Y_Update PlaceholderParserTests.java
this is the tests of my editing on NestedPlaceholderPart placeholders spring-projects#34020 @vip-delete @spring-projects
1 parent 2b9010c commit 43ef6b1

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

spring-core/src/test/java/org/springframework/util/PlaceholderParserTests.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -196,19 +196,21 @@ static Stream<Arguments> placeholders() {
196196

197197
@ParameterizedTest(name = "{0} -> {1}")
198198
@MethodSource("nestedPlaceholders")
199-
void nestedPlaceholdersAreReplaced(String text, String expected) {
199+
void testPlaceholderResolution(String input, String expected) {
200200
Properties properties = new Properties();
201201
properties.setProperty("p1", "v1");
202202
properties.setProperty("p2", "v2");
203203
properties.setProperty("p3", "${p1}:${p2}"); // nested placeholders
204204
properties.setProperty("p4", "${p3}"); // deeply nested placeholders
205205
properties.setProperty("p5", "${p1}:${p2}:${bogus}"); // unresolvable placeholder
206206
properties.setProperty("p6", "${p1}:${p2}:${bogus:def}"); // unresolvable w/ default
207-
assertThat(this.parser.replacePlaceholders(text, properties::getProperty)).isEqualTo(expected);
208-
}
207+
208+
PlaceholderResolver resolver = mockPlaceholderResolver(input, expected);
209+
assertThat(this.parser.replacePlaceholders(input, resolver)).isEqualTo(expected);
210+
}
209211

210-
static Stream<Arguments> nestedPlaceholders() {
211-
return Stream.of(
212+
static Stream<Arguments> placeholderTestCases() {
213+
return Stream.of(
212214
Arguments.of("${p6}", "v1:v2:def"),
213215
Arguments.of("${invalid:${p1}:${p2}}", "v1:v2"),
214216
Arguments.of("${invalid:${p3}}", "v1:v2"),

0 commit comments

Comments
 (0)