Modified: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java?rev=903417&r1=903416&r2=903417&view=diff ============================================================================== --- tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java Tue Jan 26 21:05:34 2010 @@ -22,18 +22,23 @@ package org.apache.tiles.velocity.context; import static org.apache.tiles.velocity.context.VelocityUtil.*; -import static org.junit.Assert.*; import static org.easymock.EasyMock.*; +import static org.easymock.classextension.EasyMock.*; +import static org.junit.Assert.*; -import java.util.HashMap; +import java.io.IOException; +import java.io.Writer; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.apache.tiles.ArrayStack; import org.apache.velocity.context.Context; +import org.apache.velocity.context.InternalContextAdapter; +import org.apache.velocity.runtime.parser.node.ASTBlock; +import org.apache.velocity.runtime.parser.node.ASTMap; +import org.apache.velocity.runtime.parser.node.Node; import org.junit.Test; /** @@ -47,11 +52,6 @@ private static final Integer DUMMY_VALUE = new Integer(10); /** - * The parameter stack key. - */ - private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK"; - - /** * Test method for {...@link org.apache.tiles.velocity.context.VelocityUtil * #toSimpleBoolean(java.lang.Boolean, boolean)}. */ @@ -67,34 +67,6 @@ /** * Test method for {...@link org.apache.tiles.velocity.context.VelocityUtil - * #getParameterStack(org.apache.velocity.context.Context)}. - */ - @Test - public void testGetParameterStack() { - Context velocityContext = createMock(Context.class); - - expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(null); - expect(velocityContext.put(eq(PARAMETER_MAP_STACK_KEY), - isA(ArrayStack.class))).andReturn(null); - replay(velocityContext); - ArrayStack<Map<String, Object>> paramStack = getParameterStack(velocityContext); - assertNotNull(paramStack); - assertEquals(0, paramStack.size()); - verify(velocityContext); - - reset(velocityContext); - - paramStack = new ArrayStack<Map<String, Object>>(); - paramStack.push(new HashMap<String, Object>()); - expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack); - - replay(velocityContext); - assertEquals(paramStack, getParameterStack(velocityContext)); - verify(velocityContext); - } - - /** - * Test method for {...@link org.apache.tiles.velocity.context.VelocityUtil * #setAttribute(org.apache.velocity.context.Context, javax.servlet.http.HttpServletRequest, * javax.servlet.ServletContext, java.lang.String, java.lang.Object, java.lang.String)}. */ @@ -166,4 +138,86 @@ setAttribute(velocityContext, request, servletContext, "myName", value, "application"); verify(velocityContext, request, servletContext); } + + /** + * Test method for + * {...@link VelocityUtil#getBodyAsString(InternalContextAdapter, Node)}. + * + * @throws IOException If something goes wrong. + */ + @Test + public void testGetBodyAsString() throws IOException { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + ASTBlock block = new CustomBlock(); + + expect(node.jjtGetChild(1)).andReturn(block); + + replay(context, node); + assertEquals("myBody", VelocityUtil.getBodyAsString(context, node)); + verify(context, node); + } + + /** + * Test method for + * {...@link VelocityUtil#evaluateBody(InternalContextAdapter, Writer, Node)}. + * + * @throws IOException If something goes wrong. + */ + @Test + public void testEvaluateBody() throws IOException { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + Writer writer = createMock(Writer.class); + ASTBlock block = createMock(ASTBlock.class); + + expect(node.jjtGetChild(1)).andReturn(block); + + replay(context, node, writer); + VelocityUtil.evaluateBody(context, writer, node); + verify(context, node, writer); + } + + /** + * Test method for + * {...@link VelocityUtil#getBodyAsString(InternalContextAdapter, Node)}. + */ + @SuppressWarnings("unchecked") + @Test + public void testGetParameters() { + InternalContextAdapter context = createMock(InternalContextAdapter.class); + Node node = createMock(Node.class); + ASTMap block = createMock(ASTMap.class); + Map<String, Object> params = createMock(Map.class); + + expect(node.jjtGetChild(0)).andReturn(block); + expect(block.value(context)).andReturn(params); + + replay(context, node, block, params); + assertEquals(params, VelocityUtil.getParameters(context, node)); + verify(context, node, block, params); + } + + /** + * Custom block to render a specific string. + * + * @version $Rev$ $Date$ + */ + private static class CustomBlock extends ASTBlock { + + /** + * Constructor. + */ + public CustomBlock() { + super(1); + } + + /** {...@inheritdoc} */ + @Override + public boolean render(InternalContextAdapter context, Writer writer) + throws IOException { + writer.write("myBody"); + return true; + } + } }
Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,8 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.AddAttributeModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -73,17 +74,17 @@ HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.start(composeStack); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -96,14 +97,14 @@ HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(composeStack, "myValue", "myExpression", - "myBody", "myRole", "myType"); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq("myValue"), eq("myExpression"), eq("myBody"), + eq("myRole"), eq("myType"), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, writer, servletContext); model.end(velocityContext, writer, params, "myBody", request, response, servletContext); Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,8 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.AddListAttributeModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -73,17 +74,17 @@ HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.start(composeStack, "myRole"); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(eq("myRole"), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -96,17 +97,17 @@ HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(composeStack); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,9 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.mgmt.MutableTilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.DefinitionModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -73,13 +73,14 @@ HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.start(composeStack, "myName", "myTemplate", "myRole", "myExtends", "myPreparer"); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(eq("myName"), eq("myTemplate"), eq("myRole"), + eq("myExtends"), eq("myPreparer"), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, writer, servletContext); initializeModel(); @@ -99,18 +100,16 @@ Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); Map<String, Object> params = createParams(); - MutableTilesContainer container = createMock(MutableTilesContainer.class); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(container, composeStack, velocityContext, request, response); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -33,10 +33,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.GetAsStringModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -80,23 +81,21 @@ HttpServletRequest request = createMock(HttpServletRequest.class); HttpServletResponse response = createMock(HttpServletResponse.class); InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue", - "myDefaultValueRole", "myDefaultValueType", "myName", attribute, - velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(eq(false), eq("myPreparer"), eq("myRole"), eq("myDefaultValue"), + eq("myDefaultValueRole"), eq("myDefaultValueType"), eq("myName"), eq(attribute), + isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -113,15 +112,12 @@ Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); TilesContainer container = createMock(TilesContainer.class); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); - ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); - paramStack.push(params); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(composeStack, container, writer, false, velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq(false), isA(VelocityRequest.class)); replay(tModel, request, response, velocityContext, writer, servletContext, container); initializeModel(); Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,10 +32,11 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.ImportAttributeModel; import org.apache.velocity.context.InternalContextAdapter; import org.apache.velocity.runtime.parser.node.ASTMap; @@ -71,7 +72,7 @@ * Test method for {...@link ImportAttributeDirective#render(InternalContextAdapter, Writer, Node)}. */ @Test - public void testExecutePage() { + public void testExecute() { HttpServletRequest request = createMock(HttpServletRequest.class); HttpServletResponse response = createMock(HttpServletResponse.class); ServletContext servletContext = createMock(ServletContext.class); @@ -82,148 +83,22 @@ TilesContainer container = createMock(TilesContainer.class); Writer writer = new StringWriter(); Map<String, Object> params = createParams(); - Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put("one", "value1"); - attributes.put("two", "value2"); + ApplicationContext applicationContext = createMock(ApplicationContext.class); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); expect(velocityContext.getInternalUserContext()).andReturn(viewContext); expect(viewContext.getRequest()).andReturn(request); expect(viewContext.getResponse()).andReturn(response); expect(viewContext.getServletContext()).andReturn(servletContext); expect(node.jjtGetChild(0)).andReturn(astMap); expect(astMap.value(velocityContext)).andReturn(params); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(tModel.getImportedAttributes(container, "myName", "myToName", false, - velocityContext, request, response)).andReturn(attributes); - expect(velocityContext.put("one", "value1")).andReturn("value1"); - expect(velocityContext.put("two", "value2")).andReturn("value2"); + tModel.execute(eq("myName"), eq("myScope"), eq("myToName"), eq(false), isA(VelocityRequest.class)); - replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); + replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap, applicationContext); initializeModel(); model.render(velocityContext, writer, node); - verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - } - - /** - * Test method for {...@link org.apache.tiles.velocity.template.ImportAttributeVModel - * #execute(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, - * org.apache.velocity.context.Context, java.util.Map)}. - */ - @Test - public void testExecuteRequest() { - HttpServletRequest request = createMock(HttpServletRequest.class); - HttpServletResponse response = createMock(HttpServletResponse.class); - ServletContext servletContext = createMock(ServletContext.class); - InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); - ViewToolContext viewContext = createMock(ViewToolContext.class); - ASTMap astMap = createMock(ASTMap.class); - Node node = createMock(Node.class); - TilesContainer container = createMock(TilesContainer.class); - Writer writer = new StringWriter(); - Map<String, Object> params = createParams(); - params.put("scope", "request"); - Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put("one", "value1"); - attributes.put("two", "value2"); - - expect(velocityContext.getInternalUserContext()).andReturn(viewContext); - expect(viewContext.getRequest()).andReturn(request); - expect(viewContext.getResponse()).andReturn(response); - expect(viewContext.getServletContext()).andReturn(servletContext); - expect(node.jjtGetChild(0)).andReturn(astMap); - expect(astMap.value(velocityContext)).andReturn(params); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(tModel.getImportedAttributes(container, "myName", "myToName", false, - velocityContext, request, response)).andReturn(attributes); - request.setAttribute("one", "value1"); - request.setAttribute("two", "value2"); - - replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - initializeModel(); - model.render(velocityContext, writer, node); - verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - } - - /** - * Test method for {...@link org.apache.tiles.velocity.template.ImportAttributeVModel - * #execute(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, - * org.apache.velocity.context.Context, java.util.Map)}. - */ - @Test - public void testExecuteSession() { - HttpServletRequest request = createMock(HttpServletRequest.class); - HttpServletResponse response = createMock(HttpServletResponse.class); - HttpSession session = createMock(HttpSession.class); - ServletContext servletContext = createMock(ServletContext.class); - InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); - ViewToolContext viewContext = createMock(ViewToolContext.class); - ASTMap astMap = createMock(ASTMap.class); - Node node = createMock(Node.class); - TilesContainer container = createMock(TilesContainer.class); - Writer writer = new StringWriter(); - Map<String, Object> params = createParams(); - params.put("scope", "session"); - Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put("one", "value1"); - attributes.put("two", "value2"); - - expect(velocityContext.getInternalUserContext()).andReturn(viewContext); - expect(viewContext.getRequest()).andReturn(request); - expect(viewContext.getResponse()).andReturn(response); - expect(viewContext.getServletContext()).andReturn(servletContext); - expect(node.jjtGetChild(0)).andReturn(astMap); - expect(astMap.value(velocityContext)).andReturn(params); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(tModel.getImportedAttributes(container, "myName", "myToName", false, - velocityContext, request, response)).andReturn(attributes); - expect(request.getSession()).andReturn(session).times(2); - session.setAttribute("one", "value1"); - session.setAttribute("two", "value2"); - - replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - initializeModel(); - model.render(velocityContext, writer, node); - verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - } - - /** - * Test method for {...@link org.apache.tiles.velocity.template.ImportAttributeVModel - * #execute(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, - * org.apache.velocity.context.Context, java.util.Map)}. - */ - @Test - public void testExecuteApplication() { - HttpServletRequest request = createMock(HttpServletRequest.class); - HttpServletResponse response = createMock(HttpServletResponse.class); - ServletContext servletContext = createMock(ServletContext.class); - InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); - ViewToolContext viewContext = createMock(ViewToolContext.class); - ASTMap astMap = createMock(ASTMap.class); - Node node = createMock(Node.class); - TilesContainer container = createMock(TilesContainer.class); - Writer writer = new StringWriter(); - Map<String, Object> params = createParams(); - params.put("scope", "application"); - Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put("one", "value1"); - attributes.put("two", "value2"); - - expect(velocityContext.getInternalUserContext()).andReturn(viewContext); - expect(viewContext.getRequest()).andReturn(request); - expect(viewContext.getResponse()).andReturn(response); - expect(viewContext.getServletContext()).andReturn(servletContext); - expect(node.jjtGetChild(0)).andReturn(astMap); - expect(astMap.value(velocityContext)).andReturn(params); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(tModel.getImportedAttributes(container, "myName", "myToName", false, - velocityContext, request, response)).andReturn(attributes); - servletContext.setAttribute("one", "value1"); - servletContext.setAttribute("two", "value2"); - - replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); - initializeModel(); - model.render(velocityContext, writer, node); - verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap); + verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap, applicationContext); } /** @@ -240,6 +115,7 @@ */ private Map<String, Object> createParams() { Map<String, Object> params = new HashMap<String, Object>(); + params.put("scope", "myScope"); params.put("ignore", false); params.put("name", "myName"); params.put("toName", "myToName"); Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -33,10 +33,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; import org.apache.tiles.Attribute; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertAttributeModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -82,21 +82,20 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue", - "myDefaultValueRole", "myDefaultValueType", "myName", attribute, - velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(eq(false), eq("myPreparer"), eq("myRole"), + eq("myDefaultValue"), eq("myDefaultValueRole"), + eq("myDefaultValueType"), eq("myName"), eq(attribute), + isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -112,19 +111,17 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(composeStack, container, false, velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq(false), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,9 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertDefinitionModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -74,16 +74,17 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.start(container, velocityContext, request, response); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -97,20 +98,19 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>(); - paramStack.push(params); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.end(container, "myDefinitionName", "myTemplate", - "myTemplateType", "myTemplateExpression", "myRole", - "myPreparer", velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq("myDefinitionName"), eq("myTemplate"), + eq("myTemplateType"), eq("myTemplateExpression"), eq("myRole"), + eq("myPreparer"), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,8 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.InsertTemplateModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -73,16 +74,17 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.start(container, velocityContext, request, response); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -96,18 +98,19 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.end(container, "myTemplate", "myTemplateType", - "myTemplateExpression", "myRole", - "myPreparer", velocityContext, request, response, writer); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq("myTemplate"), eq("myTemplateType"), + eq("myTemplateExpression"), eq("myRole"), + eq("myPreparer"), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,9 +32,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.PutAttributeModel; import org.apache.velocity.context.InternalContextAdapter; import org.junit.Before; @@ -75,16 +75,16 @@ Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.start(composeStack); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -98,23 +98,19 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); - ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>(); - parameterMapStack.push(params); - - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.end(container, composeStack, "myName", "myValue", - "myExpression", "myBody", "myRole", "myType", - false, velocityContext, request, response, writer); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq("myName"), eq("myValue"), + eq("myExpression"), eq("myBody"), eq("myRole"), eq("myType"), + eq(false), isA(VelocityRequest.class)); + + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, "myBody", request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** Copied: tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java (from r902966, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java) URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java?p2=tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java&p1=tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java&r1=902966&r2=903417&rev=903417&view=diff ============================================================================== --- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java (original) +++ tiles/sandbox/trunk/tiles3/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java Tue Jan 26 21:05:34 2010 @@ -32,11 +32,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.tiles.ArrayStack; -import org.apache.tiles.TilesContainer; -import org.apache.tiles.servlet.context.ServletUtil; +import org.apache.tiles.request.ApplicationContext; +import org.apache.tiles.request.util.ApplicationAccess; +import org.apache.tiles.request.velocity.VelocityRequest; import org.apache.tiles.template.PutListAttributeModel; import org.apache.velocity.context.InternalContextAdapter; +import org.apache.velocity.runtime.directive.Directive; import org.junit.Before; import org.junit.Test; @@ -75,16 +76,16 @@ Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); Map<String, Object> params = createParams(); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - tModel.start(composeStack, "myRole", false); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.start(eq("myRole"), eq(false), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.start(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /** @@ -98,19 +99,17 @@ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class); Writer writer = createMock(Writer.class); ServletContext servletContext = createMock(ServletContext.class); - TilesContainer container = createMock(TilesContainer.class); - ArrayStack<Object> composeStack = new ArrayStack<Object>(); Map<String, Object> params = createParams(); + ApplicationContext applicationContext = createMock(ApplicationContext.class); - expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME)) - .andReturn(composeStack); - expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container); - tModel.end(container, composeStack, "myName", false, velocityContext, request, response); + expect(servletContext.getAttribute(ApplicationAccess.APPLICATION_CONTEXT_ATTRIBUTE)) + .andReturn(applicationContext); + tModel.end(eq("myName"), eq(false), isA(VelocityRequest.class)); - replay(tModel, request, response, velocityContext, writer, servletContext, container); + replay(tModel, request, response, velocityContext, writer, servletContext, applicationContext); initializeModel(); model.end(velocityContext, writer, params, request, response, servletContext); - verify(tModel, request, response, velocityContext, writer, servletContext, container); + verify(tModel, request, response, velocityContext, writer, servletContext, applicationContext); } /**
