From 1bbc55d63c45d17fff0c939ecaf54ed7b73090bb Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 10 Apr 2014 01:09:51 +0200 Subject: [PATCH] Polish Javadoc for TestContextBootstrapper --- .../test/context/TestContextBootstrapper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java index 5e22e497e2..72c1be0aca 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java @@ -86,6 +86,7 @@ public interface TestContextBootstrapper { *
  • Active bean definition profiles declared via {@link ActiveProfiles @ActiveProfiles}
  • *
  • {@linkplain org.springframework.context.ApplicationContextInitializer * Context initializers} declared via {@link ContextConfiguration#initializers}
  • + * *

    Consult the Javadoc for the aforementioned annotations for details on * the required semantics. *

    When determining which {@link ContextLoader} to use for a given test @@ -93,11 +94,9 @@ public interface TestContextBootstrapper { *

      *
    1. If a {@code ContextLoader} class has been explicitly declared via * {@link ContextConfiguration#loader}, use it.
    2. - *
    3. Otherwise, if the name of a {@linkplain BootstrapContext#getCustomDefaultContextLoaderClassName - * custom default ContextLoader class} has been provided in the {@link BootstrapContext}, - * use it.
    4. *
    5. Otherwise, concrete implementations are free to determine which * {@code ContextLoader} class to use as as default.
    6. + *
    * @return the merged context configuration, never {@code null} */ MergedContextConfiguration buildMergedContextConfiguration();