From 297fd7629adb631760f28b3663fef4caddd4e5c1 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 1 Mar 2019 19:34:13 +0100 Subject: [PATCH] Polishing --- .../test/context/ContextConfiguration.java | 25 ++++++++----------- .../test/context/TestContext.java | 4 ++- .../test/context/TestContextManager.java | 14 +++++------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java index dff7db80f17..c07999edbae 100644 --- a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java +++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -34,8 +34,7 @@ import org.springframework.core.annotation.AliasFor; * *

Supported Resource Types

* - *

- * Prior to Spring 3.1, only path-based resource locations (typically XML configuration + *

Prior to Spring 3.1, only path-based resource locations (typically XML configuration * files) were supported. As of Spring 3.1, {@linkplain #loader context loaders} may * choose to support either path-based or class-based resources. As of * Spring 4.0.4, {@linkplain #loader context loaders} may choose to support path-based @@ -50,8 +49,7 @@ import org.springframework.core.annotation.AliasFor; * *

Annotated Classes

* - *

- * The term annotated class can refer to any of the following. + *

The term annotated class can refer to any of the following. * *

* - *

- * Consult the Javadoc for {@link org.springframework.context.annotation.Configuration @Configuration} + *

Consult the Javadoc for {@link org.springframework.context.annotation.Configuration @Configuration} * and {@link org.springframework.context.annotation.Bean @Bean} for further * information regarding the configuration and semantics of annotated classes. * - *

- * As of Spring Framework 4.0, this annotation may be used as a meta-annotation + *

As of Spring Framework 4.0, this annotation may be used as a meta-annotation * to create custom composed annotations. * * @author Sam Brannen * @since 2.5 - * @see ContextHierarchy - * @see ActiveProfiles - * @see TestPropertySource - * @see ContextLoader + * @see org.springframework.test.context.junit.jupiter.SpringJUnitConfig @SpringJUnitConfig + * @see org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig @SpringJUnitWebConfig + * @see ContextHierarchy @ContextHierarchy + * @see ActiveProfiles @ActiveProfiles + * @see TestPropertySource @TestPropertySource * @see SmartContextLoader * @see ContextConfigurationAttributes * @see MergedContextConfiguration - * @see org.springframework.context.ApplicationContext + * @see org.springframework.context.ApplicationContext ApplicationContext */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java index 52634cd8903..5b3e0f345f1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -38,6 +38,8 @@ import org.springframework.test.annotation.DirtiesContext.HierarchyMode; * * @author Sam Brannen * @since 2.5 + * @see TestContextManager + * @see TestExecutionListener */ public interface TestContext extends AttributeAccessor, Serializable { diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java index 297c8b2e884..b7adaa86256 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -35,9 +35,8 @@ import org.springframework.util.ReflectionUtils; * TestContext Framework. * *

Specifically, a {@code TestContextManager} is responsible for managing a - * single {@link TestContext} and signaling events to all registered - * {@link TestExecutionListener TestExecutionListeners} at the following test - * execution points: + * single {@link TestContext} and signaling events to each registered + * {@link TestExecutionListener} at the following test execution points. * *