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

polishing

This commit is contained in:
Juergen Hoeller 2009-03-31 20:43:28 +00:00
parent 0f35fe9d3c
commit 4ebd08515c
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.springframework.web.servlet/src/test/java/org/springframework/web/context/ContextLoaderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,16 +16,15 @@
package org.springframework.web.context; package org.springframework.web.context;
import static org.junit.Assert.*;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import javax.servlet.ServletContext; import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener; import javax.servlet.ServletContextListener;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.TestBean; import org.springframework.beans.TestBean;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
@ -42,15 +41,14 @@ import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.SimpleWebApplicationContext; import org.springframework.web.servlet.SimpleWebApplicationContext;
/** /**
* Tests for {@link ContextLoader}, {@link ContextLoaderListener}, * Tests for {@link ContextLoader} and {@link ContextLoaderListener}.
* {@link ContextLoaderServlet}, and related classes.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen * @author Sam Brannen
* @author Chris Beams * @author Chris Beams
* @since 12.08.2003 * @since 12.08.2003
*/ */
public class ContextLoaderTests { public final class ContextLoaderTests {
@Test @Test
public void testContextLoaderListenerWithDefaultContext() { public void testContextLoaderListenerWithDefaultContext() {
@ -62,8 +60,7 @@ public class ContextLoaderTests {
ServletContextEvent event = new ServletContextEvent(sc); ServletContextEvent event = new ServletContextEvent(sc);
listener.contextInitialized(event); listener.contextInitialized(event);
WebApplicationContext context = (WebApplicationContext) sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); WebApplicationContext context = (WebApplicationContext) sc.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE);
assertTrue("Correct WebApplicationContext exposed in ServletContext", assertTrue("Correct WebApplicationContext exposed in ServletContext", context instanceof XmlWebApplicationContext);
context instanceof XmlWebApplicationContext);
LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle"); LifecycleBean lb = (LifecycleBean) context.getBean("lifecycle");
assertTrue("Has father", context.containsBean("father")); assertTrue("Has father", context.containsBean("father"));
assertTrue("Has rod", context.containsBean("rod")); assertTrue("Has rod", context.containsBean("rod"));
@ -89,8 +86,6 @@ public class ContextLoaderTests {
sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
"/org/springframework/web/context/WEB-INF/applicationContext.xml"); "/org/springframework/web/context/WEB-INF/applicationContext.xml");
final ServletContextListener listener = new ContextLoaderListener() { final ServletContextListener listener = new ContextLoaderListener() {
protected ContextLoader createContextLoader() {
return new ContextLoader() {
protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) { protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) {
assertNotNull("The ServletContext should not be null.", servletContext); assertNotNull("The ServletContext should not be null.", servletContext);
assertEquals("Verifying that we received the expected ServletContext.", sc, servletContext); assertEquals("Verifying that we received the expected ServletContext.", sc, servletContext);
@ -98,8 +93,6 @@ public class ContextLoaderTests {
buffer.append(expectedContents); buffer.append(expectedContents);
} }
}; };
}
};
listener.contextInitialized(new ServletContextEvent(sc)); listener.contextInitialized(new ServletContextEvent(sc));
assertEquals("customizeContext() should have been called.", expectedContents, buffer.toString()); assertEquals("customizeContext() should have been called.", expectedContents, buffer.toString());
} }
@ -189,7 +182,7 @@ public class ContextLoaderTests {
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
// expected // expected
assertTrue(ex.getCause() instanceof IOException); assertTrue(ex.getCause() instanceof IOException);
assertTrue(ex.getCause().getMessage().indexOf("/WEB-INF/applicationContext.xml") != -1); assertTrue(ex.getCause().getMessage().contains("/WEB-INF/applicationContext.xml"));
} }
} }
@ -204,7 +197,7 @@ public class ContextLoaderTests {
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
// expected // expected
assertTrue(ex.getCause() instanceof IOException); assertTrue(ex.getCause() instanceof IOException);
assertTrue(ex.getCause().getMessage().indexOf("/WEB-INF/test-servlet.xml") != -1); assertTrue(ex.getCause().getMessage().contains("/WEB-INF/test-servlet.xml"));
} }
} }