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 2008/03/14 19:49:42 UTC
svn commit: r637208 - in /tiles/framework/trunk:
tiles-core/src/main/java/org/apache/tiles/evaluator/
tiles-core/src/main/java/org/apache/tiles/evaluator/el/
tiles-core/src/main/java/org/apache/tiles/evaluator/impl/
tiles-core/src/main/java/org/apache/...
Author: apetrelli
Date: Fri Mar 14 11:49:39 2008
New Revision: 637208
URL: http://svn.apache.org/viewvc?rev=637208&view=rev
Log:
TILES-48
Added a new method in AttributeEvaluators. Fixed tests accordingly.
Added Selenium test.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java (with props)
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html (with props)
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java Fri Mar 14 11:49:39 2008
@@ -34,7 +34,16 @@
/**
* Evaluates an expression.
*
- * @param attribute The expression to evaluate.
+ * @param expression The expression to evaluate.
+ * @param request The request object.
+ * @return The evaluated object.
+ */
+ Object evaluate(String expression, TilesRequestContext request);
+
+ /**
+ * Evaluates an attribute value.
+ *
+ * @param attribute The attribute to evaluate.
* @param request The request object.
* @return The evaluated object.
*/
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Fri Mar 14 11:49:39 2008
@@ -110,19 +110,23 @@
}
/** {@inheritDoc} */
+ public Object evaluate(String expression, TilesRequestContext request) {
+ SimpleContext context = new SimpleContext(defaultResolver);
+ context.putContext(TilesRequestContext.class, request);
+ context.putContext(TilesApplicationContext.class,
+ applicationContext);
+ ValueExpression valueExpression = expressionFactory.createValueExpression(
+ context, expression.toString(), Object.class);
+
+ return valueExpression.getValue(context);
+ }
+
+ /** {@inheritDoc} */
public Object evaluate(Attribute attribute, TilesRequestContext request) {
Object retValue = attribute.getValue();
if (retValue instanceof String) {
- SimpleContext context = new SimpleContext(defaultResolver);
- context.putContext(TilesRequestContext.class, request);
- context.putContext(TilesApplicationContext.class,
- applicationContext);
- ValueExpression expression = expressionFactory
- .createValueExpression(context, attribute.getValue()
- .toString(), Object.class);
-
- retValue = expression.getValue(context);
+ retValue = evaluate((String) retValue, request);
}
return retValue;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java Fri Mar 14 11:49:39 2008
@@ -34,6 +34,11 @@
public class DirectAttributeEvaluator implements AttributeEvaluator {
/** {@inheritDoc} */
+ public Object evaluate(String expression, TilesRequestContext request) {
+ return expression;
+ }
+
+ /** {@inheritDoc} */
public Object evaluate(Attribute attribute, TilesRequestContext request) {
if (attribute == null) {
throw new IllegalArgumentException("The attribute cannot be null");
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Fri Mar 14 11:49:39 2008
@@ -663,6 +663,22 @@
String dispatchPath = attributeContext.getTemplate();
+ if (dispatchPath != null) {
+ Object value = evaluator.evaluate(dispatchPath, request);
+ if (value instanceof String) {
+ dispatchPath = (String) value;
+ } else {
+ throw new InvalidTemplateException(
+ "Cannot render a template that is not an object: "
+ + value.toString());
+ }
+ }
+
+ if (dispatchPath == null) {
+ throw new InvalidTemplateException(
+ "Cannot render a null template");
+ }
+
if (LOG.isDebugEnabled()) {
LOG.debug("Dispatching to definition path '"
+ attributeContext.getTemplate() + " '");
Added: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java?rev=637208&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java (added)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java Fri Mar 14 11:49:39 2008
@@ -0,0 +1,71 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tiles.impl;
+
+import org.apache.tiles.TilesRuntimeException;
+
+/**
+ * An invalid template has been identified.
+ *
+ * @version $Rev$ $Date$
+ * @since 2.1.0
+ */
+public class InvalidTemplateException extends TilesRuntimeException {
+
+ /**
+ * Constructor.
+ *
+ * @since 2.1.0
+ */
+ public InvalidTemplateException() {
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ * @since 2.1.0
+ */
+ public InvalidTemplateException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param e The exception to be wrapped.
+ * @since 2.1.0
+ */
+ public InvalidTemplateException(Exception e) {
+ super(e);
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param message The detail message.
+ * @param e The exception to be wrapped.
+ * @since 2.1.0
+ */
+ public InvalidTemplateException(String message, Exception e) {
+ super(message, e);
+ }
+}
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/el/ELAttributeEvaluatorTest.java Fri Mar 14 11:49:39 2008
@@ -106,4 +106,32 @@
assertEquals("The value is not correct", new Integer(2), evaluator
.evaluate(attribute, request));
}
+
+ /**
+ * Tests
+ * {@link ELAttributeEvaluator#evaluate(String, TilesRequestContext)}.
+ */
+ public void testEvaluateString() {
+ String expression = "${requestScope.object1}";
+ assertEquals("The value is not correct", "value", evaluator.evaluate(
+ expression, request));
+ expression = "${sessionScope.object2}";
+ assertEquals("The value is not correct", new Integer(1), evaluator
+ .evaluate(expression, request));
+ expression = "${applicationScope.object3}";
+ assertEquals("The value is not correct", new Float(2.0), evaluator
+ .evaluate(expression, request));
+ expression = "${object1}";
+ assertEquals("The value is not correct", "value", evaluator.evaluate(
+ expression, request));
+ expression = "${object2}";
+ assertEquals("The value is not correct", new Integer(1), evaluator
+ .evaluate(expression, request));
+ expression = "${object3}";
+ assertEquals("The value is not correct", new Float(2.0), evaluator
+ .evaluate(expression, request));
+ expression = "String literal";
+ assertEquals("The value is not correct", expression, evaluator
+ .evaluate(expression, request));
+ }
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java Fri Mar 14 11:49:39 2008
@@ -57,4 +57,19 @@
assertEquals("The expression has not been evaluated correctly", result,
expression);
}
+
+ /**
+ * Tests
+ * {@link DirectAttributeEvaluator#evaluate(String, org.apache.tiles.context.TilesRequestContext)}.
+ */
+ public void testEvaluateString() {
+ String expression = "This is an expression";
+ Object result = evaluator.evaluate(expression, null);
+ assertEquals("The expression has not been evaluated correctly", result,
+ expression);
+ expression = "${attributeName}";
+ result = evaluator.evaluate(expression, null);
+ assertEquals("The expression has not been evaluated correctly", result,
+ expression);
+ }
}
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Fri Mar 14 11:49:39 2008
@@ -76,6 +76,11 @@
<artifactId>freemarker</artifactId>
<version>2.3.10</version>
</dependency>
+ <dependency>
+ <groupId>de.odysseus.juel</groupId>
+ <artifactId>juel</artifactId>
+ <version>2.1.0</version>
+ </dependency>
</dependencies>
<build>
Added: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java?rev=637208&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java (added)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java Fri Mar 14 11:49:39 2008
@@ -0,0 +1,42 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tiles.test.preparer;
+
+import org.apache.tiles.preparer.PreparerException;
+import org.apache.tiles.preparer.ViewPreparer;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.AttributeContext;
+
+/**
+ * A simple test <code>ViewPreparer</code> to put a request attribute, that
+ * will be used with the EL evaluator.
+ *
+ * @version $Rev$ $Date$
+ */
+public class RequestSettingViewPreparer implements ViewPreparer {
+
+ /** {@inheritDoc} */
+ public void execute(TilesRequestContext tilesContext,
+ AttributeContext attributeContext) throws PreparerException {
+ tilesContext.getRequestScope().put("body", "test.inner.definition");
+ tilesContext.getRequestScope().put("layout", "/layout.jsp");
+ }
+}
Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml Fri Mar 14 11:49:39 2008
@@ -196,4 +196,11 @@
</add-attribute>
</put-list-attribute>
</definition>
+
+ <definition name="test.composite.el.definition" template="${layout}"
+ preparer="org.apache.tiles.test.preparer.RequestSettingViewPreparer">
+ <put-attribute name="title" value="This is a configured composite definition."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-attribute name="body" value="${requestScope.body}"/>
+ </definition>
</tiles-definitions>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml Fri Mar 14 11:49:39 2008
@@ -45,6 +45,11 @@
<param-value>reversed,org.apache.tiles.test.renderer.ReverseStringAttributeRenderer</param-value>
</context-param>
+ <context-param>
+ <param-name>org.apache.tiles.evaluator.AttributeEvaluator</param-name>
+ <param-value>org.apache.tiles.evaluator.el.ELAttributeEvaluator</param-value>
+ </context-param>
+
<filter>
<filter-name>Tiles Decoration Filter</filter-name>
<filter-class>org.apache.tiles.web.util.TilesDecorationFilter</filter-class>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Fri Mar 14 11:49:39 2008
@@ -56,6 +56,7 @@
<a href="testinsertnesteddefinition_tags.jsp">Test Insert Nested Definition only using JSP tags</a><br/>
<a href="testinsertnestedlistdefinition.jsp">Test Insert Nested List Definition</a><br/>
<a href="testinsertnestedlistdefinition_tags.jsp">Test Insert Nested List Definition only using JSP tags</a><br/>
+ <a href="testinsertdefinition_el.jsp">Test Insert Configured Definition with EL</a><br/>
<a href="testput.jsp">Test Put Tag</a><br/>
<a href="testput_flush.jsp">Test Put Tag with Flush</a><br/>
<a href="testput_el.jsp">Test Put Tag using EL</a><br/>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinitcontainer.jsp Fri Mar 14 11:49:39 2008
@@ -36,6 +36,8 @@
value="org.apache.tiles.compat.definition.digester.CompatibilityDigesterDefinitionsReader"/>
<tiles:putAttribute name="org.apache.tiles.renderer.impl.BasicRendereFactory.TYPE_RENDERERS"
value="reversed,org.apache.tiles.test.renderer.ReverseStringAttributeRenderer"/>
+ <tiles:putAttribute name="org.apache.tiles.evaluator.AttributeEvaluator"
+ value="org.apache.tiles.evaluator.el.ELAttributeEvaluator"/>
</tiles:initContainer>
<tiles:insertDefinition name="test.definition" />
Added: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp?rev=637208&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp Fri Mar 14 11:49:39 2008
@@ -0,0 +1,27 @@
+<%@ page session="false" %>
+<%--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+--%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insertDefinition name="test.composite.el.definition" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html?rev=637208&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html Fri Mar 14 11:49:39 2008
@@ -0,0 +1,71 @@
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Configured Definition EL Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+w<tr><td rowspan="1" colspan="3">Configured Definition EL Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Test Insert Configured Definition with EL</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is a configured composite definition.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is the header</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is a configured inner definition.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is the header</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is a body</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html?rev=637208&r1=637207&r2=637208&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Fri Mar 14 11:49:39 2008
@@ -94,6 +94,9 @@
<td><a href="ConfiguredNestedListDefinitionTest.html">Configured Nested List Definition Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredDefinitionELTest.html">Configured Definition EL Test</a></td>
+ </tr>
+ <tr>
<td><a href="PutTagTest.html">Put Tag Test</a></td>
</tr>
<tr>