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

reverted to fixed definition path

This commit is contained in:
Juergen Hoeller 2010-02-10 21:45:13 +00:00
parent 69cb15f27f
commit d87a947ef2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
View File

@ -18,12 +18,10 @@ package org.springframework.web.servlet.view.tiles2;
import java.util.Properties; import java.util.Properties;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator; import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.factory.TilesContainerFactory; import org.apache.tiles.factory.TilesContainerFactory;
import org.apache.tiles.impl.BasicTilesContainer; import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.apache.tiles.servlet.context.ServletTilesRequestContext; import org.apache.tiles.servlet.context.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil; import org.apache.tiles.servlet.context.ServletUtil;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -42,7 +40,7 @@ public class TilesConfigurerTests {
public void simpleBootstrap() { public void simpleBootstrap() {
MockServletContext sc = new MockServletContext(); MockServletContext sc = new MockServletContext();
TilesConfigurer tc = new TilesConfigurer(); TilesConfigurer tc = new TilesConfigurer();
tc.setDefinitions(new String[] {"/org/springframework/web/servlet/**/tiles-definitions.xml"}); tc.setDefinitions(new String[] {"/org/springframework/web/servlet/view/tiles2/tiles-definitions.xml"});
Properties props = new Properties(); Properties props = new Properties();
props.setProperty(TilesContainerFactory.ATTRIBUTE_EVALUATOR_INIT_PARAM, DirectAttributeEvaluator.class.getName()); props.setProperty(TilesContainerFactory.ATTRIBUTE_EVALUATOR_INIT_PARAM, DirectAttributeEvaluator.class.getName());
tc.setTilesProperties(props); tc.setTilesProperties(props);
@ -50,9 +48,8 @@ public class TilesConfigurerTests {
tc.afterPropertiesSet(); tc.afterPropertiesSet();
BasicTilesContainer container = (BasicTilesContainer) ServletUtil.getContainer(sc); BasicTilesContainer container = (BasicTilesContainer) ServletUtil.getContainer(sc);
TilesApplicationContext appContext = new ServletTilesApplicationContext(sc); TilesRequestContext requestContext = new ServletTilesRequestContext(
TilesRequestContext requestContext = new ServletTilesRequestContext(appContext, container.getApplicationContext(), new MockHttpServletRequest(), new MockHttpServletResponse());
new MockHttpServletRequest(), new MockHttpServletResponse());
assertNotNull(container.getDefinitionsFactory().getDefinition("test", requestContext)); assertNotNull(container.getDefinitionsFactory().getDefinition("test", requestContext));
tc.destroy(); tc.destroy();