You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/04/08 00:05:14 UTC
svn commit: r762990 - in /tiles/framework/trunk/tiles-velocity: ./
src/test/java/org/apache/tiles/velocity/context/
src/test/java/org/apache/tiles/velocity/template/
Author: apetrelli
Date: Tue Apr 7 22:05:14 2009
New Revision: 762990
URL: http://svn.apache.org/viewvc?rev=762990&view=rev
Log:
TILES-382
Second bunch of tiles-velocity tests.
Added:
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java (with props)
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java (with props)
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (with props)
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java (with props)
Modified:
tiles/framework/trunk/tiles-velocity/pom.xml
Modified: tiles/framework/trunk/tiles-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/pom.xml?rev=762990&r1=762989&r2=762990&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-velocity/pom.xml Tue Apr 7 22:05:14 2009
@@ -71,5 +71,18 @@
<version>4.5</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java?rev=762990&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java (added)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java Tue Apr 7 22:05:14 2009
@@ -0,0 +1,136 @@
+/**
+ *
+ */
+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 java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.velocity.context.Context;
+import org.junit.Test;
+
+/**
+ * @author antonio
+ *
+ */
+public class VelocityUtilTest {
+
+ /**
+ * The parameter stack key.
+ */
+ private final static 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)}.
+ */
+ @Test
+ public void testToSimpleBoolean() {
+ assertEquals(true, toSimpleBoolean(Boolean.TRUE, true));
+ assertEquals(false, toSimpleBoolean(Boolean.FALSE, true));
+ assertEquals(true, toSimpleBoolean(Boolean.TRUE, false));
+ assertEquals(false, toSimpleBoolean(Boolean.FALSE, false));
+ assertEquals(true, toSimpleBoolean(null, true));
+ assertEquals(false, toSimpleBoolean(null, false));
+ }
+
+ /**
+ * 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(Stack.class))).andReturn(null);
+ replay(velocityContext);
+ Stack<Map<String, Object>> paramStack = getParameterStack(velocityContext);
+ assertNotNull(paramStack);
+ assertEquals(0, paramStack.size());
+ verify(velocityContext);
+
+ reset(velocityContext);
+
+ paramStack = new Stack<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)}.
+ */
+ @Test
+ public void testSetAttributePage() {
+ Context velocityContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ ServletContext servletContext = createMock(ServletContext.class);
+ Object value = new Integer(10);
+ expect(velocityContext.put("myName", value)).andReturn(value);
+
+ replay(velocityContext, request, servletContext);
+ setAttribute(velocityContext, request, servletContext, "myName", value, null);
+ verify(velocityContext, request, servletContext);
+ }
+
+ /**
+ * 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)}.
+ */
+ @Test
+ public void testSetAttributeRequest() {
+ Context velocityContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ ServletContext servletContext = createMock(ServletContext.class);
+ Object value = new Integer(10);
+ request.setAttribute("myName", value);
+
+ replay(velocityContext, request, servletContext);
+ setAttribute(velocityContext, request, servletContext, "myName", value, "request");
+ verify(velocityContext, request, servletContext);
+ }
+
+ /**
+ * 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)}.
+ */
+ @Test
+ public void testSetAttributeSession() {
+ Context velocityContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpSession session = createMock(HttpSession.class);
+ ServletContext servletContext = createMock(ServletContext.class);
+ Object value = new Integer(10);
+ expect(request.getSession()).andReturn(session);
+ session.setAttribute("myName", value);
+
+ replay(velocityContext, request, servletContext, session);
+ setAttribute(velocityContext, request, servletContext, "myName", value, "session");
+ verify(velocityContext, request, servletContext, session);
+ }
+
+ /**
+ * 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)}.
+ */
+ @Test
+ public void testSetAttributeApplication() {
+ Context velocityContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ ServletContext servletContext = createMock(ServletContext.class);
+ Object value = new Integer(10);
+ servletContext.setAttribute("myName", value);
+
+ replay(velocityContext, request, servletContext);
+ setAttribute(velocityContext, request, servletContext, "myName", value, "application");
+ verify(velocityContext, request, servletContext);
+ }
+}
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/context/VelocityUtilTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java?rev=762990&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java (added)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java Tue Apr 7 22:05:14 2009
@@ -0,0 +1,165 @@
+/**
+ *
+ */
+package org.apache.tiles.velocity.template;
+
+import static org.junit.Assert.*;
+import static org.easymock.classextension.EasyMock.*;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.velocity.context.Context;
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.junit.Test;
+
+/**
+ * @author antonio
+ *
+ */
+public class AbstractDefaultToStringRenderableTest {
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AbstractDefaultToStringRenderable#AbstractDefaultToStringRenderable(org.apache.velocity.context.Context, java.util.Map, javax.servlet.http.HttpServletResponse, javax.servlet.http.HttpServletRequest)}.
+ */
+ @Test
+ public void testAbstractDefaultToStringRenderable() {
+ Context velociContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Map<String, Object> params = new HashMap<String, Object>();
+
+ replay(velociContext, request, response);
+ DefaultRenderable renderable = new DefaultRenderable(velociContext,
+ params, response, request);
+ assertEquals(velociContext, renderable.getVelocityContext());
+ assertEquals(request, renderable.getRequest());
+ assertEquals(response, renderable.getResponse());
+ assertEquals(params, renderable.getParams());
+ verify(velociContext, request, response);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AbstractDefaultToStringRenderable#toString()}.
+ */
+ @Test
+ public void testToString() {
+ Context velociContext = createMock(Context.class);
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("one", "value1");
+
+ replay(velociContext, request, response);
+ DefaultRenderable renderable = new DefaultRenderable(velociContext,
+ params, response, request);
+
+ assertEquals("Hello!", renderable.toString());
+ assertTrue(renderable.getWriter() instanceof StringWriter);
+ assertNull(renderable.getInternalContextAdapter());
+ verify(velociContext, request, response);
+ }
+
+ /**
+ * Mock class for AbstractDefaultToStringRenderable.
+ */
+ private static class DefaultRenderable extends AbstractDefaultToStringRenderable {
+
+ /**
+ * The internal context.
+ */
+ private InternalContextAdapter internalContextAdapter;
+
+ /**
+ * The writer.
+ */
+ private Writer writer;
+
+ /**
+ * Constructor.
+ *
+ * @param velocityContext The Velocity context.
+ * @param params The parameters used in the current tool call.
+ * @param response The HTTP response.
+ * @param request The HTTP request.
+ */
+ public DefaultRenderable(Context velocityContext,
+ Map<String, Object> params, HttpServletResponse response,
+ HttpServletRequest request) {
+ super(velocityContext, params, response, request);
+ }
+
+ /** {@inheritDoc} */
+ public boolean render(InternalContextAdapter context, Writer writer)
+ throws IOException, MethodInvocationException,
+ ParseErrorException, ResourceNotFoundException {
+ this.internalContextAdapter = context;
+ this.writer = writer;
+ writer.write("Hello!");
+ return true;
+ }
+
+ /**
+ * Returns the Velocity context.
+ *
+ * @return The velocity context.
+ */
+ public Context getVelocityContext() {
+ return velocityContext;
+ }
+
+ /**
+ * Returns the parameters.
+ *
+ * @return The parameters.
+ */
+ public Map<String, Object> getParams() {
+ return params;
+ }
+
+ /**
+ * Returns the request.
+ *
+ * @return The request.
+ */
+ public HttpServletRequest getRequest() {
+ return request;
+ }
+
+ /**
+ * Returns the respnse.
+ *
+ * @return The response.
+ */
+ public HttpServletResponse getResponse() {
+ return response;
+ }
+
+ /**
+ * Returns the internal context.
+ *
+ * @return The internal context.
+ */
+ public InternalContextAdapter getInternalContextAdapter() {
+ return internalContextAdapter;
+ }
+
+ /**
+ * Returns the writer.
+ *
+ * @return The writer.
+ */
+ public Writer getWriter() {
+ return writer;
+ }
+ }
+}
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java?rev=762990&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (added)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java Tue Apr 7 22:05:14 2009
@@ -0,0 +1,133 @@
+/**
+ *
+ */
+package org.apache.tiles.velocity.template;
+
+import static org.junit.Assert.*;
+import static org.easymock.classextension.EasyMock.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.template.AddAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
+import org.apache.velocity.context.Context;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link AddAttributeVModel}.
+ */
+public class AddAttributeVModelTest {
+
+ /**
+ * The attribute key that will be used to store the parameter map, to use across Velocity tool calls.
+ */
+ private final static String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK";
+
+ /**
+ * The model to test.
+ */
+ private AddAttributeVModel model;
+
+ /**
+ * The template model.
+ */
+ private AddAttributeModel tModel;
+
+ /**
+ * Sets up the model to test.
+ */
+ @Before
+ public void setUp() {
+ tModel = createMock(AddAttributeModel.class);
+ model = new AddAttributeVModel(tModel);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AddAttributeVModel#execute(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.velocity.context.Context, java.util.Map)}.
+ */
+ @Test
+ public void testExecute() {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Context velocityContext = createMock(Context.class);
+ Map<String, Object> params = createParams();
+ Stack<Object> composeStack = new Stack<Object>();
+
+ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
+ .andReturn(composeStack);
+ tModel.execute(composeStack, "myValue", "myExpression", null, "myRole", "myType");
+
+ replay(tModel, request, response, velocityContext);
+ assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.execute(request, response, velocityContext, params));
+ verify(tModel, request, response, velocityContext);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AddAttributeVModel#start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.velocity.context.Context, java.util.Map)}.
+ */
+ @Test
+ public void testStart() {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Context velocityContext = createMock(Context.class);
+ Map<String, Object> params = createParams();
+ Stack<Object> composeStack = new Stack<Object>();
+ Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String,Object>>();
+
+ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
+ .andReturn(composeStack);
+ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
+ tModel.start(composeStack);
+
+ replay(tModel, request, response, velocityContext);
+ model.start(request, response, velocityContext, params);
+ assertEquals(1, parameterMapStack.size());
+ assertEquals(params, parameterMapStack.peek());
+ verify(tModel, request, response, velocityContext);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AddAttributeVModel#end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.velocity.context.Context)}.
+ */
+ @Test
+ public void testEnd() {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Context velocityContext = createMock(Context.class);
+ Map<String, Object> params = createParams();
+ Stack<Object> composeStack = new Stack<Object>();
+ Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String,Object>>();
+ parameterMapStack.push(params);
+
+ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
+ .andReturn(composeStack);
+ expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
+ tModel.end(composeStack, "myValue", "myExpression", null, "myRole", "myType");
+
+ replay(tModel, request, response, velocityContext);
+ assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
+ assertTrue(parameterMapStack.isEmpty());
+ verify(tModel, request, response, velocityContext);
+ }
+
+ /**
+ * Creates the parameters to work with the model.
+ *
+ * @return The parameters.
+ */
+ private Map<String, Object> createParams() {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("value", "myValue");
+ params.put("expression", "myExpression");
+ params.put("role", "myRole");
+ params.put("type", "myType");
+ return params;
+ }
+}
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java?rev=762990&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java (added)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java Tue Apr 7 22:05:14 2009
@@ -0,0 +1,100 @@
+/**
+ *
+ */
+package org.apache.tiles.velocity.template;
+
+import static org.junit.Assert.*;
+import static org.easymock.classextension.EasyMock.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.tiles.template.AddListAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
+import org.apache.velocity.context.Context;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {@link AddListAttributeVModel}.
+ */
+public class AddListAttributeVModelTest {
+
+ /**
+ * The model to test.
+ */
+ private AddListAttributeVModel model;
+
+ /**
+ * The template model.
+ */
+ private AddListAttributeModel tModel;
+
+ /**
+ * Sets up the model to test.
+ */
+ @Before
+ public void setUp() {
+ tModel = createMock(AddListAttributeModel.class);
+ model = new AddListAttributeVModel(tModel);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AddListAttributeVModel#start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.velocity.context.Context, java.util.Map)}.
+ */
+ @Test
+ public void testStart() {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Context velocityContext = createMock(Context.class);
+ Map<String, Object> params = createParams();
+ Stack<Object> composeStack = new Stack<Object>();
+ Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String,Object>>();
+
+ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
+ .andReturn(composeStack);
+ tModel.start(composeStack, "myRole");
+
+ replay(tModel, request, response, velocityContext);
+ model.start(request, response, velocityContext, params);
+ assertTrue(parameterMapStack.isEmpty());
+ verify(tModel, request, response, velocityContext);
+ }
+
+ /**
+ * Test method for {@link org.apache.tiles.velocity.template.AddListAttributeVModel#end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.velocity.context.Context)}.
+ */
+ @Test
+ public void testEnd() {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ HttpServletResponse response = createMock(HttpServletResponse.class);
+ Context velocityContext = createMock(Context.class);
+ Stack<Object> composeStack = new Stack<Object>();
+ Stack<Map<String, Object>> parameterMapStack = new Stack<Map<String,Object>>();
+
+ expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
+ .andReturn(composeStack);
+ tModel.end(composeStack);
+
+ replay(tModel, request, response, velocityContext);
+ assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
+ assertTrue(parameterMapStack.isEmpty());
+ verify(tModel, request, response, velocityContext);
+ }
+
+ /**
+ * Creates the parameters to work with the model.
+ *
+ * @return The parameters.
+ */
+ private Map<String, Object> createParams() {
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("role", "myRole");
+ return params;
+ }
+}
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL