Skip to content

Commit 3586bfb

Browse files
committed
Merge branch '2.7.x' into 3.0.x
Closes gh-36426
2 parents bbaac07 + 08054cf commit 3586bfb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
2020
import java.util.List;
2121

2222
import org.junit.jupiter.params.ParameterizedTest;
23-
import org.junit.jupiter.params.provider.CsvSource;
23+
import org.junit.jupiter.params.provider.ValueSource;
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
2626

@@ -35,7 +35,7 @@ class ModifiedClassPathExtensionForkParameterizedTests {
3535
private static final List<String> arguments = new ArrayList<>();
3636

3737
@ParameterizedTest
38-
@CsvSource({ "one", "two", "three" })
38+
@ValueSource(strings = { "one", "two", "three" })
3939
void testIsInvokedOnceForEachArgument(String argument) {
4040
if (argument.equals("one")) {
4141
assertThat(arguments).isEmpty();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.junit.jupiter.api.Test;
3232
import org.junit.jupiter.api.TestInfo;
3333
import org.junit.jupiter.params.ParameterizedTest;
34-
import org.junit.jupiter.params.provider.CsvSource;
34+
import org.junit.jupiter.params.provider.ValueSource;
3535

3636
import org.springframework.boot.ConfigurableBootstrapContext;
3737
import org.springframework.boot.DefaultBootstrapContext;
@@ -226,7 +226,7 @@ protected ConfigDataEnvironmentContributors createContributors(
226226
}
227227

228228
@ParameterizedTest
229-
@CsvSource({ "include", "include[0]" })
229+
@ValueSource(strings = { "include", "include[0]" })
230230
void processAndApplyWhenHasProfileIncludeInProfileSpecificDocumentThrowsException(String property, TestInfo info) {
231231
this.environment.setProperty("spring.config.location", getConfigLocation(info));
232232
ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,
@@ -250,7 +250,7 @@ protected ConfigDataEnvironmentContributors createContributors(
250250
}
251251

252252
@ParameterizedTest
253-
@CsvSource({ "spring.profiles.include", "spring.profiles.include[0]" })
253+
@ValueSource(strings = { "spring.profiles.include", "spring.profiles.include[0]" })
254254
void processAndApplyIncludesProfilesFromSpringProfilesInclude(String property, TestInfo info) {
255255
this.environment.setProperty("spring.config.location", getConfigLocation(info));
256256
ConfigDataEnvironment configDataEnvironment = new ConfigDataEnvironment(this.logFactory, this.bootstrapContext,

0 commit comments

Comments
 (0)