[SPR-6184] Work in Progress

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4129 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.test/src/main/java/org/springframework/test/context/ContextConfiguration.java

@@ -48,19 +48,28 @@ public @interface ContextConfiguration {
 	/**
 	 * The resource locations to use for loading an
 	 * {@link org.springframework.context.ApplicationContext ApplicationContext}.
-	 * <p>Check out {@link org.springframework.test.context.support.AbstractContextLoader#modifyLocations)}'s
-	 * javadoc for details on how a location String will be interpreted at runtime,
+	 * <p>Check out the javadoc for {@link org.springframework.test.context.support.AbstractContextLoader#modifyLocations AbstractContextLoader.modifyLocations()}
+	 * for details on how a location String will be interpreted at runtime,
 	 * in particular in case of a relative path. Also, check out the documentation on
-	 * {@link org.springframework.test.context.support.AbstractContextLoader#generateDefaultLocations}
+	 * {@link org.springframework.test.context.support.AbstractContextLoader#generateDefaultLocations AbstractContextLoader.generateDefaultLocations()}
 	 * for details on the default locations that are going to be used if none are specified.
 	 * <p>Note that the above-mentioned default rules only apply for a standard
-	 * {@link org.springframework.test.context.support.AbstractContextLoader} subclass
-	 * such as {@link org.springframework.test.context.support.GenericXmlContextLoader}
+	 * {@link org.springframework.test.context.support.AbstractContextLoader AbstractContextLoader} subclass
+	 * such as {@link org.springframework.test.context.support.GenericXmlContextLoader GenericXmlContextLoader}
 	 * which is the effective default implementation used at runtime.
 	 */
 	String[] locations() default {};
 
 	/**
+	 * TODO Document classes().
+	 * 
+	 * @since 3.1
+	 */
+	Class<?>[] classes() default {};
+
+	/**
+	 * TODO Update documentation regarding classes vs. locations.
+	 * 
 	 * Whether or not {@link #locations() resource locations} from superclasses
 	 * should be <em>inherited</em>.
 	 * <p>The default value is <code>true</code>, which means that an annotated
@@ -100,8 +109,8 @@ public @interface ContextConfiguration {
      * an explicit loader. If no class in the hierarchy specifies an explicit
      * loader, a default loader will be used instead.
 	 * <p>The default concrete implementation chosen at runtime will be
-	 * {@link org.springframework.test.context.support.GenericXmlContextLoader}.
-	 * Also check out {@link org.springframework.test.context.support.AbstractContextLoader}'s
+	 * {@link org.springframework.test.context.support.GenericXmlContextLoader GenericXmlContextLoader}.
+	 * Also check out {@link org.springframework.test.context.support.AbstractContextLoader AbstractContextLoader}'s
 	 * javadoc for details on the default behavior there.
 	 */
 	Class<? extends ContextLoader> loader() default ContextLoader.class;

org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConfigurationClassSpringJUnit4ClassRunnerAppCtxTests.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.junit4;
+
+import org.junit.Ignore;
+import org.springframework.test.context.ContextConfiguration;
+
+/**
+ * TODO [SPR-6184] Document ConfigurationClassSpringJUnit4ClassRunnerAppCtxTests.
+ * 
+ * @author Sam Brannen
+ * @since 3.1
+ */
+@Ignore("[SPR-6184] Work in Progress")
+// TODO [SPR-6184] Set ContextLoader: ConfigurationClassContextLoader.class.
+@ContextConfiguration(classes = ConfigurationClassSpringJUnit4ClassRunnerAppCtxTestsConfig.class, inheritLocations = false)
+public class ConfigurationClassSpringJUnit4ClassRunnerAppCtxTests extends SpringJUnit4ClassRunnerAppCtxTests {
+
+}

org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConfigurationClassSpringJUnit4ClassRunnerAppCtxTestsConfig.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2011 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.junit4;
+
+import org.springframework.beans.Employee;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * TODO [SPR-6184] Document configuration class.
+ * 
+ * @author Sam Brannen
+ * @since 3.1
+ */
+@Configuration
+public class ConfigurationClassSpringJUnit4ClassRunnerAppCtxTestsConfig {
+
+	@Bean
+	public Employee employee() {
+		Employee employee = new Employee();
+		employee.setName("John Smith");
+		employee.setAge(42);
+		employee.setCompany("Acme Widgets, Inc.");
+		return employee;
+	}
+
+	@Bean
+	public String foo() {
+		return "Foo";
+	}
+
+	@Bean
+	public String bar() {
+		return "Bar";
+	}
+
+	@Bean
+	public String quux() {
+		return "Quux";
+	}
+
+}