Merge pull request #36062 from quaff

* pr/36062:
  Polish "Replace @CsvSource with @ValueSource where feasible"
  Replace @CsvSource with @ValueSource where feasible

Closes gh-36062
pull/36620/head
Stephane Nicoll 1 year ago
commit 08054cf380

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -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;
@ -35,7 +35,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();

@ -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;
@ -229,7 +229,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 +253,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,

Loading…
Cancel
Save