Cross reference @⁠NestedTestConfiguration for Bean Overrides

spring-projects · Jan 15, 2025 · 8b6523a · 8b6523a
1 parent e7f3493
commit 8b6523a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/spring-test/src/main/java/org/springframework/test/context/NestedTestConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/NestedTestConfiguration.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -82,6 +82,9 @@
  * <li>{@link ActiveProfiles @ActiveProfiles}</li>
  * <li>{@link TestPropertySource @TestPropertySource}</li>
  * <li>{@link DynamicPropertySource @DynamicPropertySource}</li>
+ * <li>{@link org.springframework.test.context.bean.override.convention.TestBean @TestBean}</li>
+ * <li>{@link org.springframework.test.context.bean.override.mockito.MockitoBean @MockitoBean}</li>
+ * <li>{@link org.springframework.test.context.bean.override.mockito.MockitoSpyBean @MockitoSpyBean}</li>
  * <li>{@link org.springframework.test.annotation.DirtiesContext @DirtiesContext}</li>
  * <li>{@link org.springframework.transaction.annotation.Transactional @Transactional}</li>
  * <li>{@link org.springframework.test.annotation.Rollback @Rollback}</li>

diff --git a/...est/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java b/...est/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -110,6 +110,10 @@
  * {@code protected}, package-private (default visibility), or {@code private}
  * depending on the needs or coding practices of the project.
  *
+ * <p>{@code @TestBean} fields will be inherited from an enclosing test class by default. See
+ * {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
+ * for details.
+ *
  * @author Simon Baslé
  * @author Stephane Nicoll
  * @author Sam Brannen

diff --git a/...est/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java b/...est/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java
@@ -63,6 +63,10 @@
  * (default visibility), or {@code private} depending on the needs or coding
  * practices of the project.
  *
+ * <p>{@code @MockitoBean} fields will be inherited from an enclosing test class by default.
+ * See {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
+ * for details.
+ *
  * @author Simon Baslé
  * @author Sam Brannen
  * @since 6.2

diff --git a/.../src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java b/.../src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java
@@ -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");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,10 @@
  * (default visibility), or {@code private} depending on the needs or coding
  * practices of the project.
  *
+ * <p>{@code @MockitoSpyBean} fields will be inherited from an enclosing test class by default.
+ * See {@link org.springframework.test.context.NestedTestConfiguration @NestedTestConfiguration}
+ * for details.
+ *
  * @author Simon Baslé
  * @author Sam Brannen
  * @since 6.2