@@ -196,19 +196,21 @@ static Stream<Arguments> placeholders() {
196
196
197
197
@ ParameterizedTest (name = "{0} -> {1}" )
198
198
@ MethodSource ("nestedPlaceholders" )
199
- void nestedPlaceholdersAreReplaced (String text , String expected ) {
199
+ void testPlaceholderResolution (String input , String expected ) {
200
200
Properties properties = new Properties ();
201
201
properties .setProperty ("p1" , "v1" );
202
202
properties .setProperty ("p2" , "v2" );
203
203
properties .setProperty ("p3" , "${p1}:${p2}" ); // nested placeholders
204
204
properties .setProperty ("p4" , "${p3}" ); // deeply nested placeholders
205
205
properties .setProperty ("p5" , "${p1}:${p2}:${bogus}" ); // unresolvable placeholder
206
206
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
+ }
209
211
210
- static Stream <Arguments > nestedPlaceholders () {
211
- return Stream .of (
212
+ static Stream <Arguments > placeholderTestCases () {
213
+ return Stream .of (
212
214
Arguments .of ("${p6}" , "v1:v2:def" ),
213
215
Arguments .of ("${invalid:${p1}:${p2}}" , "v1:v2" ),
214
216
Arguments .of ("${invalid:${p3}}" , "v1:v2" ),
0 commit comments