Move tests to spring-test module
When Spr9799XmlConfigTests and Spr9799AnnotationConfigTests were created, there were issues with the classpath related to slf4j dependencies that made it impossible for these classes to reside in the spring-test module. Consequently, these tests were added to the spring-test-mvc module. However, the issues with slf4j have since been resolved in the Gradle build, and this commit therefore moves these test classes to the spring-test module where they belong. Issue: SPR-9799
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright 2002-2012 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.spr9799;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.context.web.WebAppConfiguration;
|
||||
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
||||
|
||||
/**
|
||||
* Integration tests used to assess claims raised in
|
||||
* <a href="https://jira.springsource.org/browse/SPR-9799" target="_blank">SPR-9799</a>.
|
||||
*
|
||||
* @author Sam Brannen
|
||||
* @since 3.2
|
||||
* @see Spr9799XmlConfigTests
|
||||
*/
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration
|
||||
// NOTE: if we omit the @WebAppConfiguration declaration, the ApplicationContext will fail
|
||||
// to load since @EnableWebMvc requires that the context be a WebApplicationContext.
|
||||
@WebAppConfiguration
|
||||
public class Spr9799AnnotationConfigTests {
|
||||
|
||||
@Configuration
|
||||
@EnableWebMvc
|
||||
static class Config {
|
||||
/* intentionally no beans defined */
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void applicationContextLoads() {
|
||||
// no-op
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright 2002-2012 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.spr9799;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
|
||||
/**
|
||||
* Integration tests used to assess claims raised in
|
||||
* <a href="https://jira.springsource.org/browse/SPR-9799" target="_blank">SPR-9799</a>.
|
||||
*
|
||||
* @author Sam Brannen
|
||||
* @since 3.2
|
||||
* @see Spr9799AnnotationConfigTests
|
||||
*/
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration
|
||||
public class Spr9799XmlConfigTests {
|
||||
|
||||
@Test
|
||||
public void applicationContextLoads() {
|
||||
// nothing to assert: we just want to make sure that the context loads without
|
||||
// errors.
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user