From e65366012ddb944e6df88091563a7a7fccae8d8c Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 12 Oct 2011 21:34:02 +0000
Subject: [PATCH] [SPR-8401] Added documentation for @ActiveProfiles in the
 "Annotations" section.

---
 spring-framework-reference/src/testing.xml | 42 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml
index c7c92f4fc7f..a08944853f4 100644
--- a/spring-framework-reference/src/testing.xml
+++ b/spring-framework-reference/src/testing.xml
@@ -460,7 +460,8 @@ public class ConfigClassApplicationContextTests {
             <note>
               <para><interfacename>@ContextConfiguration</interfacename>
               provides support for <emphasis>inheriting</emphasis> resource
-              locations or configuration classes by default.</para>
+              locations or configuration classes declared by superclasses by
+              default.</para>
             </note>
 
             <para>See <link linkend="testcontext-ctx-management">Context
@@ -468,6 +469,41 @@ public class ConfigClassApplicationContextTests {
             details.</para>
           </listitem>
 
+          <listitem>
+            <para><emphasis
+            role="bold"><interfacename>@ActiveProfiles</interfacename></emphasis></para>
+
+            <para>A class-level annotation that is used to declare which
+            <emphasis>bean definition profiles</emphasis> should be active
+            when loading an <interfacename>ApplicationContext</interfacename>
+            for test classes.</para>
+
+            <programlisting language="java">@ContextConfiguration
+<emphasis role="bold">@ActiveProfiles</emphasis>("dev")
+public class DeveloperTests {
+    <lineannotation>// class body...</lineannotation>
+}</programlisting>
+
+            <programlisting language="java">@ContextConfiguration
+<emphasis role="bold">@ActiveProfiles</emphasis>({"dev", "integration"})
+public class DeveloperIntegrationTests {
+    <lineannotation>// class body...</lineannotation>
+}</programlisting>
+
+            <note>
+              <para><interfacename>@ActiveProfiles</interfacename> provides
+              support for <emphasis>inheriting</emphasis> active bean
+              definition profiles declared by superclasses classes by
+              default.</para>
+            </note>
+
+            <para>See <link
+            linkend="testcontext-ctx-management-env-profiles">Context
+            configuration with environment profiles</link> and the Javadoc for
+            <interfacename>@ActiveProfiles</interfacename> for examples and
+            further details.</para>
+          </listitem>
+
           <listitem>
             <para><emphasis
             role="bold"><interfacename>@DirtiesContext</interfacename></emphasis></para>
@@ -1052,7 +1088,7 @@ public void testProcessRepeatedly() {
           </listitem>
         </itemizedlist>
 
-        <para>The following three sections explain how to configure the
+        <para>The following sections explain how to configure the
         <classname>TestContext</classname> framework through annotations and
         provide working examples of how to write unit and integration tests
         with the framework.</para>
@@ -1563,6 +1599,8 @@ public class TransferServiceTest {
           we specify all three configuration classes via the
           <interfacename>@ContextConfiguration </interfacename>annotation. The
           body of the test class itself remains completely unchanged.</para>
+
+          <!-- TODO Consider documenting inheritance for active profiles. -->
         </section>
 
         <section id="testcontext-ctx-management-caching">