root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[SPR-8387] Introduced supports(MergedContextConfiguration) method in the SmartContextLoader SPI; updated existing loaders accordingly; and fleshed out implementation of and tests for the new DelegatingSmartContextLoader.

This commit is contained in:
Sam Brannen 2011-06-26 16:46:18 +00:00
parent 19fc2004f5
commit 4cbe2ae00a
19 changed files with 433 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.test/src/main/java/org/springframework/test/context/SmartContextLoader.java
View File

@ -95,6 +95,14 @@ public interface SmartContextLoader extends ContextLoader {
*/
void processContextConfiguration(ContextConfigurationAttributes configAttributes);
/**
* TODO Document supports(MergedContextConfiguration).
*
* @param mergedConfig
* @return
*/
boolean supports(MergedContextConfiguration mergedConfig);
/**
* Loads a new {@link ApplicationContext context} based on the supplied
* {@link MergedContextConfiguration merged context configuration},

8
org.springframework.test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
View File

@ -23,6 +23,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.support.ResourcePatternUtils;
import org.springframework.test.context.ContextConfigurationAttributes;
import org.springframework.test.context.ContextLoader;
import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.SmartContextLoader;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@ -90,6 +91,13 @@ public abstract class AbstractContextLoader implements SmartContextLoader {
configAttributes.setLocations(processedLocations);
}
/**
* TODO Document default supports(MergedContextConfiguration) implementation.
*/
public boolean supports(MergedContextConfiguration mergedConfig) {
return !ObjectUtils.isEmpty(mergedConfig.getLocations());
}
// --- ContextLoader -------------------------------------------------------
/**

8
org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
View File

@ -81,6 +81,14 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
}
}
/**
* TODO Document overridden supports(MergedContextConfiguration) implementation.
*/
@Override
public boolean supports(MergedContextConfiguration mergedConfig) {
return ObjectUtils.isEmpty(mergedConfig.getLocations()) && !ObjectUtils.isEmpty(mergedConfig.getClasses());
}
// --- AnnotationConfigContextLoader ---------------------------------------
private boolean isStaticNonPrivateAndNonFinal(Class<?> clazz) {

48
org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
View File

@ -26,6 +26,7 @@ import org.springframework.test.context.ContextConfigurationAttributes;
import org.springframework.test.context.ContextLoader;
import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.test.context.SmartContextLoader;
import org.springframework.util.ObjectUtils;
/**
* TODO Document DelegatingSmartContextLoader.
@ -62,6 +63,11 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
* TODO Document processContextConfiguration() implementation.
*/
public void processContextConfiguration(ContextConfigurationAttributes configAttributes) {
final String[] originalLocations = configAttributes.getLocations();
final Class<?>[] originalClasses = configAttributes.getClasses();
final boolean emptyResources = ObjectUtils.isEmpty(originalLocations) && ObjectUtils.isEmpty(originalClasses);
for (SmartContextLoader loader : candidates) {
if (logger.isDebugEnabled()) {
logger.debug(String.format("Delegating to loader [%s] to process context configuration [%s].",
@ -73,7 +79,9 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
// If the original locations and classes are not empty, there's no
// need to bother with default generation checks; just let each
// loader process the configuration.
//
if (!emptyResources) {
loader.processContextConfiguration(configAttributes);
}
// Otherwise, if a loader claims to generate defaults, let it
// process the configuration, and then verify that it actually did
// generate defaults.
@ -83,9 +91,26 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
// 1) stop iterating
// 2) mark the current loader as the winning candidate (?)
// 3) log an info message.
loader.processContextConfiguration(configAttributes);
else {
if (loader.generatesDefaults()) {
loader.processContextConfiguration(configAttributes);
}
}
}
// If any loader claims to generate defaults but none actually did,
// throw an exception.
}
/**
* TODO Document supports(MergedContextConfiguration) implementation.
*/
public boolean supports(MergedContextConfiguration mergedConfig) {
for (SmartContextLoader loader : candidates) {
if (loader.supports(mergedConfig)) {
return true;
}
}
return false;
}
/**
@ -99,21 +124,16 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
loader.getClass().getName(), mergedConfig));
}
// TODO Implement loadContext(MergedContextConfiguration).
//
// Ask each loader if it _can_ load a context from the mergedConfig.
// Ask each loader if it can load a context from the mergedConfig.
// If a loader can, let it; otherwise, continue iterating over all
// remaining candidates.
//
// If no candidate can load a context from the mergedConfig, throw
// an exception.
if (loader.supports(mergedConfig)) {
return loader.loadContext(mergedConfig);
}
}
// TODO Implement delegation logic.
//
// Proof of concept: ensuring that hard-coded delegation to
// GenericXmlContextLoader works "as is".
return candidates.get(0).loadContext(mergedConfig);
throw new IllegalStateException(String.format("None of the candidate SmartContextLoaders [%s] "
+ "was able to load an ApplicationContext from [%s].", candidates, mergedConfig));
}
// --- ContextLoader -------------------------------------------------------

18
org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
View File

@ -26,6 +26,13 @@ import org.springframework.test.context.junit4.annotation.BeanOverridingDefaultC
import org.springframework.test.context.junit4.annotation.BeanOverridingExplicitConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.DefaultConfigClassesBaseTests;
import org.springframework.test.context.junit4.annotation.DefaultConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderDefaultConfigClassesBaseTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderDefaultConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderExplicitConfigClassesBaseTests;
import org.springframework.test.context.junit4.annotation.DefaultLoaderExplicitConfigClassesInheritedTests;
import org.springframework.test.context.junit4.annotation.ExplicitConfigClassesBaseTests;
import org.springframework.test.context.junit4.annotation.ExplicitConfigClassesInheritedTests;
import org.springframework.test.context.junit4.orm.HibernateSessionFlushingTests;
import org.springframework.test.context.junit4.profile.annotation.DefaultProfileAnnotationConfigTests;
@ -58,12 +65,19 @@ StandardJUnit4FeaturesTests.class,//
DefaultConfigClassesBaseTests.class,//
DefaultConfigClassesInheritedTests.class,//
BeanOverridingDefaultConfigClassesInheritedTests.class,//
ExplicitConfigClassesBaseTests.class,//
ExplicitConfigClassesInheritedTests.class,//
BeanOverridingExplicitConfigClassesInheritedTests.class,//
DefaultLoaderDefaultConfigClassesBaseTests.class,//
DefaultLoaderDefaultConfigClassesInheritedTests.class,//
DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.class,//
DefaultLoaderExplicitConfigClassesBaseTests.class,//
DefaultLoaderExplicitConfigClassesInheritedTests.class,//
DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.class,//
DefaultProfileAnnotationConfigTests.class,//
DevProfileAnnotationConfigTests.class, //
DevProfileAnnotationConfigTests.class,//
DefaultProfileXmlConfigTests.class,//
DevProfileXmlConfigTests.class, //
DevProfileXmlConfigTests.class,//
ExpectedExceptionSpringRunnerTests.class,//
TimedSpringRunnerTests.class,//
RepeatedSpringRunnerTests.class,//

3
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
View File

@ -18,7 +18,6 @@ package org.springframework.test.context.junit4.annotation;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunnerAppCtxTests;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
/**
* Integration tests that verify support for configuration classes in
@ -34,7 +33,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* @author Sam Brannen
* @since 3.1
*/
@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = PojoAndStringConfig.class, inheritLocations = false)
@ContextConfiguration(classes = PojoAndStringConfig.class, inheritLocations = false)
public class AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests extends SpringJUnit4ClassRunnerAppCtxTests {
/* all tests are in the parent class. */
}

9
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigTestSuite.java
View File

@ -34,8 +34,15 @@ AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.class,//
DefaultConfigClassesBaseTests.class,//
DefaultConfigClassesInheritedTests.class,//
BeanOverridingDefaultConfigClassesInheritedTests.class,//
ExplicitConfigClassesBaseTests.class,//
ExplicitConfigClassesInheritedTests.class,//
BeanOverridingExplicitConfigClassesInheritedTests.class,//
ExplicitConfigClassesInheritedTests.class //
DefaultLoaderDefaultConfigClassesBaseTests.class,//
DefaultLoaderDefaultConfigClassesInheritedTests.class,//
DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.class,//
DefaultLoaderExplicitConfigClassesBaseTests.class,//
DefaultLoaderExplicitConfigClassesInheritedTests.class,//
DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.class //
})
public class AnnotationConfigTestSuite {
}

4
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
View File

@ -29,8 +29,8 @@ import org.springframework.test.context.ContextConfiguration;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}
* and {@link BeanOverridingDefaultConfigClassesInheritedTestsConfig}.
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
* and {@link BeanOverridingDefaultConfigClassesInheritedTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1

4
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java
View File

@ -26,8 +26,8 @@ import org.springframework.test.context.ContextConfiguration;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}
* and {@link BeanOverridingDefaultConfigClassesInheritedTestsConfig}.
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
* and {@link BeanOverridingDefaultConfigClassesInheritedTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1

2
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
View File

@ -33,7 +33,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}.
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1

4
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
View File

@ -30,8 +30,8 @@ import org.springframework.test.context.ContextConfiguration;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}
* and {@link DefaultConfigClassesInheritedTestsConfig}.
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}
* and {@link DefaultConfigClassesInheritedTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1

62
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java Normal file
View File

@ -0,0 +1,62 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.springframework.beans.Employee;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@ContextConfiguration
public class DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests extends
DefaultLoaderDefaultConfigClassesBaseTests {
@Configuration
static class Config {
@Bean
public Employee employee() {
Employee employee = new Employee();
employee.setName("Yoda");
employee.setAge(900);
employee.setCompany("The Force");
return employee;
}
}
@Test
@Override
public void verifyEmployeeSetFromBaseContextConfig() {
assertNotNull("The employee should have been autowired.", this.employee);
assertEquals("The employee bean should have been overridden.", "Yoda", this.employee.getName());
}
}

45
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@ContextConfiguration(classes = DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.Config.class)
public class DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests extends
DefaultLoaderExplicitConfigClassesBaseTests {
@Test
@Override
public void verifyEmployeeSetFromBaseContextConfig() {
assertNotNull("The employee should have been autowired.", this.employee);
assertEquals("The employee bean should have been overridden.", "Yoda", this.employee.getName());
}
}

68
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.Employee;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class DefaultLoaderDefaultConfigClassesBaseTests {
@Configuration
static class Config {
@Bean
public Employee employee() {
Employee employee = new Employee();
employee.setName("John Smith");
employee.setAge(42);
employee.setCompany("Acme Widgets, Inc.");
return employee;
}
}
@Autowired
protected Employee employee;
@Test
public void verifyEmployeeSetFromBaseContextConfig() {
assertNotNull("The employee field should have been autowired.", this.employee);
assertEquals("John Smith", this.employee.getName());
}
}

61
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java Normal file
View File

@ -0,0 +1,61 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.springframework.beans.Pet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@ContextConfiguration
public class DefaultLoaderDefaultConfigClassesInheritedTests extends DefaultLoaderDefaultConfigClassesBaseTests {
@Configuration
static class Config {
@Bean
public Pet pet() {
return new Pet("Fido");
}
}
@Autowired
private Pet pet;
@Test
public void verifyPetSetFromExtendedContextConfig() {
assertNotNull("The pet should have been autowired.", this.pet);
assertEquals("Fido", this.pet.getName());
}
}

52
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.Employee;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = DefaultLoaderDefaultConfigClassesBaseTests.Config.class)
public class DefaultLoaderExplicitConfigClassesBaseTests {
@Autowired
protected Employee employee;
@Test
public void verifyEmployeeSetFromBaseContextConfig() {
assertNotNull("The employee should have been autowired.", this.employee);
assertEquals("John Smith", this.employee.getName());
}
}

52
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright 2002-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.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.Pet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
/**
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework in conjunction with the
* {@link DelegatingSmartContextLoader}.
*
* @author Sam Brannen
* @since 3.1
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = DefaultLoaderDefaultConfigClassesInheritedTests.Config.class)
public class DefaultLoaderExplicitConfigClassesInheritedTests extends DefaultLoaderExplicitConfigClassesBaseTests {
@Autowired
private Pet pet;
@Test
public void verifyPetSetFromExtendedContextConfig() {
assertNotNull("The pet should have been autowired.", this.pet);
assertEquals("Fido", this.pet.getName());
}
}

2
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
View File

@ -31,7 +31,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}.
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1

4
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
View File

@ -31,8 +31,8 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* Integration tests that verify support for configuration classes in
* the Spring TestContext Framework.
*
* <p>Configuration will be loaded from {@link DefaultConfigClassesBaseTestsConfig}
* and {@link DefaultConfigClassesInheritedTestsConfig}
* <p>Configuration will be loaded from {@link DefaultConfigClassesInheritedTests.ContextConfiguration}
* and {@link DefaultConfigClassesBaseTests.ContextConfiguration}.
*
* @author Sam Brannen
* @since 3.1