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 [1/2] - in /tiles/framework/trunk/tiles-velocity/src:
main/java/org/apache/tiles/velocity/template/
test/java/org/apache/tiles/velocity/template/
Author: apetrelli
Date: Sat Jan 23 13:31:17 2010
New Revision: 902403
URL: http://svn.apache.org/viewvc?rev=902403&view=rev
Log:
TILES-490
Moved test cases for VModel to Directives.
Some general cleanup.
Added:
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeDirectiveTest.java
- copied, changed from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
Removed:
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertTemplateVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutAttributeVModelTest.java
tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/PutListAttributeVModelTest.java
Modified:
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -48,6 +48,25 @@
*/
private AddAttributeModel model = new AddAttributeModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public AddAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public AddAttributeDirective(AddAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -56,7 +75,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, String body,
HttpServletRequest request, HttpServletResponse response,
ServletContext servletContext) {
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -48,6 +48,25 @@
*/
private AddListAttributeModel model = new AddListAttributeModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public AddListAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public AddListAttributeDirective(AddListAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -56,7 +75,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext) {
model.end(ServletUtil.getComposeStack(request));
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/BodyExecutable.java Sat Jan 23 13:31:17 2010
@@ -35,7 +35,9 @@
*
* @version $Rev$ $Date$
* @since 2.2.0
+ * @deprecated Use Velocity directives.
*/
+@Deprecated
public interface BodyExecutable {
/**
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java Sat Jan 23 13:31:17 2010
@@ -51,6 +51,25 @@
*/
private DefinitionModel model = new DefinitionModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public DefinitionDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public DefinitionDirective(DefinitionModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -59,7 +78,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext) {
model.end((MutableTilesContainer) ServletUtil.getCurrentContainer(
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/Executable.java Sat Jan 23 13:31:17 2010
@@ -34,7 +34,9 @@
*
* @version $Rev$ $Date$
* @since 2.2.0
+ * @deprecated Use Velocity directives.
*/
+@Deprecated
public interface Executable {
/**
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java Sat Jan 23 13:31:17 2010
@@ -56,6 +56,25 @@
private GetAsStringModel model = new GetAsStringModel(
new DefaultAttributeResolver());
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public GetAsStringDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public GetAsStringDirective(GetAsStringModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -64,7 +83,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext)
throws IOException {
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -52,6 +52,25 @@
*/
private ImportAttributeModel model = new ImportAttributeModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public ImportAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public ImportAttributeDirective(ImportAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -56,6 +56,25 @@
private InsertAttributeModel model = new InsertAttributeModel(
new DefaultAttributeResolver());
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public InsertAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public InsertAttributeDirective(InsertAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -64,7 +83,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext)
throws IOException {
@@ -86,7 +105,7 @@
.get("defaultValue"), (String) params.get("defaultValueRole"),
(String) params.get("defaultValueType"), (String) params
.get("name"), (Attribute) params.get("value"), context,
- request, response);
+ request, response, writer);
}
}
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java Sat Jan 23 13:31:17 2010
@@ -51,6 +51,25 @@
*/
private InsertDefinitionModel model = new InsertDefinitionModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public InsertDefinitionDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public InsertDefinitionDirective(InsertDefinitionModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -59,7 +78,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext) {
model.end(ServletUtil.getCurrentContainer(request,
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java Sat Jan 23 13:31:17 2010
@@ -51,6 +51,25 @@
*/
private InsertTemplateModel model = new InsertTemplateModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public InsertTemplateDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public InsertTemplateDirective(InsertTemplateModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -59,7 +78,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext) {
model.end(ServletUtil.getCurrentContainer(request, servletContext),
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -52,6 +52,25 @@
*/
private PutAttributeModel model = new PutAttributeModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public PutAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public PutAttributeDirective(PutAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
public String getName() {
@@ -60,7 +79,7 @@
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, String body,
HttpServletRequest request, HttpServletResponse response,
ServletContext servletContext) {
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java?rev=902403&r1=902402&r2=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java Sat Jan 23 13:31:17 2010
@@ -49,9 +49,28 @@
*/
private PutListAttributeModel model = new PutListAttributeModel();
+ /**
+ * Default constructor.
+ *
+ * @since 2.2.2
+ */
+ public PutListAttributeDirective() {
+ // Does nothing.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param model The used model.
+ * @since 2.2.2
+ */
+ public PutListAttributeDirective(PutListAttributeModel model) {
+ this.model = model;
+ }
+
/** {@inheritDoc} */
@Override
- public void end(InternalContextAdapter context, Writer writer,
+ protected void end(InternalContextAdapter context, Writer writer,
Map<String, Object> params, HttpServletRequest request,
HttpServletResponse response, ServletContext servletContext) {
model.end(ServletUtil.getCurrentContainer(request, servletContext),
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java (from r831446, 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/AddAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/AddAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,36 +23,31 @@
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;
+import javax.servlet.ServletContext;
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.template.AddAttributeModel;
-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 AddAttributeVModel}.
+ * Tests {@link AddAttributeDirective}.
*/
-public class AddAttributeVModelTest {
-
- /**
- * 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 AddAttributeDirectiveTest {
/**
* The model to test.
*/
- private AddAttributeVModel model;
+ private AddAttributeDirective model;
/**
* The template model.
@@ -65,81 +60,53 @@
@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();
- ArrayStack<Object> composeStack = new ArrayStack<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);
+ model = new AddAttributeDirective(tModel);
}
/**
- * 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 method for {@link AddAttributeDirective#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);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
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);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
+ model.start(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext);
}
/**
- * 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 method for {@link AddAttributeDirective#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);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> parameterMapStack = new ArrayStack<Map<String, Object>>();
- parameterMapStack.push(params);
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
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");
+ "myBody", "myRole", "myType");
- replay(tModel, request, response, velocityContext);
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
- assertTrue(parameterMapStack.isEmpty());
+ replay(tModel, request, response, velocityContext, writer, servletContext);
+ model.end(velocityContext, writer, params, "myBody", request, response, servletContext);
verify(tModel, request, response, velocityContext);
}
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AddListAttributeDirectiveTest.java (from r831446, 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/AddListAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/AddListAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&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/AddListAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,31 +23,31 @@
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;
+import javax.servlet.ServletContext;
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.template.AddListAttributeModel;
-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 AddListAttributeVModel}.
+ * Tests {@link AddListAttributeDirective}.
*/
-public class AddListAttributeVModelTest {
+public class AddListAttributeDirectiveTest {
/**
* The model to test.
*/
- private AddListAttributeVModel model;
+ private AddListAttributeDirective model;
/**
* The template model.
@@ -60,50 +60,53 @@
@Before
public void setUp() {
tModel = createMock(AddListAttributeModel.class);
- model = new AddListAttributeVModel(tModel);
+ model = new AddListAttributeDirective(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 method for {@link AddListAttributeDirective#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);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
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);
- verify(tModel, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
+ model.start(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext);
}
/**
- * 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 method for {@link AddListAttributeDirective#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);
+ Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
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));
- verify(tModel, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
+ model.end(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java?p2=tiles/framework/trunk/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/DefinitionVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/DefinitionDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,9 +23,8 @@
import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
-import static org.junit.Assert.*;
-import java.io.IOException;
+import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
@@ -37,20 +36,19 @@
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.DefinitionModel;
-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 DefinitionVModel}.
+ * Tests {@link DefinitionDirective}.
*/
-public class DefinitionVModelTest {
+public class DefinitionDirectiveTest {
/**
* The model to test.
*/
- private DefinitionVModel model;
+ private DefinitionDirective model;
/**
* The template model.
@@ -58,80 +56,49 @@
private DefinitionModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* Sets up the model to test.
*/
@Before
public void setUp() {
tModel = createMock(DefinitionModel.class);
- servletContext = createMock(ServletContext.class);
- }
-
- /**
- * Test method for {@link org.apache.tiles.velocity.template.DefinitionVModel
- * #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);
- MutableTilesContainer container = createMock(MutableTilesContainer.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", "myTemplate", "myRole", "myExtends", "myPreparer",
- velocityContext, request, response);
-
- replay(tModel, servletContext, request, response, velocityContext, container);
- initializeModel();
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.execute(request, response, velocityContext, params));
- verify(tModel, servletContext, request, response, velocityContext, container);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.DefinitionVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link DefinitionDirective#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);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
tModel.start(composeStack, "myName", "myTemplate", "myRole", "myExtends", "myPreparer");
- replay(tModel, servletContext, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
initializeModel();
- model.start(request, response, velocityContext, params);
- 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.DefinitionVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
- * @throws IOException If something goes wrong.
+ * Test method for {@link DefinitionDirective#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);
+ Map<String, Object> params = createParams();
MutableTilesContainer container = createMock(MutableTilesContainer.class);
ArrayStack<Object> composeStack = new ArrayStack<Object>();
@@ -140,17 +107,17 @@
.andReturn(composeStack);
tModel.end(container, composeStack, velocityContext, request, response);
- replay(tModel, servletContext, request, response, velocityContext, container);
+ replay(tModel, request, response, velocityContext, writer, servletContext, container);
initializeModel();
- assertEquals(VelocityUtil.EMPTY_RENDERABLE, model.end(request, response, velocityContext));
- verify(tModel, servletContext, request, response, velocityContext, container);
+ model.end(velocityContext, writer, params, request, response, servletContext);
+ verify(tModel, request, response, velocityContext, writer, servletContext, container);
}
/**
* Initializes the model.
*/
private void initializeModel() {
- model = new DefinitionVModel(tModel, servletContext);
+ model = new DefinitionDirective(tModel);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java?p2=tiles/framework/trunk/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/GetAsStringVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/GetAsStringDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,10 +23,8 @@
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;
@@ -40,26 +38,19 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.GetAsStringModel;
-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 GetAsStringVModel}.
+ * Tests {@link GetAsStringDirective}.
*/
-public class GetAsStringVModelTest {
-
- /**
- * 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 GetAsStringDirectiveTest {
/**
* The model to test.
*/
- private GetAsStringVModel model;
+ private GetAsStringDirective model;
/**
* The template model.
@@ -67,11 +58,6 @@
private GetAsStringModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* The attribute value.
*/
private Attribute attribute;
@@ -82,84 +68,51 @@
@Before
public void setUp() {
tModel = createMock(GetAsStringModel.class);
- servletContext = createMock(ServletContext.class);
- attribute = new Attribute("myAttributeValue");
- }
-
- /**
- * Test method for {@link org.apache.tiles.velocity.template.GetAsStringVModel
- * #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();
attribute = new Attribute("myAttributeValue");
- Map<String, Object> params = createParams();
-
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(container, writer, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute,
- 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.GetAsStringVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link GetAsStringDirective#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);
TilesContainer container = createMock(TilesContainer.class);
Map<String, Object> params = createParams();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
+ Writer writer = createMock(Writer.class);
+ ServletContext servletContext = createMock(ServletContext.class);
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
"myDefaultValueRole", "myDefaultValueType", "myName", attribute,
- velocityContext, request, response);
+ velocityContext, request, response, writer);
- replay(tModel, servletContext, container, request, response, velocityContext);
+ replay(tModel, request, response, velocityContext, writer, servletContext);
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);
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.GetAsStringVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
+ * Test method for {@link GetAsStringDirective#end(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
+ *
* @throws IOException If something goes wrong.
*/
@Test
public void testEnd() throws IOException {
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();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
Map<String, Object> params = createParams();
ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
@@ -168,22 +121,19 @@
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(paramStack);
tModel.end(composeStack, container, writer, false, 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 GetAsStringVModel(tModel, servletContext);
+ model = new GetAsStringDirective(tModel);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/ImportAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/ImportAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -21,9 +21,9 @@
package org.apache.tiles.velocity.template;
+import static org.easymock.EasyMock.*;
import static org.easymock.classextension.EasyMock.*;
-import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
import java.util.HashMap;
@@ -37,21 +37,22 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.ImportAttributeModel;
-import org.apache.velocity.context.Context;
import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.Renderable;
+import org.apache.velocity.runtime.parser.node.ASTMap;
+import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.velocity.tools.view.ViewToolContext;
import org.junit.Before;
import org.junit.Test;
/**
- * Tests {@link ImportAttributeVModel}.
+ * Tests {@link ImportAttributeDirective}.
*/
-public class ImportAttributeVModelTest {
+public class ImportAttributeDirectiveTest {
/**
* The model to test.
*/
- private ImportAttributeVModel model;
+ private ImportAttributeDirective model;
/**
* The template model.
@@ -59,64 +60,65 @@
private ImportAttributeModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* Sets up the model to test.
*/
@Before
public void setUp() {
tModel = createMock(ImportAttributeModel.class);
- servletContext = createMock(ServletContext.class);
}
/**
- * 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)}.
- * @throws IOException If something goes wrong.
+ * Test method for {@link ImportAttributeDirective#render(InternalContextAdapter, Writer, Node)}.
*/
@Test
- public void testExecutePage() throws IOException {
+ public void testExecutePage() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.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);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.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");
+ 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(internalContextAdapter.put("one", "value1")).andReturn("value1");
- expect(internalContextAdapter.put("two", "value2")).andReturn("value2");
+ expect(velocityContext.put("one", "value1")).andReturn("value1");
+ expect(velocityContext.put("two", "value2")).andReturn("value2");
- replay(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap);
initializeModel();
- Renderable renderable = model.execute(request, response, velocityContext, params);
- renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ 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)}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testExecuteRequest() throws IOException {
+ public void testExecuteRequest() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.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);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
params.put("scope", "request");
@@ -124,33 +126,40 @@
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, internalContextAdapter);
+ replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap);
initializeModel();
- Renderable renderable = model.execute(request, response, velocityContext, params);
- renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ 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)}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testExecuteSession() throws IOException {
+ public void testExecuteSession() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
HttpSession session = createMock(HttpSession.class);
- Context velocityContext = createMock(Context.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);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
params.put("scope", "session");
@@ -158,6 +167,12 @@
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);
@@ -165,26 +180,27 @@
session.setAttribute("one", "value1");
session.setAttribute("two", "value2");
- replay(tModel, servletContext, request, response, session, velocityContext, container, internalContextAdapter);
+ replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap);
initializeModel();
- Renderable renderable = model.execute(request, response, velocityContext, params);
- renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, session, velocityContext, container, internalContextAdapter);
+ 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)}.
- * @throws IOException If something goes wrong.
*/
@Test
- public void testExecuteApplication() throws IOException {
+ public void testExecuteApplication() {
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
- Context velocityContext = createMock(Context.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);
- InternalContextAdapter internalContextAdapter = createMock(InternalContextAdapter.class);
Writer writer = new StringWriter();
Map<String, Object> params = createParams();
params.put("scope", "application");
@@ -192,24 +208,29 @@
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, internalContextAdapter);
+ replay(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap);
initializeModel();
- Renderable renderable = model.execute(request, response, velocityContext, params);
- renderable.render(internalContextAdapter, writer);
- verify(tModel, servletContext, request, response, velocityContext, container, internalContextAdapter);
+ model.render(velocityContext, writer, node);
+ verify(tModel, servletContext, request, response, velocityContext, container, node, viewContext, astMap);
}
/**
* Initializes the model.
*/
private void initializeModel() {
- model = new ImportAttributeVModel(tModel, servletContext);
+ model = new ImportAttributeDirective(tModel);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java?p2=tiles/framework/trunk/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/InsertAttributeVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertAttributeDirectiveTest.java Sat Jan 23 13:31:17 2010
@@ -23,10 +23,8 @@
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;
@@ -40,26 +38,19 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertAttributeModel;
-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 InsertAttributeVModel}.
+ * Tests {@link InsertAttributeDirective}.
*/
-public class InsertAttributeVModelTest {
-
- /**
- * 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 InsertAttributeDirectiveTest {
/**
* The model to test.
*/
- private InsertAttributeVModel model;
+ private InsertAttributeDirective model;
/**
* The template model.
@@ -67,11 +58,6 @@
private InsertAttributeModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* The attribute value.
*/
private Attribute attribute;
@@ -82,108 +68,70 @@
@Before
public void setUp() {
tModel = createMock(InsertAttributeModel.class);
- servletContext = createMock(ServletContext.class);
attribute = new Attribute("myAttributeValue");
}
/**
- * Test method for {@link org.apache.tiles.velocity.template.InsertAttributeVModel
- * #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();
- attribute = new Attribute("myAttributeValue");
- Map<String, Object> params = createParams();
-
- expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- tModel.execute(container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute,
- 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.InsertAttributeVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link InsertAttributeDirective#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<Object> composeStack = new ArrayStack<Object>();
- ArrayStack<Map<String, Object>> paramStack = new ArrayStack<Map<String, Object>>();
expect(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
expect(request.getAttribute(ServletUtil.CURRENT_CONTAINER_ATTRIBUTE_NAME)).andReturn(container);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
"myDefaultValueRole", "myDefaultValueType", "myName", attribute,
- velocityContext, request, response);
+ velocityContext, request, response, writer);
- 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.InsertAttributeVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
+ * Test method for {@link InsertAttributeDirective#end(InternalContextAdapter,
+ * Writer, Map, HttpServletRequest, HttpServletResponse, ServletContext)}.
+ *
* @throws IOException If something goes wrong.
*/
@Test
public void testEnd() throws IOException {
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();
ArrayStack<Object> composeStack = new ArrayStack<Object>();
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(request.getAttribute(ServletUtil.COMPOSE_STACK_ATTRIBUTE_NAME))
.andReturn(composeStack);
- expect(velocityContext.get(PARAMETER_MAP_STACK_KEY)).andReturn(paramStack);
tModel.end(composeStack, container, false, 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 InsertAttributeVModel(tModel, servletContext);
+ model = new InsertAttributeDirective(tModel);
}
/**
Copied: tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java (from r831446, tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.java?p2=tiles/framework/trunk/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/InsertDefinitionVModelTest.java&r1=831446&r2=902403&rev=902403&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionVModelTest.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/InsertDefinitionDirectiveTest.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;
@@ -39,26 +36,19 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.template.InsertDefinitionModel;
-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 InsertDefinitionVModel}.
+ * Tests {@link InsertDefinitionDirective}.
*/
-public class InsertDefinitionVModelTest {
-
- /**
- * 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 InsertDefinitionDirectiveTest {
/**
* The model to test.
*/
- private InsertDefinitionVModel model;
+ private InsertDefinitionDirective model;
/**
* The template model.
@@ -66,110 +56,68 @@
private InsertDefinitionModel tModel;
/**
- * The servlet context.
- */
- private ServletContext servletContext;
-
- /**
* Sets up the model to test.
*/
@Before
public void setUp() {
tModel = createMock(InsertDefinitionModel.class);
- servletContext = createMock(ServletContext.class);
- }
-
- /**
- * Test method for {@link org.apache.tiles.velocity.template.InsertDefinitionVModel
- * #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, "myDefinitionName", "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.InsertDefinitionVModel
- * #start(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context, java.util.Map)}.
+ * Test method for {@link InsertDefinitionDirective#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.InsertDefinitionVModel
- * #end(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
- * org.apache.velocity.context.Context)}.
- * @throws IOException If something goes wrong.
+ * Test method for {@link InsertDefinitionDirective#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, "myDefinitionName", "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 InsertDefinitionVModel(tModel, servletContext);
+ model = new InsertDefinitionDirective(tModel);
}
/**