Author: apetrelli
Date: Wed Apr 15 20:35:03 2009
New Revision: 765344

URL: http://svn.apache.org/viewvc?rev=765344&view=rev
Log:
TILES-382
Fourth bunch of tiles-velocity tests.
Fixed AddListAttributeVModel test to exclude useless parameters stack.

Added:
    
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
   (with props)
    
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
   (with props)
Modified:
    
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java

Modified: 
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=765344&r1=765343&r2=765344&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
 (original)
+++ 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
 Wed Apr 15 20:35:03 2009
@@ -54,7 +54,6 @@
         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);
@@ -62,7 +61,6 @@
         
         replay(tModel, request, response, velocityContext);
         model.start(request, response, velocityContext, params);
-        assertTrue(parameterMapStack.isEmpty());
         verify(tModel, request, response, velocityContext);
     }
 
@@ -75,7 +73,6 @@
         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);
@@ -83,7 +80,6 @@
         
         replay(tModel, request, response, velocityContext);
         assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, 
response, velocityContext));
-        assertTrue(parameterMapStack.isEmpty());
         verify(tModel, request, response, velocityContext);
     }
 

Added: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java?rev=765344&view=auto
==============================================================================
--- 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
 (added)
+++ 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
 Wed Apr 15 20:35:03 2009
@@ -0,0 +1,131 @@
+/**
+ * 
+ */
+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.ServletContext;
+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.template.PutListAttributeModel;
+import org.apache.tiles.velocity.context.VelocityUtil;
+import org.apache.velocity.context.Context;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests {...@link PutListAttributeVModel}.
+ */
+public class PutListAttributeVModelTest {
+    
+    /**
+     * 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 PutListAttributeVModel model;
+    
+    /**
+     * The template model.
+     */
+    private PutListAttributeModel tModel;
+    
+    /**
+     * The servlet context.
+     */
+    private ServletContext servletContext;
+    
+    /**
+     * Sets up the model to test.
+     */
+    @Before
+    public void setUp() {
+        tModel = createMock(PutListAttributeModel.class);
+        servletContext = createMock(ServletContext.class);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.PutListAttributeVModel#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, "myRole", false);
+        
+        replay(tModel, servletContext, request, response, velocityContext);
+        initializeModel();
+        model.start(request, response, velocityContext, params);
+        assertEquals(1, parameterMapStack.size());
+        assertEquals(params, parameterMapStack.peek());
+        verify(tModel, servletContext, request, response, velocityContext);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.PutListAttributeVModel#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);
+        TilesContainer container = createMock(TilesContainer.class);
+        Stack<Object> composeStack = new Stack<Object>();
+        Map<String, Object> params = createParams();
+        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);
+        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+        tModel.end(container, composeStack, "myName", false, velocityContext, 
request, response);
+        
+        replay(tModel, servletContext, container, request, response, 
velocityContext);
+        initializeModel();
+        assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, 
response, velocityContext));
+        assertTrue(parameterMapStack.isEmpty());
+        verify(tModel, servletContext, container, 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("name", "myName");
+        params.put("role", "myRole");
+        params.put("inherit", false);
+        params.put("cascade", false);
+        return params;
+    }
+
+    /**
+     * Initializes the model.
+     */
+    private void initializeModel() {
+        model = new PutListAttributeVModel(tModel, servletContext);
+    }
+}

Propchange: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java?rev=765344&view=auto
==============================================================================
--- 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
 (added)
+++ 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
 Wed Apr 15 20:35:03 2009
@@ -0,0 +1,488 @@
+/**
+ * 
+ */
+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 javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.servlet.context.ServletUtil;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.runtime.Renderable;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author antonio
+ *
+ */
+public class Tiles2ToolTest {
+
+    /**
+     * The key of the attribute that will be used to store the repository of 
"models".
+     */
+    private static final String TILES_VELOCITY_REPOSITORY_KEY = 
"org.apache.tiles.velocity.TilesVelocityRepository";
+
+    /**
+     * The tool to test.
+     */
+    private Tiles2Tool tool;
+    
+    /**
+     * The request object.
+     */
+    private HttpServletRequest request;
+    
+    /**
+     * The response object.
+     */
+    private HttpServletResponse response;
+    
+    /**
+     * The servlet context.
+     */
+    private ServletContext servletContext;
+    
+    /**
+     * The current velocity context.
+     */
+    private Context velocityContext;
+    
+    /**
+     * @throws java.lang.Exception If something goes wrong.
+     */
+    @Before
+    public void setUp() throws Exception {
+        tool = new Tiles2Tool();
+        request = createMock(HttpServletRequest.class);
+        response = createMock(HttpServletResponse.class);
+        velocityContext = createMock(Context.class);
+        servletContext = createMock(ServletContext.class);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#addAttribute(java.util.Map)}.
+     */
+    @Test
+    public void testAddAttributeMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        AddAttributeVModel model = createMock(AddAttributeVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getAddAttribute()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(tool, tool.addAttribute(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#addAttribute()}.
+     */
+    @Test
+    public void testAddAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        AddAttributeVModel model = createMock(AddAttributeVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getAddAttribute()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.addAttribute());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#addListAttribute()}.
+     */
+    @Test
+    public void testAddListAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        AddListAttributeVModel model = 
createMock(AddListAttributeVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getAddListAttribute()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.addListAttribute());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#definition(java.util.Map)}.
+     */
+    @Test
+    public void testDefinitionMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        DefinitionVModel model = createMock(DefinitionVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getDefinition()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(tool, tool.definition(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#definition()}.
+     */
+    @Test
+    public void testDefinition() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        DefinitionVModel model = createMock(DefinitionVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getDefinition()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.definition());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#getAsString(java.util.Map)}.
+     */
+    @Test
+    public void testGetAsStringMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        GetAsStringVModel model = createMock(GetAsStringVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getGetAsString()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.getAsString(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#getAsString()}.
+     */
+    @Test
+    public void testGetAsString() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        GetAsStringVModel model = createMock(GetAsStringVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getGetAsString()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.getAsString());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#importAttribute(java.util.Map)}.
+     */
+    @Test
+    public void testImportAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        ImportAttributeVModel model = createMock(ImportAttributeVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getImportAttribute()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.importAttribute(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertAttribute(java.util.Map)}.
+     */
+    @Test
+    public void testInsertAttributeMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertAttributeVModel model = createMock(InsertAttributeVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertAttribute()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.insertAttribute(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertAttribute()}.
+     */
+    @Test
+    public void testInsertAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertAttributeVModel model = createMock(InsertAttributeVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertAttribute()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.insertAttribute());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertDefinition(java.util.Map)}.
+     */
+    @Test
+    public void testInsertDefinitionMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertDefinitionVModel model = 
createMock(InsertDefinitionVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertDefinition()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.insertDefinition(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertDefinition()}.
+     */
+    @Test
+    public void testInsertDefinition() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertDefinitionVModel model = 
createMock(InsertDefinitionVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertDefinition()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.insertDefinition());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertTemplate(java.util.Map)}.
+     */
+    @Test
+    public void testInsertTemplateMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertTemplateVModel model = createMock(InsertTemplateVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertTemplate()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.insertTemplate(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#insertTemplate()}.
+     */
+    @Test
+    public void testInsertTemplate() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        InsertTemplateVModel model = createMock(InsertTemplateVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getInsertTemplate()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.insertTemplate());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#putAttribute(java.util.Map)}.
+     */
+    @Test
+    public void testPutAttributeMapOfStringObject() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        PutAttributeVModel model = createMock(PutAttributeVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getPutAttribute()).andReturn(model);
+        expect(model.execute(request, response, velocityContext, 
params)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(tool, tool.putAttribute(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#putAttribute()}.
+     */
+    @Test
+    public void testPutAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        PutAttributeVModel model = createMock(PutAttributeVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getPutAttribute()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.putAttribute());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#putListAttribute()}.
+     */
+    @Test
+    public void testPutListAttribute() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        PutListAttributeVModel model = 
createMock(PutListAttributeVModel.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getPutListAttribute()).andReturn(model);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.putListAttribute());
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#setCurrentContainer(java.lang.String)}.
+     */
+    @Test
+    public void testSetCurrentContainer() {
+        TilesContainer container = createMock(TilesContainer.class);
+        
+        expect(servletContext.getAttribute("myKey")).andReturn(container);
+        request.setAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME, 
container);
+        
+        replay(velocityContext, request, response, servletContext, container);
+        initializeTool();
+        assertEquals(tool, tool.setCurrentContainer("myKey"));
+        verify(velocityContext, request, response, servletContext, container);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#start(java.util.Map)}.
+     */
+    @Test
+    public void testStart() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        PutAttributeVModel model = createMock(PutAttributeVModel.class);
+        Map<String, Object> params = createParams();
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getPutAttribute()).andReturn(model);
+        model.start(request, response, velocityContext, params);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model);
+        initializeTool();
+        assertEquals(tool, tool.putAttribute().start(params));
+        verify(velocityContext, request, response, servletContext, repository, 
model);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#end()}.
+     */
+    @Test
+    public void testEnd() {
+        TilesVelocityRepository repository = 
createMock(TilesVelocityRepository.class);
+        PutAttributeVModel model = createMock(PutAttributeVModel.class);
+        Renderable renderable = createMock(Renderable.class);
+        
+        
expect(servletContext.getAttribute(TILES_VELOCITY_REPOSITORY_KEY)).andReturn(repository);
+        expect(repository.getPutAttribute()).andReturn(model);
+        expect(model.end(request, response, 
velocityContext)).andReturn(renderable);
+        
+        replay(velocityContext, request, response, servletContext, repository, 
model, renderable);
+        initializeTool();
+        assertEquals(renderable, tool.putAttribute().end());
+        verify(velocityContext, request, response, servletContext, repository, 
model, renderable);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#getAttribute(java.lang.String)}.
+     */
+    @Test
+    public void testGetAttribute() {
+        TilesContainer container = createMock(TilesContainer.class);
+        AttributeContext attributeContext = createMock(AttributeContext.class);
+        Attribute attribute = new Attribute("myAttributeValue");
+        
+        
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
+        expect(container.getAttributeContext(velocityContext, request, 
response)).andReturn(attributeContext);
+        
expect(attributeContext.getAttribute("myAttribute")).andReturn(attribute);
+        
+        replay(velocityContext, request, response, servletContext, container, 
attributeContext);
+        initializeTool();
+        assertEquals(attribute, tool.getAttribute("myAttribute"));
+        verify(velocityContext, request, response, servletContext, container, 
attributeContext);
+    }
+
+    /**
+     * Test method for {...@link 
org.apache.tiles.velocity.template.Tiles2Tool#toString()}.
+     */
+    @Test
+    public void testToString() {
+        assertEquals("", tool.toString());
+    }
+
+    /**
+     * Initializes the tool for the test.
+     */
+    private void initializeTool() {
+        tool.setRequest(request);
+        tool.setResponse(response);
+        tool.setServletContext(servletContext);
+        tool.setVelocityContext(velocityContext);
+    }
+    
+    /**
+     * Creates some mock params.
+     * 
+     * @return The parameters.
+     */
+    private Map<String, Object> createParams() {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("one", "value1");
+        params.put("two", "value2");
+        return params;
+    }
+}

Propchange: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/Tiles2ToolTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL


Reply via email to