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

[SPR-6184] Initial draft of the new AnnotationConfigContextLoader. 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4132 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Sam Brannen 2011-03-29 23:42:59 +00:00
parent 80e0a5b8a5
commit 8c4a19caf8
2 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConfigurationClassSpringJUnit4ClassRunnerAppCtxTests.java
View File

@ -1,33 +0,0 @@
/*
* 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 {
}

56
org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConfigurationClassSpringJUnit4ClassRunnerAppCtxTestsConfig.java
View File

@ -1,56 +0,0 @@
/*
* 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";
}
}