Skip to content

Commit c59ca08

Browse files
snicollsbrannen
authored andcommitted
Backport tests for exact match resolution
See gh-34124 (cherry picked from commit 898d3ec)
1 parent 9de2b94 commit c59ca08

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

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

+17
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,23 @@ static Stream<Arguments> defaultValues() {
153153
);
154154
}
155155

156+
@ParameterizedTest(name = "{0} -> {1}")
157+
@MethodSource("exactMatchPlaceholders")
158+
void placeholdersWithExactMatchAreConsidered(String text, String expected) {
159+
Properties properties = new Properties();
160+
properties.setProperty("prefix://my-service", "example-service");
161+
properties.setProperty("px", "prefix");
162+
properties.setProperty("p1", "${prefix://my-service}");
163+
assertThat(this.helper.replacePlaceholders(text, properties)).isEqualTo(expected);
164+
}
165+
166+
static Stream<Arguments> exactMatchPlaceholders() {
167+
return Stream.of(
168+
Arguments.of("${prefix://my-service}", "example-service"),
169+
Arguments.of("${p1}", "example-service")
170+
);
171+
}
172+
156173
}
157174

158175
PlaceholderResolver mockPlaceholderResolver(String... pairs) {

0 commit comments

Comments
 (0)