From abbd4ebcf6384cedae06019376a0896b6e572131 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Sat, 21 Jun 2025 19:11:53 +0700 Subject: [PATCH 1/2] =?UTF-8?q?Link=20to=20@=E2=81=A0ContextConfiguration?= =?UTF-8?q?=20Javadoc=20from=20reference=20manual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-35088 Signed-off-by: Tran Ngoc Nhan --- .../integration-spring/annotation-contextconfiguration.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc index 30b7e0e2ced..38bfa065729 100644 --- a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc +++ b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc @@ -137,6 +137,6 @@ configuration classes as well as context initializers that are declared by super or enclosing classes. See xref:testing/testcontext-framework/ctx-management.adoc[Context Management], -xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration], and the `@ContextConfiguration` +xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration], and the {spring-framework-api}/test/context/ContextConfiguration.html[`@ContextConfiguration`] javadocs for further details. From 2477544a8f3b56cd121924ff912364918f54e9f8 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:22:47 +0200 Subject: [PATCH 2/2] Polishing --- .../annotation-contextconfiguration.adoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc index 38bfa065729..f00b4db40d8 100644 --- a/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc +++ b/framework-docs/modules/ROOT/pages/testing/annotations/integration-spring/annotation-contextconfiguration.adoc @@ -10,7 +10,8 @@ Resource locations are typically XML configuration files or Groovy scripts locat classpath, while component classes are typically `@Configuration` classes. However, resource locations can also refer to files and scripts in the file system, and component classes can be `@Component` classes, `@Service` classes, and so on. See -xref:testing/testcontext-framework/ctx-management/javaconfig.adoc#testcontext-ctx-management-javaconfig-component-classes[Component Classes] for further details. +xref:testing/testcontext-framework/ctx-management/javaconfig.adoc#testcontext-ctx-management-javaconfig-component-classes[Component Classes] +for further details. The following example shows a `@ContextConfiguration` annotation that refers to an XML file: @@ -137,6 +138,6 @@ configuration classes as well as context initializers that are declared by super or enclosing classes. See xref:testing/testcontext-framework/ctx-management.adoc[Context Management], -xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration], and the {spring-framework-api}/test/context/ContextConfiguration.html[`@ContextConfiguration`] +xref:testing/testcontext-framework/support-classes.adoc#testcontext-junit-jupiter-nested-test-configuration[`@Nested` test class configuration], +and the {spring-framework-api}/test/context/ContextConfiguration.html[`@ContextConfiguration`] javadocs for further details. -