root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Restore use of MethodSource

This commit is contained in:
Stéphane Nicoll 2025-01-03 16:48:46 +01:00
parent 0da4ae96b4
commit f802c0cf24
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,11 +17,13 @@
package org.springframework.util; package org.springframework.util;
import java.util.Properties; import java.util.Properties;
import java.util.stream.Stream;
import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver; import org.springframework.util.PropertyPlaceholderHelper.PlaceholderResolver;
@ -125,14 +127,7 @@ class PropertyPlaceholderHelperTests {
private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", ":", null, true); private final PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}", ":", null, true);
@ParameterizedTest(name = "{0} -> {1}") @ParameterizedTest(name = "{0} -> {1}")
@CsvSource(delimiterString = "->", textBlock = """ @MethodSource("defaultValues")
${invalid:test} -> test
${invalid:${one}} -> 1
${invalid:${one}${two}} -> 12
${invalid:${one}:${two}} -> 1:2
${invalid:${also_invalid:test}} -> test
${invalid:${also_invalid:${one}}} -> 1
""")
void defaultValueIsApplied(String text, String value) { void defaultValueIsApplied(String text, String value) {
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty("one", "1"); properties.setProperty("one", "1");
@ -148,11 +143,19 @@ class PropertyPlaceholderHelperTests {
verify(resolver, never()).resolvePlaceholder("two"); verify(resolver, never()).resolvePlaceholder("two");
} }
static Stream<Arguments> defaultValues() {
return Stream.of(
Arguments.of("${invalid:test}", "test"),
Arguments.of("${invalid:${one}}", "1"),
Arguments.of("${invalid:${one}${two}}", "12"),
Arguments.of("${invalid:${one}:${two}}", "1:2"),
Arguments.of("${invalid:${also_invalid:test}}", "test"),
Arguments.of("${invalid:${also_invalid:${one}}}", "1")
);
}
@ParameterizedTest(name = "{0} -> {1}") @ParameterizedTest(name = "{0} -> {1}")
@CsvSource(delimiterString = "->", textBlock = """ @MethodSource("exactMatchPlaceholders")
${prefix://my-service} -> example-service
${p1} -> example-service
""")
void placeholdersWithExactMatchAreConsidered(String text, String expected) { void placeholdersWithExactMatchAreConsidered(String text, String expected) {
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty("prefix://my-service", "example-service"); properties.setProperty("prefix://my-service", "example-service");
@ -160,6 +163,13 @@ class PropertyPlaceholderHelperTests {
properties.setProperty("p1", "${prefix://my-service}"); properties.setProperty("p1", "${prefix://my-service}");
assertThat(this.helper.replacePlaceholders(text, properties)).isEqualTo(expected); assertThat(this.helper.replacePlaceholders(text, properties)).isEqualTo(expected);
} }
static Stream<Arguments> exactMatchPlaceholders() {
return Stream.of(
Arguments.of("${prefix://my-service}", "example-service"),
Arguments.of("${p1}", "example-service")
);
}
} }