Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace @CsvSource with @ValueSource where feasible

Browse Source 
@ValueSource is more appropriate for single parameter.

See gh-36062
This commit is contained in:
Yanming Zhou
2023-06-25 11:01:53 +08:00
committed by Stephane Nicoll
parent beb4010d07
commit acb7acd5d9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtensionForkParameterizedTests.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;
import static org.assertj.core.api.Assertions.assertThat;
@@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link ForkedClassPath @ForkedClassPath}.
*
* @author Andy Wilkinson
* @author Yanming Zhou
*/
@ForkedClassPath
class ModifiedClassPathExtensionForkParameterizedTests {
@@ -35,7 +36,7 @@ class ModifiedClassPathExtensionForkParameterizedTests {
private static final List<String> arguments = new ArrayList<>();
@ParameterizedTest
@CsvSource({ "one", "two", "three" })
@ValueSource(strings = { "one", "two", "three" })
void testIsInvokedOnceForEachArgument(String argument) {
if (argument.equals("one")) {
assertThat(arguments).isEmpty();

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentTests.java
View File

@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.DefaultBootstrapContext;
@@ -54,6 +54,7 @@ import static org.mockito.Mockito.mock;
*
* @author Phillip Webb
* @author Madhura Bhave
* @author Yanming Zhou
*/
class ConfigDataEnvironmentTests {
@@ -229,7 +230,7 @@ class ConfigDataEnvironmentTests {
}
@ParameterizedTest
@CsvSource({ "include", "include[0]" })
@ValueSource(strings = { "include", "include[0]" })
void processAndApplyWhenHasProfileIncludeInProfileSpecificDocumentThrowsException(String property, TestInfo info) {
this.environment.setProperty("spring.config.location", getConfigLocation(info));
ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
@@ -253,7 +254,7 @@ class ConfigDataEnvironmentTests {
}
@ParameterizedTest
@CsvSource({ "spring.profiles.include", "spring.profiles.include[0]" })
@ValueSource(strings = { "spring.profiles.include", "spring.profiles.include[0]" })
void processAndApplyIncludesProfilesFromSpringProfilesInclude(String property, TestInfo info) {
this.environment.setProperty("spring.config.location", getConfigLocation(info));
ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,