moving unit tests from .testsuite -> .context.support
This commit is contained in:
parent
7432202b6a
commit
0a47beb647
|
@ -16,13 +16,17 @@
|
||||||
|
|
||||||
package org.springframework.context.support;
|
package org.springframework.context.support;
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Mark Fisher
|
* @author Mark Fisher
|
||||||
|
* @author Chris Beams
|
||||||
*/
|
*/
|
||||||
public class ApplicationContextLifecycleTests extends TestCase {
|
public class ApplicationContextLifecycleTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testBeansStart() {
|
public void testBeansStart() {
|
||||||
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
||||||
context.start();
|
context.start();
|
||||||
|
@ -37,6 +41,7 @@ public class ApplicationContextLifecycleTests extends TestCase {
|
||||||
assertTrue(error, bean4.isRunning());
|
assertTrue(error, bean4.isRunning());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testBeansStop() {
|
public void testBeansStop() {
|
||||||
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
||||||
context.start();
|
context.start();
|
||||||
|
@ -57,6 +62,7 @@ public class ApplicationContextLifecycleTests extends TestCase {
|
||||||
assertFalse(stopError, bean4.isRunning());
|
assertFalse(stopError, bean4.isRunning());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testStartOrder() {
|
public void testStartOrder() {
|
||||||
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
||||||
context.start();
|
context.start();
|
||||||
|
@ -75,6 +81,7 @@ public class ApplicationContextLifecycleTests extends TestCase {
|
||||||
assertTrue(orderError, bean4.getStartOrder() > bean2.getStartOrder());
|
assertTrue(orderError, bean4.getStartOrder() > bean2.getStartOrder());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testStopOrder() {
|
public void testStopOrder() {
|
||||||
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
AbstractApplicationContext context = new ClassPathXmlApplicationContext("lifecycleTests.xml", getClass());
|
||||||
context.start();
|
context.start();
|
|
@ -20,8 +20,9 @@ import org.springframework.beans.factory.BeanFactory;
|
||||||
import org.springframework.beans.factory.access.BeanFactoryLocator;
|
import org.springframework.beans.factory.access.BeanFactoryLocator;
|
||||||
import org.springframework.beans.factory.access.BeanFactoryReference;
|
import org.springframework.beans.factory.access.BeanFactoryReference;
|
||||||
import org.springframework.beans.factory.access.SingletonBeanFactoryLocatorTests;
|
import org.springframework.beans.factory.access.SingletonBeanFactoryLocatorTests;
|
||||||
|
import org.springframework.beans.factory.xml.XmlBeanFactory;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
import org.springframework.core.io.ClassPathResource;
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -33,9 +34,8 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
|
||||||
public void testBaseBeanFactoryDefs() {
|
public void testBaseBeanFactoryDefs() {
|
||||||
// Just test the base BeanFactory/AppContext defs we are going to work
|
// Just test the base BeanFactory/AppContext defs we are going to work
|
||||||
// with in other tests.
|
// with in other tests.
|
||||||
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
|
new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans1.xml"));
|
||||||
new String[] {"/org/springframework/beans/factory/access/beans1.xml",
|
new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml"));
|
||||||
"/org/springframework/beans/factory/access/beans2.xml"});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testBasicFunctionality() {
|
public void testBasicFunctionality() {
|
||||||
|
|
Loading…
Reference in New Issue