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 2010/01/23 14:31:18 UTC
svn commit: r902403 [2/2] - in /tiles/framework/trunk/tiles-velocity/src:
main/java/org/apache/tiles/velocity/template/
test/java/org/apache/tiles/velocity/template/
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java?p2=tiles/framework/trunk/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/InsertTemplateVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,10 +23,7 @@
import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
-import static org.junit.Assert.*;
-import java.io.IOException;
-import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
@@ -35,30 +32,22 @@
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.template.InsertTemplateModel;
-import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.Renderable;
import org.junit.Before;
import org.junit.Test;
/**
- * Tests {@link InsertTemplateVModel}.
+ * Tests {@link InsertTemplateDirective}.
*/
-public class InsertTemplateVModelTest {
-
- /**
- * The attribute key that will be used to store the parameter map, to use across Velocity tool calls.
- */
- private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK";
+public class InsertTemplateDirectiveTest {
/**
* The model to test.
*/
- private InsertTemplateVModel model;
+ private InsertTemplateDirective model;
/**
* The template model.
@@ -66,110 +55,66 @@
private InsertTemplateModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* Sets up the model to test.
*/
@Before
public void setUp() {
tModel = createMock(InsertTemplateModel.class);
- servletContext = createMock(ServletContext.class);
- }
-
- /**
- * Test method for {@link org.apache.tiles.velocity.template.InsertTemplateVModel
- * #execute(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
- * @throws IOException If something goes wrong.
- */
- @Test
- public void testExecute() throws IOException {
- HttpServletRequest request = createMock(HttpServletRequest.class);
- HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
- TilesContainer container = createMock(TilesContainer.class);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
- Writer writer = new StringWriter();
- Map<String, Object> params = createParams();
-
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(container, "myTemplate", "myTemplateType",
- "myTemplateExpression", "myRole", "myPreparer",
- velocityContext, request, response, writer);
-
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
- initializeModel();
- Renderable renderable = model.execute(request, response, velocityContext, params);
- renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.InsertTemplateVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link InsertTemplateDirective#start(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
public void testStart() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ 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>>();
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(container, velocityContext, request, response);
- replay(tModel, servletContext, container, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext, container);
initializeModel();
- model.start(request, response, velocityContext, params);
- assertEquals(1, paramStack.size());
- assertEquals(params, paramStack.peek());
- verify(tModel, servletContext, container, request, response, velocityContext);
+ model.start(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext, container);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.InsertTemplateVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
- * @throws IOException If something goes wrong.
+ * Test method for {@link InsertTemplateDirective#end(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
- public void testEnd() throws IOException {
+ public void testEnd() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class);
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
TilesContainer container = createMock(TilesContainer.class);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
- Writer writer = new StringWriter();
Map<String, Object> params = createParams();
- ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
- paramStack.push(params);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(container, "myTemplate", "myTemplateType",
"myTemplateExpression", "myRole",
"myPreparer", velocityContext, request, response, writer);
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ replay(tModel, request, response, velocityContext, writer, servletContext, container);
initializeModel();
- Renderable renderable = model.end(request, response, velocityContext);
- renderable.render(internalContextAdapter, writer);
- assertTrue(paramStack.isEmpty());
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ model.end(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext, container);
}
/**
* Initializes the model.
*/
private void initializeModel() {
- model = new InsertTemplateVModel(tModel, servletContext);
+ model = new InsertTemplateDirective(tModel);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/PutAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,8 +23,8 @@
import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
-import static org.junit.Assert.*;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
@@ -36,25 +36,19 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.PutAttributeModel;
-import org.apache.tiles.velocity.context.VelocityUtil;
-import org.apache.velocity.context.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.junit.Before;
import org.junit.Test;
/**
- * Tests {@link PutAttributeVModel}.
+ * Tests {@link PutAttributeDirective}.
*/
-public class PutAttributeVModelTest {
-
- /**
- * The attribute key that will be used to store the parameter map, to use across Velocity tool calls.
- */
- private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK";
+public class PutAttributeDirectiveTest {
/**
* The model to test.
*/
- private PutAttributeVModel model;
+ private PutAttributeDirective model;
/**
* The template model.
@@ -62,83 +56,48 @@
private PutAttributeModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* Sets up the model to test.
*/
@Before
public void setUp() {
tModel = createMock(PutAttributeModel.class);
- servletContext = createMock(ServletContext.class);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.PutAttributeVModel
- * #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);
- TilesContainer container = createMock(TilesContainer.class);
- Map<String, Object> params = createParams();
- ArrayStack<Object> composeStack = new ArrayStack<Object>();
-
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
- .andReturn(composeStack);
- tModel.execute(container, composeStack, "myName", "myValue",
- "myExpression", null, "myRole", "myType",
- false, velocityContext, request, response);
-
- replay(tModel, container, servletContext, request, response, velocityContext);
- initializeModel();
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.execute(request, response, velocityContext, params));
- verify(tModel, container, servletContext, request, response, velocityContext);
- }
-
- /**
- * Test method for {@link org.apache.tiles.velocity.template.PutAttributeVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link PutAttributeDirective#start(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
public void testStart() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class);
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<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, servletContext, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
initializeModel();
- model.start(request, response, velocityContext, params);
- assertEquals(1, parameterMapStack.size());
- assertEquals(params, parameterMapStack.peek());
- verify(tModel, servletContext, request, response, velocityContext);
+ model.start(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.PutAttributeVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
+ * Test method for {@link PutAttributeDirective#end(InternalContextAdapter,
+ * Writer, Map, String, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
public void testEnd() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ 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>();
@@ -148,16 +107,14 @@
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(parameterMapStack);
tModel.end(container, composeStack, "myName", "myValue",
- "myExpression", null, "myRole", "myType",
- false, velocityContext, request, response);
+ "myExpression", "myBody", "myRole", "myType",
+ false, velocityContext, request, response, writer);
- replay(tModel, container, servletContext, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext, container);
initializeModel();
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
- assertTrue(parameterMapStack.isEmpty());
- verify(tModel, container, servletContext, request, response, velocityContext);
+ model.end(velocityContext, writer, params, "myBody", request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext, container);
}
/**
@@ -180,6 +137,6 @@
* Initializes the model.
*/
private void initializeModel() {
- model = new PutAttributeVModel(tModel, servletContext);
+ model = new PutAttributeDirective(tModel);
}
}
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java (from r831446, 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/PutListAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/PutListAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,8 +23,8 @@
import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
-import static org.junit.Assert.*;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
@@ -36,25 +36,19 @@
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.apache.velocity.context.InternalContextAdapter;
import org.junit.Before;
import org.junit.Test;
/**
- * Tests {@link PutListAttributeVModel}.
+ * Tests {@link PutListAttributeDirective}.
*/
-public class PutListAttributeVModelTest {
-
- /**
- * The attribute key that will be used to store the parameter map, to use across Velocity tool calls.
- */
- private static final String PARAMETER_MAP_STACK_KEY = "org.apache.tiles.velocity.PARAMETER_MAP_STACK";
+public class PutListAttributeDirectiveTest {
/**
* The model to test.
*/
- private PutListAttributeVModel model;
+ private PutListAttributeDirective model;
/**
* The template model.
@@ -62,73 +56,61 @@
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 method for {@link PutListAttributeDirective#start(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
public void testStart() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ InternalContextAdapter velocityContext = createMock(InternalContextAdapter.class);
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<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);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
initializeModel();
- model.start(request, response, velocityContext, params);
- assertEquals(1, parameterMapStack.size());
- assertEquals(params, parameterMapStack.peek());
- verify(tModel, servletContext, request, response, velocityContext);
+ model.start(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext);
}
/**
- * 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 method for {@link Directive#end(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
*/
@Test
public void testEnd() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.class);
+ 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();
- ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<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);
+ replay(tModel, request, response, velocityContext, writer, servletContext, container);
initializeModel();
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
- assertTrue(parameterMapStack.isEmpty());
- verify(tModel, servletContext, container, request, response, velocityContext);
+ model.end(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext, container);
}
/**
@@ -149,6 +131,6 @@
* Initializes the model.
*/
private void initializeModel() {
- model = new PutListAttributeVModel(tModel, servletContext);
+ model = new PutListAttributeDirective(tModel);
}
}