Merge branch '3.5.x' into 4.0.x

Closes gh-50012
This commit is contained in:
Andy Wilkinson
2026-04-10 09:56:33 +01:00
2 changed files with 118 additions and 18 deletions
@@ -0,0 +1,84 @@
/*
* Copyright 2012-present 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.test.context;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTestImportTests.ImportedByContainingTests;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.env.Environment;
import org.springframework.test.context.TestPropertySource;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link SpringBootTest @SpringBootTest} with {@link Import @Import}.
*
* @author Andy Wilkinson
*/
@TestPropertySource(properties = "a=alpha")
@Import(ImportedByContainingTests.class)
class SpringBootTestImportTests {
@Nested
@SpringBootTest(classes = Config.class)
@Import(ImportedByNestedTests.class)
class NestedTests {
@Autowired(required = false)
private ImportedByContainingTests importedByContainingTests;
@Autowired(required = false)
private ImportedByNestedTests importedByNestedTests;
@Autowired
private Environment environment;
@Test
void sameClassImportIsHonored() {
assertThat(this.importedByNestedTests).isNotNull();
}
@Test
void containingClassImportIsHonored() {
assertThat(this.importedByContainingTests).isNotNull();
}
@Test
void containingClassTestPropertySourceIsHonored() {
assertThat(this.environment.getProperty("a")).isEqualTo("alpha");
}
}
@Configuration(proxyBeanMethods = false)
static class Config {
}
static class ImportedByNestedTests {
}
static class ImportedByContainingTests {
}
}