You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/11/14 14:40:33 UTC
svn commit: r836174 [3/5] - in /tiles/sandbox/trunk:
tiles-request/tiles-request-freemarker/src/main/java/org/apache/tiles/freemarker/context/
tiles-request/tiles-request-jsp/src/main/java/org/apache/tiles/jsp/context/
tiles-request/tiles-request-veloc...
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Sat Nov 14 13:40:31 2009
@@ -19,22 +19,24 @@
* under the License.
*/
-
package org.apache.tiles.jsp.taglib;
import java.util.Map;
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import javax.servlet.jsp.tagext.TagData;
import javax.servlet.jsp.tagext.TagExtraInfo;
import javax.servlet.jsp.tagext.VariableInfo;
+import org.apache.tiles.TilesContainer;
import org.apache.tiles.jsp.JspUtil;
+import org.apache.tiles.jsp.context.JspTilesRequestContext;
+import org.apache.tiles.request.Request;
import org.apache.tiles.template.ImportAttributeModel;
-
/**
* Exposes am attribute as a scripting variable within the page.
*
@@ -43,178 +45,189 @@
*/
public class UseAttributeTag extends SimpleTagSupport {
- /**
- * The template model.
- */
- private ImportAttributeModel model = new ImportAttributeModel();
-
- /**
- * The id of the imported scripting variable.
- */
- private String id;
-
- /**
- * The scope name.
- */
- private String scopeName = null;
-
- /**
- * The name of the attribute.
- */
- private String name = null;
-
- /**
- * Flag that, if <code>true</code>, ignores exceptions.
- */
- private boolean ignore = false;
-
- /**
- * Class name of object.
- */
- private String classname = null;
-
- /**
- * Returns the id of the imported scripting variable.
- *
- * @return The id of the imported scripting variable.
- * @since 2.2.0
- */
- public String getId() {
- return id;
- }
-
- /**
- * Sets the id of the imported scripting variable.
- *
- * @param id The id of the imported scripting variable.
- * @since 2.2.0
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * Set the scope.
- *
- * @param scope Scope.
- */
- public void setScope(String scope) {
- this.scopeName = scope;
- }
-
- /**
- * Get scope.
- *
- * @return Scope.
- */
- public String getScope() {
- return scopeName;
- }
-
- /**
- * Get the name.
- *
- * @return Name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Set the name.
- *
- * @param name The new name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Set ignore flag.
- *
- * @param ignore default: <code>false</code>: Exception is thrown when attribute is not found, set to <code>
- * true</code> to ignore missing attributes silently
- */
- public void setIgnore(boolean ignore) {
- this.ignore = ignore;
- }
-
- /**
- * Get ignore flag.
- *
- * @return default: <code>false</code>: Exception is thrown when attribute is not found, set to <code>
- * true</code> to ignore missing attributes silently
- */
- public boolean isIgnore() {
- return ignore;
- }
-
- /**
- * Get class name.
- *
- * @return class name
- */
- public String getClassname() {
- return classname;
-
- }
-
- /**
- * Set the class name.
- *
- * @param name The new class name.
- */
- public void setClassname(String name) {
- this.classname = name;
- }
-
- /** {@inheritDoc} */
- @Override
- public void doTag() throws JspException {
- JspContext pageContext = getJspContext();
- Map<String, Object> attributes = model.getImportedAttributes(JspUtil
- .getCurrentContainer(pageContext), name, id, ignore,
- pageContext);
- if (!attributes.isEmpty()) {
- int scopeId = JspUtil.getScope(scopeName);
- pageContext.setAttribute(getScriptingVariable(), attributes
- .values().iterator().next(), scopeId);
- }
- }
-
- /**
- * Returns the scripting variable to use.
- *
- * @return The scripting variable.
- */
- public String getScriptingVariable() {
- return id == null ? getName() : id;
- }
-
-
- /**
- * Implementation of <code>TagExtraInfo</code> which identifies
- * the scripting object(s) to be made visible.
- */
- public static class Tei extends TagExtraInfo {
+ /**
+ * The template model.
+ */
+ private ImportAttributeModel model = new ImportAttributeModel();
+
+ /**
+ * The id of the imported scripting variable.
+ */
+ private String id;
+
+ /**
+ * The scope name.
+ */
+ private String scopeName = null;
+
+ /**
+ * The name of the attribute.
+ */
+ private String name = null;
+
+ /**
+ * Flag that, if <code>true</code>, ignores exceptions.
+ */
+ private boolean ignore = false;
+
+ /**
+ * Class name of object.
+ */
+ private String classname = null;
+
+ /**
+ * Returns the id of the imported scripting variable.
+ *
+ * @return The id of the imported scripting variable.
+ * @since 2.2.0
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * Sets the id of the imported scripting variable.
+ *
+ * @param id
+ * The id of the imported scripting variable.
+ * @since 2.2.0
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * Set the scope.
+ *
+ * @param scope
+ * Scope.
+ */
+ public void setScope(String scope) {
+ this.scopeName = scope;
+ }
+
+ /**
+ * Get scope.
+ *
+ * @return Scope.
+ */
+ public String getScope() {
+ return scopeName;
+ }
+
+ /**
+ * Get the name.
+ *
+ * @return Name.
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Set the name.
+ *
+ * @param name
+ * The new name
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Set ignore flag.
+ *
+ * @param ignore
+ * default: <code>false</code>: Exception is thrown when
+ * attribute is not found, set to <code>
+ * true</code> to
+ * ignore missing attributes silently
+ */
+ public void setIgnore(boolean ignore) {
+ this.ignore = ignore;
+ }
+
+ /**
+ * Get ignore flag.
+ *
+ * @return default: <code>false</code>: Exception is thrown when attribute
+ * is not found, set to <code>
+ * true</code> to ignore missing
+ * attributes silently
+ */
+ public boolean isIgnore() {
+ return ignore;
+ }
+
+ /**
+ * Get class name.
+ *
+ * @return class name
+ */
+ public String getClassname() {
+ return classname;
+
+ }
+
+ /**
+ * Set the class name.
+ *
+ * @param name
+ * The new class name.
+ */
+ public void setClassname(String name) {
+ this.classname = name;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void doTag() throws JspException {
+ JspContext jspContext = getJspContext();
+ TilesContainer currentContainer = JspUtil
+ .getCurrentContainer(jspContext);
+ Request request = JspTilesRequestContext.createServletJspRequest(
+ currentContainer.getApplicationContext(),
+ (PageContext) jspContext);
+ Map<String, Object> attributes = model.getImportedAttributes(
+ currentContainer, name, id, ignore, request);
+ if (!attributes.isEmpty()) {
+ int scopeId = JspUtil.getScope(scopeName);
+ jspContext.setAttribute(getScriptingVariable(), attributes
+ .values().iterator().next(), scopeId);
+ }
+ }
+
+ /**
+ * Returns the scripting variable to use.
+ *
+ * @return The scripting variable.
+ */
+ public String getScriptingVariable() {
+ return id == null ? getName() : id;
+ }
+
+ /**
+ * Implementation of <code>TagExtraInfo</code> which identifies the
+ * scripting object(s) to be made visible.
+ */
+ public static class Tei extends TagExtraInfo {
- /** {@inheritDoc} */
- @Override
+ /** {@inheritDoc} */
+ @Override
public VariableInfo[] getVariableInfo(TagData data) {
- String classname = data.getAttributeString("classname");
- if (classname == null) {
- classname = "java.lang.Object";
- }
-
- String id = data.getAttributeString("id");
- if (id == null) {
- id = data.getAttributeString("name");
- }
-
- return new VariableInfo[] {
- new VariableInfo(id, classname, true, VariableInfo.AT_END)
- };
+ String classname = data.getAttributeString("classname");
+ if (classname == null) {
+ classname = "java.lang.Object";
+ }
+
+ String id = data.getAttributeString("id");
+ if (id == null) {
+ id = data.getAttributeString("name");
+ }
+
+ return new VariableInfo[] { new VariableInfo(id, classname, true,
+ VariableInfo.AT_END) };
- }
- }
+ }
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java Sat Nov 14 13:40:31 2009
@@ -33,11 +33,14 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -230,12 +233,15 @@
TilesContainer container = ServletUtil.getContainer(
getServletContext(), containerKey);
- mutator.mutate(container.getAttributeContext(req, res), req);
+ Request request = new ServletTilesRequestContext(container
+ .getApplicationContext(), (HttpServletRequest) req,
+ (HttpServletResponse) res);
+ mutator.mutate(container.getAttributeContext(request), req);
if (preventDecorationToken != null) {
req.setAttribute(preventDecorationToken, Boolean.TRUE);
}
String definitionName = getDefinitionForRequest(req);
- container.render(definitionName, req, res);
+ container.render(definitionName, request);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Sat Nov 14 13:40:31 2009
@@ -31,6 +31,8 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.request.Request;
+import org.apache.tiles.request.servlet.ServletTilesRequestContext;
import org.apache.tiles.servlet.context.ServletUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,12 +96,15 @@
TilesContainer container = ServletUtil.getContainer(
getServletContext(), containerKey);
- mutator.mutate(container.getAttributeContext(req, res), req);
+ Request request = new ServletTilesRequestContext(container
+ .getApplicationContext(), (HttpServletRequest) req,
+ (HttpServletResponse) res);
+ mutator.mutate(container.getAttributeContext(request), req);
String definition = getDefinitionName(req);
if (log.isDebugEnabled()) {
log.info("Dispatching to tile '" + definition + "'");
}
- container.render(definition, req, res);
+ container.render(definition, request);
}
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java Sat Nov 14 13:40:31 2009
@@ -23,6 +23,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* Resolves an attribute, depending on the given parameters.
@@ -44,11 +45,11 @@
* @param defaultValue The default value of the attribute. To use only if the attribute was not computed.
* @param defaultValueRole The default comma-separated list of roles. To use only if the attribute was not computed.
* @param defaultValueType The default type of the attribute. To use only if the attribute was not computed.
- * @param requestItems The request objects.
+ * @param request TODO
* @return The computed attribute.
* @since 2.2.0
*/
Attribute computeAttribute(TilesContainer container, Attribute attribute,
String name, String role, boolean ignore,
- Object defaultValue, String defaultValueRole, String defaultValueType, Object... requestItems);
+ Object defaultValue, String defaultValueRole, String defaultValueType, Request request);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java Sat Nov 14 13:40:31 2009
@@ -25,6 +25,7 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* The default implementation of AttributeResolver.
@@ -37,10 +38,10 @@
/** {@inheritDoc} */
public Attribute computeAttribute(TilesContainer container, Attribute attribute,
String name, String role, boolean ignore,
- Object defaultValue, String defaultValueRole, String defaultValueType, Object... requestItems) {
+ Object defaultValue, String defaultValueRole, String defaultValueType, Request request) {
if (attribute == null) {
AttributeContext evaluatingContext = container
- .getAttributeContext(requestItems);
+ .getAttributeContext(request);
attribute = evaluatingContext.getAttribute(name);
if (attribute == null) {
attribute = computeDefaultAttribute(defaultValue,
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Sat Nov 14 13:40:31 2009
@@ -27,6 +27,7 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,16 +86,16 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void start(ArrayStack<Object> composeStack, TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) {
+ Attribute value, Request request) {
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
- value, requestItems);
+ value, request);
composeStack.push(attribute);
}
@@ -106,14 +107,14 @@
* @param writer The writer into which the attribute will be written.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param request TODO
* @throws IOException If an I/O error happens during rendering.
*/
public void end(ArrayStack<Object> composeStack, TilesContainer container,
- Writer writer, boolean ignore, Object... requestItems)
+ Writer writer, boolean ignore, Request request)
throws IOException {
Attribute attribute = (Attribute) composeStack.pop();
- renderAttribute(attribute, container, writer, ignore, requestItems);
+ renderAttribute(attribute, container, writer, ignore, request);
}
/**
@@ -134,18 +135,18 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @throws IOException If an I/O error happens during rendering.
* @since 2.2.0
*/
public void execute(TilesContainer container, Writer writer,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) throws IOException {
+ Attribute value, Request request) throws IOException {
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
- value, requestItems);
- renderAttribute(attribute, container, writer, ignore, requestItems);
+ value, request);
+ renderAttribute(attribute, container, writer, ignore, request);
}
/**
@@ -165,20 +166,20 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @return The resolved attribute.
*/
private Attribute resolveAttribute(TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) {
+ Attribute value, Request request) {
if (preparer != null) {
- container.prepare(preparer, requestItems);
+ container.prepare(preparer, request);
}
Attribute attribute = attributeResolver.computeAttribute(container,
value, name, role, ignore, defaultValue, defaultValueRole,
- defaultValueType, requestItems);
- container.startContext(requestItems);
+ defaultValueType, request);
+ container.startContext(request);
return attribute;
}
@@ -190,11 +191,11 @@
* @param writer The writer into which the attribute will be written.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param request TODO
* @throws IOException If an I/O error happens during rendering.
*/
private void renderAttribute(Attribute attribute, TilesContainer container,
- Writer writer, boolean ignore, Object... requestItems)
+ Writer writer, boolean ignore, Request request)
throws IOException {
if (attribute == null && ignore) {
return;
@@ -214,7 +215,7 @@
log.debug("Ignoring exception", e);
}
} finally {
- container.endContext(requestItems);
+ container.endContext(request);
}
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java Sat Nov 14 13:40:31 2009
@@ -28,6 +28,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,26 +63,26 @@
* if <code>name</code> is specified.
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param request TODO
* @return A Map of the attributes to be imported: the key is the name of an
* attribute, the value is the value of that attribute.
* @since 2.2.0
*/
public Map<String, Object> getImportedAttributes(TilesContainer container,
- String name, String toName, boolean ignore, Object... requestItems) {
+ String name, String toName, boolean ignore, Request request) {
Map<String, Object> retValue = new HashMap<String, Object>();
AttributeContext attributeContext = container
- .getAttributeContext(requestItems);
+ .getAttributeContext(request);
// Some tags allow for unspecified attributes. This
// implies that the tag should use all of the attributes.
if (name != null) {
importSingleAttribute(container, attributeContext, name, toName,
- ignore, retValue, requestItems);
+ ignore, retValue, request);
} else {
importAttributes(attributeContext.getCascadedAttributeNames(),
- container, attributeContext, retValue, ignore, requestItems);
+ container, attributeContext, retValue, ignore, request);
importAttributes(attributeContext.getLocalAttributeNames(),
- container, attributeContext, retValue, ignore, requestItems);
+ container, attributeContext, retValue, ignore, request);
}
return retValue;
}
@@ -98,17 +99,17 @@
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
* @param attributes The map of the attributes to fill.
- * @param requestItems The request objects.
+ * @param request TODO
*/
private void importSingleAttribute(TilesContainer container,
AttributeContext attributeContext, String name, String toName,
boolean ignore, Map<String, Object> attributes,
- Object... requestItems) {
+ Request request) {
Attribute attr = attributeContext.getAttribute(name);
if (attr != null) {
try {
Object attributeValue = container.evaluate(attr,
- requestItems);
+ request);
if (attributeValue == null) {
if (!ignore) {
throw new NoSuchAttributeException(
@@ -146,12 +147,12 @@
* @param attributes The map of the attributes to fill.
* @param ignore If <code>true</code> and the attribute is not found, or an
* exception happens, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param request TODO
*/
private void importAttributes(Collection<String> names,
TilesContainer container, AttributeContext attributeContext,
Map<String, Object> attributes, boolean ignore,
- Object... requestItems) {
+ Request request) {
if (names == null || names.isEmpty()) {
return;
}
@@ -166,7 +167,7 @@
}
importSingleAttribute(container, attributeContext, name, name,
- ignore, attributes, requestItems);
+ ignore, attributes, request);
}
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Sat Nov 14 13:40:31 2009
@@ -26,6 +26,7 @@
import org.apache.tiles.ArrayStack;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,16 +98,16 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void start(ArrayStack<Object> composeStack, TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) {
+ Attribute value, Request request) {
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
- value, requestItems);
+ value, request);
composeStack.push(attribute);
}
@@ -117,13 +118,13 @@
* @param container The Tiles container to use.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param request TODO
* @throws IOException If an I/O error happens during rendering.
*/
public void end(ArrayStack<Object> composeStack, TilesContainer container,
- boolean ignore, Object... requestItems) throws IOException {
+ boolean ignore, Request request) throws IOException {
Attribute attribute = (Attribute) composeStack.pop();
- renderAttribute(container, ignore, attribute, requestItems);
+ renderAttribute(container, ignore, attribute, request);
}
/**
@@ -143,18 +144,18 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @throws IOException If an I/O error happens during rendering.
* @since 2.2.0
*/
public void execute(TilesContainer container, boolean ignore,
String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) throws IOException {
+ Attribute value, Request request) throws IOException {
Attribute attribute = resolveAttribute(container, ignore, preparer,
role, defaultValue, defaultValueRole, defaultValueType, name,
- value, requestItems);
- renderAttribute(container, ignore, attribute, requestItems);
+ value, request);
+ renderAttribute(container, ignore, attribute, request);
}
/**
@@ -174,40 +175,40 @@
* the attribute was not computed.
* @param name The name of the attribute.
* @param value The attribute to use immediately, if not null.
- * @param requestItems The request objects.
+ * @param request TODO
* @return The resolved attribute.
*/
private Attribute resolveAttribute(TilesContainer container,
boolean ignore, String preparer, String role, Object defaultValue,
String defaultValueRole, String defaultValueType, String name,
- Attribute value, Object... requestItems) {
+ Attribute value, Request request) {
if (preparer != null) {
- container.prepare(preparer, requestItems);
+ container.prepare(preparer, request);
}
Attribute attribute = attributeResolver.computeAttribute(container,
value, name, role, ignore, defaultValue, defaultValueRole,
- defaultValueType, requestItems);
- container.startContext(requestItems);
+ defaultValueType, request);
+ container.startContext(request);
return attribute;
}
/**
* Renders the attribute as a string.
- *
- * @param attribute The attribute to use, previously resolved.
* @param container The Tiles container to use.
* @param ignore If <code>true</code>, if an exception happens during
* rendering, of if the attribute is null, the problem will be ignored.
- * @param requestItems The request objects.
+ * @param attribute The attribute to use, previously resolved.
+ * @param request TODO
+ *
* @throws IOException If an I/O error happens during rendering.
*/
private void renderAttribute(TilesContainer container, boolean ignore,
- Attribute attribute, Object... requestItems) throws IOException {
+ Attribute attribute, Request request) throws IOException {
try {
if (attribute == null && ignore) {
return;
}
- container.render(attribute, requestItems);
+ container.render(attribute, request);
} catch (IOException e) {
if (!ignore) {
throw e;
@@ -221,7 +222,7 @@
log.debug("Ignoring exception", e);
}
} finally {
- container.endContext(requestItems);
+ container.endContext(request);
}
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java Sat Nov 14 13:40:31 2009
@@ -24,6 +24,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* <p>
@@ -67,11 +68,11 @@
* Starts the operation.
*
* @param container The Tiles container.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
- public void start(TilesContainer container, Object... requestItems) {
- container.startContext(requestItems);
+ public void start(TilesContainer container, Request request) {
+ container.startContext(request);
}
/**
@@ -88,23 +89,23 @@
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void end(TilesContainer container, String definitionName,
String template, String templateType, String templateExpression,
- String role, String preparer, Object... requestItems) {
+ String role, String preparer, Request request) {
try {
AttributeContext attributeContext = container
- .getAttributeContext(requestItems);
+ .getAttributeContext(request);
Attribute templateAttribute = Attribute
.createTemplateAttribute(template);
templateAttribute.setRole(role);
attributeContext.setPreparer(preparer);
attributeContext.setTemplateAttribute(templateAttribute);
- container.render(definitionName, requestItems);
+ container.render(definitionName, request);
} finally {
- container.endContext(requestItems);
+ container.endContext(request);
}
}
@@ -122,13 +123,13 @@
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void execute(TilesContainer container, String definitionName,
String template, String templateType, String templateExpression,
- String role, String preparer, Object... requestItems) {
- start(container, requestItems);
- end(container, definitionName, template, templateType, templateExpression, role, preparer, requestItems);
+ String role, String preparer, Request request) {
+ start(container, request);
+ end(container, definitionName, template, templateType, templateExpression, role, preparer, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java Sat Nov 14 13:40:31 2009
@@ -25,6 +25,7 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* <p>
@@ -68,11 +69,11 @@
* Starts the operation.
*
* @param container The Tiles container.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
- public void start(TilesContainer container, Object... requestItems) {
- container.startContext(requestItems);
+ public void start(TilesContainer container, Request request) {
+ container.startContext(request);
}
/**
@@ -87,14 +88,14 @@
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void end(TilesContainer container, String template, String templateType,
- String templateExpression, String role, String preparer, Object... requestItems) {
+ String templateExpression, String role, String preparer, Request request) {
try {
AttributeContext attributeContext = container
- .getAttributeContext(requestItems);
+ .getAttributeContext(request);
Attribute templateAttribute = Attribute
.createTemplateAttribute(template);
templateAttribute.setRole(role);
@@ -106,9 +107,9 @@
.createExpressionFromDescribedExpression(templateExpression));
attributeContext.setPreparer(preparer);
attributeContext.setTemplateAttribute(templateAttribute);
- container.renderContext(requestItems);
+ container.renderContext(request);
} finally {
- container.endContext(requestItems);
+ container.endContext(request);
}
}
@@ -124,12 +125,12 @@
* @param preparer The preparer to use to invoke before the definition is
* rendered. If specified, it overrides the preparer specified in the
* definition itself.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void execute(TilesContainer container, String template, String templateType,
- String templateExpression, String role, String preparer, Object... requestItems) {
- start(container, requestItems);
- end(container, template, templateType, templateExpression, role, preparer, requestItems);
+ String templateExpression, String role, String preparer, Request request) {
+ start(container, request);
+ end(container, template, templateType, templateExpression, role, preparer, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java Sat Nov 14 13:40:31 2009
@@ -26,6 +26,7 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* <p>
@@ -92,15 +93,15 @@
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
* @param cascade If <code>true</code> the attribute will be cascaded to all nested attributes.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void end(TilesContainer container, ArrayStack<Object> composeStack,
String name, Object value, String expression, String body,
- String role, String type, boolean cascade, Object... requestItems) {
+ String role, String type, boolean cascade, Request request) {
Attribute attribute = (Attribute) composeStack.pop();
putAttributeInParent(attribute, container, composeStack, name, value,
- expression, body, role, type, cascade, requestItems);
+ expression, body, role, type, cascade, request);
}
/**
@@ -119,14 +120,14 @@
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
* @param cascade If <code>true</code> the attribute will be cascaded to all nested attributes.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void execute(TilesContainer container, ArrayStack<Object> composeStack,
String name, Object value, String expression, String body,
- String role, String type, boolean cascade, Object... requestItems) {
+ String role, String type, boolean cascade, Request request) {
putAttributeInParent(new Attribute(), container, composeStack, name,
- value, expression, body, role, type, cascade, requestItems);
+ value, expression, body, role, type, cascade, request);
}
/**
@@ -146,12 +147,12 @@
* will be rendered only if the current user belongs to one of the roles.
* @param type The type (renderer) of the attribute.
* @param cascade If <code>true</code> the attribute will be cascaded to all nested attributes.
- * @param requestItems The request objects.
+ * @param request TODO
*/
private void putAttributeInParent(Attribute attribute,
TilesContainer container, ArrayStack<Object> composeStack, String name,
Object value, String expression, String body, String role,
- String type, boolean cascade, Object... requestItems) {
+ String type, boolean cascade, Request request) {
AttributeContext attributeContext = null;
if (!composeStack.isEmpty()) {
Object obj = composeStack.peek();
@@ -160,7 +161,7 @@
}
}
if (attributeContext == null) {
- attributeContext = container.getAttributeContext(requestItems);
+ attributeContext = container.getAttributeContext(request);
}
if (value != null) {
attribute.setValue(value);
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java Sat Nov 14 13:40:31 2009
@@ -26,6 +26,7 @@
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
/**
* <p>
@@ -66,11 +67,11 @@
* @param composeStack The composing stack.
* @param name The name of the attribute to put.
* @param cascade If <code>true</code> the attribute will be cascaded to all nested attributes.
- * @param requestItems The request objects.
+ * @param request TODO
* @since 2.2.0
*/
public void end(TilesContainer container, ArrayStack<Object> composeStack,
- String name, boolean cascade, Object... requestItems) {
+ String name, boolean cascade, Request request) {
ListAttribute listAttribute = (ListAttribute) composeStack.pop();
AttributeContext attributeContext = null;
if (!composeStack.isEmpty()) {
@@ -80,7 +81,7 @@
}
}
if (attributeContext == null) {
- attributeContext = container.getAttributeContext(requestItems);
+ attributeContext = container.getAttributeContext(request);
}
attributeContext.putAttribute(name, listAttribute, cascade);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java Sat Nov 14 13:40:31 2009
@@ -28,6 +28,7 @@
import org.apache.tiles.AttributeContext;
import org.apache.tiles.Expression;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -55,108 +56,108 @@
* Test method for {@link org.apache.tiles.template.DefaultAttributeResolver
* #computeAttribute(org.apache.tiles.TilesContainer, org.apache.tiles.Attribute,
* java.lang.String, java.lang.String, boolean, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.Object[])}.
+ * java.lang.String, Request)}.
*/
@Test
public void testComputeAttributeInContext() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute("myValue", Expression
.createExpression("myExpression", null), "myRole", "myRenderer");
- Integer requestItem = new Integer(1);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
assertEquals(attribute, resolver.computeAttribute(container, null,
- "myName", null, false, null, null, null, requestItem));
- verify(container, attributeContext);
+ "myName", null, false, null, null, null, request));
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.DefaultAttributeResolver
* #computeAttribute(org.apache.tiles.TilesContainer, org.apache.tiles.Attribute,
* java.lang.String, java.lang.String, boolean, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.Object[])}.
+ * java.lang.String, Request)}.
*/
@Test
public void testComputeAttributeInCall() {
TilesContainer container = createMock(TilesContainer.class);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute("myValue", Expression
.createExpression("myExpression", null), "myRole", "myRenderer");
- Integer requestItem = new Integer(1);
- replay(container);
+ replay(container, request);
assertEquals(attribute, resolver.computeAttribute(container, attribute,
- null, null, false, null, null, null, requestItem));
- verify(container);
+ null, null, false, null, null, null, request));
+ verify(container, request);
}
/**
* Test method for {@link org.apache.tiles.template.DefaultAttributeResolver
* #computeAttribute(org.apache.tiles.TilesContainer, org.apache.tiles.Attribute,
* java.lang.String, java.lang.String, boolean, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.Object[])}.
+ * java.lang.String, Request)}.
*/
@Test
public void testComputeAttributeDefault() {
TilesContainer container = createMock(TilesContainer.class);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Integer requestItem = new Integer(1);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(null);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
Attribute attribute = resolver.computeAttribute(container, null,
"myName", null, false, "defaultValue", "defaultRole",
- "defaultType", requestItem);
+ "defaultType", request);
assertEquals("defaultValue", attribute.getValue());
assertEquals("defaultRole", attribute.getRole());
assertEquals("defaultType", attribute.getRenderer());
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.DefaultAttributeResolver
* #computeAttribute(org.apache.tiles.TilesContainer, org.apache.tiles.Attribute,
* java.lang.String, java.lang.String, boolean, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.Object[])}.
+ * java.lang.String, Request)}.
*/
@Test(expected = NoSuchAttributeException.class)
public void testComputeAttributeException() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(null);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
resolver.computeAttribute(container, null, "myName", null, false, null,
- "defaultRole", "defaultType", requestItem);
- verify(container, attributeContext);
+ "defaultRole", "defaultType", request);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.DefaultAttributeResolver
* #computeAttribute(org.apache.tiles.TilesContainer, org.apache.tiles.Attribute,
* java.lang.String, java.lang.String, boolean, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.Object[])}.
+ * java.lang.String, Request)}.
*/
@Test
public void testComputeAttributeIgnore() {
TilesContainer container = createMock(TilesContainer.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(null);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
assertNull(resolver.computeAttribute(container, null, "myName", null, true, null,
- "defaultRole", "defaultType", requestItem));
- verify(container, attributeContext);
+ "defaultRole", "defaultType", request));
+ verify(container, attributeContext, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java Sat Nov 14 13:40:31 2009
@@ -32,6 +32,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -65,33 +66,33 @@
* Test method for {@link org.apache.tiles.template.GetAsStringModel
* #start(java.util.Stack, org.apache.tiles.TilesContainer, boolean, java.lang.String,
* java.lang.String, java.lang.Object, java.lang.String, java.lang.String, java.lang.String,
- * org.apache.tiles.Attribute, java.lang.Object[])}.
+ * org.apache.tiles.Attribute, Request)}.
*/
@Test
public void testStart() {
ArrayStack<Object> composeStack = new ArrayStack<Object>();
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute();
AttributeContext attributeContext = createMock(AttributeContext.class);
- container.prepare("myPreparer", requestItem);
+ container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", requestItem)).andReturn(attribute);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
+ "myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
+ expect(container.startContext(request)).andReturn(attributeContext);
- replay(resolver, container, attributeContext);
+ replay(resolver, container, attributeContext, request);
model.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, requestItem);
+ "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
assertEquals(1, composeStack.size());
assertEquals(attribute, composeStack.peek());
- verify(resolver, container, attributeContext);
+ verify(resolver, container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.GetAsStringModel
* #end(java.util.Stack, org.apache.tiles.TilesContainer, java.io.Writer,
- * boolean, java.lang.Object[])}.
+ * boolean, Request)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -100,43 +101,43 @@
Attribute attribute = new Attribute("myValue");
composeStack.push(attribute);
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
Writer writer = createMock(Writer.class);
writer.write("myValue");
- container.endContext(requestItem);
+ container.endContext(request);
- replay(resolver, container, writer);
- model.end(composeStack, container, writer, false, requestItem);
- verify(resolver, container, writer);
+ replay(resolver, container, writer, request);
+ model.end(composeStack, container, writer, false, request);
+ verify(resolver, container, writer, request);
}
/**
* Test method for {@link org.apache.tiles.template.GetAsStringModel
* #execute(org.apache.tiles.TilesContainer, java.io.Writer, boolean,
* java.lang.String, java.lang.String, java.lang.Object, java.lang.String,
- * java.lang.String, java.lang.String, org.apache.tiles.Attribute, java.lang.Object[])}.
+ * java.lang.String, java.lang.String, org.apache.tiles.Attribute, Request)}.
* @throws IOException If something goes wrong.
*/
@Test
public void testExecute() throws IOException {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
Attribute attribute = new Attribute("myValue");
AttributeContext attributeContext = createMock(AttributeContext.class);
+ Request request = createMock(Request.class);
Writer writer = createMock(Writer.class);
- container.prepare("myPreparer", requestItem);
+ container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", requestItem)).andReturn(attribute);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
+ "myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
+ expect(container.startContext(request)).andReturn(attributeContext);
writer.write("myValue");
- container.endContext(requestItem);
+ container.endContext(request);
- replay(resolver, container, writer);
+ replay(resolver, container, writer, request);
model.execute(container, writer, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, requestItem);
- verify(resolver, container, writer);
+ "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
+ verify(resolver, container, writer, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java Sat Nov 14 13:40:31 2009
@@ -31,6 +31,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -62,59 +63,59 @@
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesSingle() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
+ Request request = createMock(Request.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andReturn("myEvaluatedValue");
+ expect(container.evaluate(attribute, request)).andReturn("myEvaluatedValue");
- replay(container, attributeContext);
- Map<String, Object> attributes = model.getImportedAttributes(container, "myName", null, false, requestItem);
+ replay(container, attributeContext, request);
+ Map<String, Object> attributes = model.getImportedAttributes(container, "myName", null, false, request);
assertEquals(1, attributes.size());
assertEquals("myEvaluatedValue", attributes.get("myName"));
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesSingleToName() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andReturn("myEvaluatedValue");
+ expect(container.evaluate(attribute, request)).andReturn("myEvaluatedValue");
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
Map<String, Object> attributes = model.getImportedAttributes(container,
- "myName", "myToName", false, requestItem);
+ "myName", "myToName", false, request);
assertEquals(1, attributes.size());
assertEquals("myEvaluatedValue", attributes.get("myToName"));
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesAll() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute1 = new Attribute("myValue1");
Attribute attribute2 = new Attribute("myValue2");
@@ -126,151 +127,151 @@
localNames.add("myName1");
localNames.add("myName3");
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getCascadedAttributeNames()).andReturn(cascadedNames);
expect(attributeContext.getLocalAttributeNames()).andReturn(localNames);
expect(attributeContext.getAttribute("myName1")).andReturn(attribute1).times(2);
expect(attributeContext.getAttribute("myName2")).andReturn(attribute2);
expect(attributeContext.getAttribute("myName3")).andReturn(attribute3);
- expect(container.evaluate(attribute1, requestItem)).andReturn("myEvaluatedValue1").times(2);
- expect(container.evaluate(attribute2, requestItem)).andReturn("myEvaluatedValue2");
- expect(container.evaluate(attribute3, requestItem)).andReturn("myEvaluatedValue3");
+ expect(container.evaluate(attribute1, request)).andReturn("myEvaluatedValue1").times(2);
+ expect(container.evaluate(attribute2, request)).andReturn("myEvaluatedValue2");
+ expect(container.evaluate(attribute3, request)).andReturn("myEvaluatedValue3");
- replay(container, attributeContext);
- Map<String, Object> attributes = model.getImportedAttributes(container, null, null, false, requestItem);
+ replay(container, attributeContext, request);
+ Map<String, Object> attributes = model.getImportedAttributes(container, null, null, false, request);
assertEquals(ATTRIBUTES_SIZE, attributes.size());
assertEquals("myEvaluatedValue1", attributes.get("myName1"));
assertEquals("myEvaluatedValue2", attributes.get("myName2"));
assertEquals("myEvaluatedValue3", attributes.get("myName3"));
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test(expected = NoSuchAttributeException.class)
public void testGetImportedAttributesSingleNullAttributeException() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(null);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
try {
- model.getImportedAttributes(container, "myName", null, false, requestItem);
+ model.getImportedAttributes(container, "myName", null, false, request);
} finally {
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test(expected = NoSuchAttributeException.class)
public void testGetImportedAttributesSingleNullAttributeValueException() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andReturn(null);
+ expect(container.evaluate(attribute, request)).andReturn(null);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
try {
- model.getImportedAttributes(container, "myName", null, false, requestItem);
+ model.getImportedAttributes(container, "myName", null, false, request);
} finally {
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test(expected = RuntimeException.class)
public void testGetImportedAttributesSingleRuntimeException() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andThrow(new RuntimeException());
+ expect(container.evaluate(attribute, request)).andThrow(new RuntimeException());
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
try {
- model.getImportedAttributes(container, "myName", null, false, requestItem);
+ model.getImportedAttributes(container, "myName", null, false, request);
} finally {
- verify(container, attributeContext);
+ verify(container, attributeContext, request);
}
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesSingleNullAttributeIgnore() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(null);
- replay(container, attributeContext);
- model.getImportedAttributes(container, "myName", null, true, requestItem);
- verify(container, attributeContext);
+ replay(container, attributeContext, request);
+ model.getImportedAttributes(container, "myName", null, true, request);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesSingleNullAttributeValueIgnore() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andReturn(null);
+ expect(container.evaluate(attribute, request)).andReturn(null);
- replay(container, attributeContext);
- model.getImportedAttributes(container, "myName", null, true, requestItem);
- verify(container, attributeContext);
+ replay(container, attributeContext, request);
+ model.getImportedAttributes(container, "myName", null, true, request);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.ImportAttributeModel
* #getImportedAttributes(org.apache.tiles.TilesContainer, java.lang.String,
- * java.lang.String, boolean, java.lang.Object[])}.
+ * java.lang.String, boolean, Request)}.
*/
@Test
public void testGetImportedAttributesSingleRuntimeIgnore() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
Attribute attribute = new Attribute();
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
expect(attributeContext.getAttribute("myName")).andReturn(attribute);
- expect(container.evaluate(attribute, requestItem)).andThrow(new RuntimeException());
+ expect(container.evaluate(attribute, request)).andThrow(new RuntimeException());
- replay(container, attributeContext);
- model.getImportedAttributes(container, "myName", null, true, requestItem);
- verify(container, attributeContext);
+ replay(container, attributeContext, request);
+ model.getImportedAttributes(container, "myName", null, true, request);
+ verify(container, attributeContext, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java Sat Nov 14 13:40:31 2009
@@ -30,6 +30,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -62,32 +63,32 @@
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
* #start(ArrayStack, TilesContainer, boolean, String, String, Object, String,
- * String, String, Attribute, Object...)}.
+ * String, String, Attribute, Request)}.
*/
@Test
public void testStart() {
ArrayStack<Object> composeStack = new ArrayStack<Object>();
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute();
AttributeContext attributeContext = createMock(AttributeContext.class);
- container.prepare("myPreparer", requestItem);
+ container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", requestItem)).andReturn(attribute);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
+ "myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
+ expect(container.startContext(request)).andReturn(attributeContext);
- replay(resolver, container, attributeContext);
+ replay(resolver, container, attributeContext, request);
model.start(composeStack, container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, requestItem);
+ "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
assertEquals(1, composeStack.size());
assertEquals(attribute, composeStack.peek());
- verify(resolver, container, attributeContext);
+ verify(resolver, container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
- * #end(ArrayStack, TilesContainer, boolean, Object...)}.
+ * #end(ArrayStack, TilesContainer, boolean, Request)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -96,40 +97,40 @@
Attribute attribute = new Attribute("myValue");
composeStack.push(attribute);
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
- container.endContext(requestItem);
- container.render(attribute, requestItem);
+ container.endContext(request);
+ container.render(attribute, request);
- replay(resolver, container);
- model.end(composeStack, container, false, requestItem);
- verify(resolver, container);
+ replay(resolver, container, request);
+ model.end(composeStack, container, false, request);
+ verify(resolver, container, request);
}
/**
* Test method for {@link org.apache.tiles.template.InsertAttributeModel
* #execute(TilesContainer, boolean, String, String, Object, String, String,
- * String, Attribute, Object...)}.
+ * String, Attribute, Request)}.
* @throws IOException If something goes wrong.
*/
@Test
public void testExecute() throws IOException {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
Attribute attribute = new Attribute("myValue");
AttributeContext attributeContext = createMock(AttributeContext.class);
- container.prepare("myPreparer", requestItem);
+ container.prepare("myPreparer", request);
expect(resolver.computeAttribute(container, attribute, "myName", "myRole", false, "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", requestItem)).andReturn(attribute);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
- container.endContext(requestItem);
- container.render(attribute, requestItem);
+ "myDefaultValueRole", "myDefaultValueType", request)).andReturn(attribute);
+ expect(container.startContext(request)).andReturn(attributeContext);
+ container.endContext(request);
+ container.render(attribute, request);
- replay(resolver, container);
+ replay(resolver, container, request);
model.execute(container, false, "myPreparer", "myRole", "myDefaultValue",
- "myDefaultValueRole", "myDefaultValueType", "myName", attribute, requestItem);
- verify(resolver, container);
+ "myDefaultValueRole", "myDefaultValueType", "myName", attribute, request);
+ verify(resolver, container, request);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java?rev=836174&r1=836173&r2=836174&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java Sat Nov 14 13:40:31 2009
@@ -26,6 +26,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -51,68 +52,68 @@
/**
* Test method for {@link org.apache.tiles.template.InsertDefinitionModel
- * #start(org.apache.tiles.TilesContainer, java.lang.Object[])}.
+ * #start(org.apache.tiles.TilesContainer, Request)}.
*/
@Test
public void testStart() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
+ expect(container.startContext(request)).andReturn(attributeContext);
- replay(container, attributeContext);
- model.start(container, requestItem);
- verify(container, attributeContext);
+ replay(container, attributeContext, request);
+ model.start(container, request);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.InsertDefinitionModel
* #end(org.apache.tiles.TilesContainer, java.lang.String, java.lang.String,
- * String, String, java.lang.String, java.lang.String, java.lang.Object[])}.
+ * String, String, java.lang.String, java.lang.String, Request)}.
*/
@Test
public void testEnd() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
- container.endContext(requestItem);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
+ container.endContext(request);
attributeContext.setPreparer("myPreparer");
attributeContext.setTemplateAttribute((Attribute) notNull());
- container.render("myDefinitionName", requestItem);
+ container.render("myDefinitionName", request);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
model.end(container, "myDefinitionName", "myTemplate",
"myTemplateType", "myTemplateExpression", "myRole",
- "myPreparer", requestItem);
- verify(container, attributeContext);
+ "myPreparer", request);
+ verify(container, attributeContext, request);
}
/**
* Test method for {@link org.apache.tiles.template.InsertDefinitionModel
* #execute(org.apache.tiles.TilesContainer, java.lang.String, java.lang.String,
- * String, String, java.lang.String, java.lang.String, java.lang.Object[])}.
+ * String, String, java.lang.String, java.lang.String, Request)}.
*/
@Test
public void testExecute() {
TilesContainer container = createMock(TilesContainer.class);
- Integer requestItem = new Integer(1);
+ Request request = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
- expect(container.startContext(requestItem)).andReturn(attributeContext);
- expect(container.getAttributeContext(requestItem)).andReturn(attributeContext);
- container.endContext(requestItem);
+ expect(container.startContext(request)).andReturn(attributeContext);
+ expect(container.getAttributeContext(request)).andReturn(attributeContext);
+ container.endContext(request);
attributeContext.setPreparer("myPreparer");
attributeContext.setTemplateAttribute((Attribute) notNull());
- container.render("myDefinitionName", requestItem);
+ container.render("myDefinitionName", request);
- replay(container, attributeContext);
+ replay(container, attributeContext, request);
model.execute(container, "myDefinitionName", "myTemplate",
"myTemplateType", "myTemplateExpression", "myRole",
- "myPreparer", requestItem);
- verify(container, attributeContext);
+ "myPreparer", request);
+ verify(container, attributeContext, request);
}
}