Skip to content

Y_Update PlaceholderParserTests.java #34046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Y_Update PlaceholderParserTests.java #34046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions spring-core/src/test/java/org/springframework/util/PlaceholderParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,19 +196,21 @@ static Stream<Arguments> placeholders() {

@ParameterizedTest(name = "{0} -> {1}")
@MethodSource("nestedPlaceholders")
void nestedPlaceholdersAreReplaced(String text, String expected) {
void testPlaceholderResolution(String input, String expected) {
Properties properties = new Properties();
properties.setProperty("p1", "v1");
properties.setProperty("p2", "v2");
properties.setProperty("p3", "${p1}:${p2}"); // nested placeholders
properties.setProperty("p4", "${p3}"); // deeply nested placeholders
properties.setProperty("p5", "${p1}:${p2}:${bogus}"); // unresolvable placeholder
properties.setProperty("p6", "${p1}:${p2}:${bogus:def}"); // unresolvable w/ default
assertThat(this.parser.replacePlaceholders(text, properties::getProperty)).isEqualTo(expected);
}

PlaceholderResolver resolver = mockPlaceholderResolver(input, expected);
assertThat(this.parser.replacePlaceholders(input, resolver)).isEqualTo(expected);
}

static Stream<Arguments> nestedPlaceholders() {
return Stream.of(
static Stream<Arguments> placeholderTestCases() {
return Stream.of(
Arguments.of("${p6}", "v1:v2:def"),
Arguments.of("${invalid:${p1}:${p2}}", "v1:v2"),
Arguments.of("${invalid:${p3}}", "v1:v2"),
Expand Down