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/02/27 21:18:02 UTC
svn commit: r631703 - in /tiles/framework/trunk:
tiles-core/src/main/java/org/apache/tiles/definition/digester/
tiles-core/src/main/java/org/apache/tiles/impl/mgmt/
tiles-core/src/main/resources/org/apache/tiles/resources/
tiles-core/src/test/java/org/...
Author: apetrelli
Date: Wed Feb 27 12:18:01 2008
New Revision: 631703
URL: http://svn.apache.org/viewvc?rev=631703&view=rev
Log:
TILES-85
Added nested definitions to "add-attribute" and "tiles:addAttribute" tags, with Selenium tests.
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html (with props)
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp
tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Wed Feb 27 12:18:01 2008
@@ -92,6 +92,11 @@
private static final String PUT_DEFINITION_TAG = "*/put-attribute/definition";
/**
+ * Intercepts a <definition> inside an <add-attribute> tag.
+ */
+ private static final String ADD_DEFINITION_TAG = "*/add-attribute/definition";
+
+ /**
* Intercepts a <put-list-attribute> tag.
*/
private static final String LIST_TAG = "put-list-attribute";
@@ -371,6 +376,10 @@
digester.addSetProperties(PUT_DEFINITION_TAG);
digester.addSetRoot(PUT_DEFINITION_TAG, "addDefinition");
digester.addRule(PUT_DEFINITION_TAG, new AddNestedDefinitionRule());
+ digester.addObjectCreate(ADD_DEFINITION_TAG, DEFINITION_HANDLER_CLASS);
+ digester.addSetProperties(ADD_DEFINITION_TAG);
+ digester.addSetRoot(ADD_DEFINITION_TAG, "addDefinition");
+ digester.addRule(ADD_DEFINITION_TAG, new AddNestedDefinitionRule());
// put / putAttribute rules
// Rules for a same pattern are called in order, but rule.end() are called
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java Wed Feb 27 12:18:01 2008
@@ -64,12 +64,6 @@
private String definitionsAttributeName;
/**
- * Index to be used to create unique definition names for anonymous
- * (nested) definitions.
- */
- private int anonymousDefinitionIndex = 1;
-
- /**
* Constructor.
*/
public DefinitionManager() {
@@ -285,6 +279,7 @@
protected String getNextUniqueDefinitionName(
Map<String, Definition> definitions) {
String candidate;
+ int anonymousDefinitionIndex = 1;
do {
candidate = "$anonymousMutableDefinition" + anonymousDefinitionIndex;
Modified: tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd (original)
+++ tiles/framework/trunk/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_2_1.dtd Wed Feb 27 12:18:01 2008
@@ -191,7 +191,7 @@
<!-- The "add-attribute" element describes an element of a list. It is similar to the
<put> element.
-->
-<!ELEMENT add-attribute (#PCDATA)>
+<!ELEMENT add-attribute ( (definition*) )>
<!ATTLIST add-attribute id ID #IMPLIED>
<!--
@attr type The type of the value. Can be: string, template or definition.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/config/tiles-defs-2.1.xml Wed Feb 27 12:18:01 2008
@@ -40,4 +40,22 @@
</put-list-attribute>
</definition>
+ <definition name="test.nesting.definitions" template="/layout.jsp">
+ <put-attribute name="body">
+ <definition template="/layout.jsp">
+ <put-attribute name="title" value="This is a nested definition."/>
+ </definition>
+ </put-attribute>
+ </definition>
+
+ <definition name="test.nesting.list.definitions" template="/layout.jsp">
+ <put-list-attribute name="list">
+ <add-attribute>
+ <definition template="/layout.jsp">
+ <put-attribute name="title" value="This is a nested definition."/>
+ </definition>
+ </add-attribute>
+ </put-list-attribute>
+ </definition>
+
</tiles-definitions>
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Wed Feb 27 12:18:01 2008
@@ -139,6 +139,7 @@
* Tests the read method under normal conditions for the new features in 2.1
* version of the DTD.
*/
+ @SuppressWarnings("unchecked")
public void testRead21Version() {
try {
reader.init(new HashMap<String, String>());
@@ -162,6 +163,36 @@
assertNotNull("Couldn't Find items1 local attribute.", attribute);
attribute = def.getCascadedAttribute("items2");
assertNotNull("Couldn't Find items2 cascaded attribute.", attribute);
+
+ def = definitions.get("test.nesting.definitions");
+ assertNotNull("Couldn't find test.nesting.definitions tile.", def);
+ attribute = def.getAttribute("body");
+ assertNotNull("Couldn't Find body attribute.", attribute);
+ assertEquals("Attribute not of 'definition' type", "definition",
+ attribute.getRenderer());
+ assertNotNull("Attribute value null", attribute.getValue());
+ String defName = attribute.getValue().toString();
+ def = definitions.get(defName);
+ assertNotNull("Couldn't find " + defName + " tile.", def);
+
+ def = definitions.get("test.nesting.list.definitions");
+ assertNotNull("Couldn't find test.nesting.list.definitions tile.",
+ def);
+ attribute = def.getAttribute("list");
+ assertNotNull("Couldn't Find list attribute.", attribute);
+ assertTrue("Attribute not of valid type",
+ attribute instanceof ListAttribute);
+ ListAttribute listAttribute = (ListAttribute) attribute;
+ List<Attribute> list = (List<Attribute>) listAttribute.getValue();
+ assertEquals("The list is not of correct size", 1, list.size());
+ attribute = list.get(0);
+ assertNotNull("Couldn't Find element attribute.", attribute);
+ assertEquals("Attribute not of 'definition' type", "definition",
+ attribute.getRenderer());
+ assertNotNull("Attribute value null", attribute.getValue());
+ defName = attribute.getValue().toString();
+ def = definitions.get(defName);
+ assertNotNull("Couldn't find " + defName + " tile.", def);
} catch (Exception e) {
fail("Exception reading configuration." + e);
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java Wed Feb 27 12:18:01 2008
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.jsp.taglib.definition.DefinitionTagParent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
@@ -56,7 +57,8 @@
*
* @version $Rev$ $Date$
*/
-public class AddAttributeTag extends RoleSecurityTagSupport {
+public class AddAttributeTag extends RoleSecurityTagSupport implements
+ DefinitionTagParent {
/**
* The logging object.
@@ -148,11 +150,20 @@
* @throws JspException if a JSP exception has occurred
*/
public int doAfterBody() throws JspException {
- if (bodyContent != null) {
+ if (value == null && bodyContent != null) {
value = bodyContent.getString();
type = "string";
}
return (SKIP_BODY);
+ }
+
+ /** {@inheritDoc} */
+ public void processNestedDefinitionName(String definitionName)
+ throws JspException {
+ value = definitionName;
+ if (type == null) {
+ type = "definition";
+ }
}
/** {@inheritDoc} */
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=631703&r1=631702&r2=631703&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 Wed Feb 27 12:18:01 2008
@@ -182,4 +182,18 @@
</definition>
</put-attribute>
</definition>
+
+ <definition name="test.nesting.list.definitions" template="/layout_list.jsp">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-list-attribute name="list">
+ <add-attribute>
+ <definition template="/layout.jsp">
+ <put-attribute name="title" value="This is a nested definition."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-attribute name="body" value="/body.jsp"/>
+ </definition>
+ </add-attribute>
+ </put-list-attribute>
+ </definition>
</tiles-definitions>
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=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Wed Feb 27 12:18:01 2008
@@ -53,6 +53,8 @@
<a href="testinsertdefinition_reversed_explicit.jsp">Test Insert Configured Definition with Reversed Explicit Attribute</a><br/>
<a href="testinsertnesteddefinition.jsp">Test Insert Nested Definition</a><br/>
<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="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/>
Added: tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp?rev=631703&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp Wed Feb 27 12:18:01 2008
@@ -0,0 +1,43 @@
+<%@ 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" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+
+<table border="2" width="300" bordercolor="Gray">
+ <tr>
+ <td bgcolor="Blue"><strong><tiles:getAsString name="title"/></strong></td>
+ </tr>
+ <tr>
+ <td><tiles:insertAttribute name="header"/></td>
+ </tr>
+ <tr>
+ <td>
+ <tiles:importAttribute name="list"/>
+ <c:forEach var="attribute" items="${list}">
+ <tiles:insertAttribute value="${attribute}" />
+ </c:forEach>
+ </td>
+ </tr>
+</table>
\ No newline at end of file
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/layout_list.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp?rev=631703&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp Wed Feb 27 12:18:01 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.nesting.list.definitions" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp?rev=631703&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp Wed Feb 27 12:18:01 2008
@@ -0,0 +1,40 @@
+<%@ 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:definition name="test.nesting.definitions.tags" template="/layout_list.jsp">
+ <tiles:putAttribute name="title" value="This is the title."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putListAttribute name="list">
+ <tiles:addAttribute>
+ <tiles:definition template="/layout.jsp">
+ <tiles:putAttribute name="title" value="This is a nested definition."/>
+ <tiles:putAttribute name="header" value="/header.jsp"/>
+ <tiles:putAttribute name="body" value="/body.jsp"/>
+ </tiles:definition>
+ </tiles:addAttribute>
+ </tiles:putListAttribute>
+</tiles:definition>
+<tiles:insertDefinition name="test.nesting.definitions.tags" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html?rev=631703&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html Wed Feb 27 12:18:01 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 Nested List Definition Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Nested List Definition 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 Nested List Definition</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is the title.</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 nested 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/ConfiguredNestedListDefinitionTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html?rev=631703&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html Wed Feb 27 12:18:01 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>Put Tag with Nested List Definition Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Put Tag with Nested List Definition 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 Nested List Definition only using JSP tags</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is the title.</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 nested 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/PutTagNestedListDefinitionTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.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=631703&r1=631702&r2=631703&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Wed Feb 27 12:18:01 2008
@@ -88,6 +88,9 @@
<td><a href="ConfiguredNestedDefinitionTest.html">Configured Nested Definition Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredNestedListDefinitionTest.html">Configured Nested List Definition Test</a></td>
+ </tr>
+ <tr>
<td><a href="PutTagTest.html">Put Tag Test</a></td>
</tr>
<tr>
@@ -116,6 +119,9 @@
</tr>
<tr>
<td><a href="PutTagNestedDefinitionTest.html">Put Tag with Nested Definition Test</a></td>
+ </tr>
+ <tr>
+ <td><a href="PutTagNestedListDefinitionTest.html">Put Tag with Nested List Definition Test</a></td>
</tr>
<tr>
<td><a href="PutListTagTest.html">Put List Tag Test</a></td>