Author: apetrelli
Date: Tue Feb 24 11:11:06 2009
New Revision: 747340
URL: http://svn.apache.org/viewvc?rev=747340&view=rev
Log:
TILES-371
Added Selenium test case in the test webapp.
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
(with props)
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
(with props)
tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp (with
props)
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
(with props)
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
(with props)
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
(with props)
Modified:
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
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-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml?rev=747340&r1=747339&r2=747340&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
(original)
+++
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
Tue Feb 24 11:11:06 2009
@@ -134,6 +134,12 @@
<put-attribute name="body" value="/freemarker/body.ftl" role="badrole"
/>
</definition>
+ <definition name="freemarker.test.definition.roles.tags"
template="/freemarker/layout_roles.ftl">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/freemarker/header.ftl" />
+ <put-attribute name="body" value="/freemarker/body.ftl" />
+ </definition>
+
<!-- Tests for cascaded attributes -->
<definition name="freemarker.test.overridden.cascaded.definition"
template="/freemarker/layout.ftl">
<put-attribute name="title" value="This is the title." cascade="true" />
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=747340&r1=747339&r2=747340&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 Tue
Feb 24 11:11:06 2009
@@ -146,6 +146,12 @@
<put-attribute name="body" value="/body.jsp" role="badrole" />
</definition>
+ <definition name="test.definition.roles.tags" template="/layout_roles.jsp">
+ <put-attribute name="title" value="This is the title."/>
+ <put-attribute name="header" value="/header.jsp" />
+ <put-attribute name="body" value="/body.jsp" />
+ </definition>
+
<!-- Tests for cascaded attributes -->
<definition name="test.overridden.cascaded.definition"
template="/layout.jsp">
<put-attribute name="title" value="This is the title." cascade="true" />
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl?rev=747340&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
(added)
+++
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
Tue Feb 24 11:11:06 2009
@@ -0,0 +1,34 @@
+<#--
+/*
+ * $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.
+ *
+ */
+-->
+<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" role="goodrole"/></td>
+ </tr>
+ <tr>
+ <td><@tiles.insertAttribute name="body" role="badrole"/></td>
+ </tr>
+</table>
\ No newline at end of file
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl?rev=747340&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
(added)
+++
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
Tue Feb 24 11:11:06 2009
@@ -0,0 +1,24 @@
+<#--
+/*
+ * $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.
+ *
+ */
+-->
+<@tiles.insertDefinition name="freemarker.test.definition.roles.tags" />
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
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=747340&r1=747339&r2=747340&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Tue Feb 24
11:11:06 2009
@@ -73,6 +73,7 @@
<a href="testinsertdefinition_role.jsp">Test Insert Configured Definition
with Specified Role</a><br/>
<a href="testinsertdefinition_role_tag.jsp">Test Insert Configured
Definition with Specified Role in Tag</a><br/>
<a href="testinsertdefinition_attribute_roles.jsp">Test Insert Configured
Definition with Attribute that have Roles</a><br/>
+ <a href="testinsertdefinition_attribute_roles_tags.jsp">Test Insert
Configured Definition with Attribute that have Roles in Tags</a><br/>
<h2>Features in Tiles 2.1.x</h2>
@@ -154,6 +155,7 @@
<a href="freemarker/testinsertdefinition_role.ftl">FreeMarker: Test Insert
Configured Definition with Specified Role</a><br/>
<a href="freemarker/testinsertdefinition_role_tag.ftl">FreeMarker: Test
Insert Configured Definition with Specified Role in Tag</a><br/>
<a href="freemarker/testinsertdefinition_attribute_roles.ftl">FreeMarker:
Test Insert Configured Definition with Attribute that have Roles</a><br/>
+ <a
href="freemarker/testinsertdefinition_attribute_roles_tags.ftl">FreeMarker:
Test Insert Configured Definition with Attribute that have Roles in
Tags</a><br/>
<h2>Features in Tiles 2.1.x</h2>
Added: tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp?rev=747340&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp Tue Feb
24 11:11:06 2009
@@ -0,0 +1,37 @@
+<%@ 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" %>
+
+<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" role="goodrole" /></td>
+ </tr>
+ <tr>
+ <td><tiles:insertAttribute name="body" role="badrole" /></td>
+ </tr>
+</table>
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/layout_roles.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp?rev=747340&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
(added)
+++
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
Tue Feb 24 11:11:06 2009
@@ -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.definition.roles.tags" />
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html?rev=747340&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
(added)
+++
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
Tue Feb 24 11:11:06 2009
@@ -0,0 +1,61 @@
+<!--
+/*
+ * $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 Attribute Roles Tags Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Attribute Roles Tags
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 Attribute that have
Roles in 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>assertTextNotPresent</td>
+ <td>This is a body</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Propchange:
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.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=747340&r1=747339&r2=747340&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Tue Feb
24 11:11:06 2009
@@ -214,6 +214,9 @@
<td><a href="ConfiguredDefinitionAttributeRolesTest.html">Configured
Definition Attribute Roles Test</a></td>
</tr>
<tr>
+ <td><a
href="ConfiguredDefinitionAttributeRolesTagsTest.html">Configured Definition
Attribute Roles Tags Test</a></td>
+ </tr>
+ <tr>
<td><a href="ConfiguredDefinitionDbTest.html">Configured Definition Db
Test</a></td>
</tr>
<tr>
@@ -409,6 +412,9 @@
<td><a
href="freemarker/ConfiguredDefinitionAttributeRolesTest.html">FreeMarker:
Configured Definition Attribute Roles Test</a></td>
</tr>
<tr>
+ <td><a
href="freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html">FreeMarker:
Configured Definition Attribute Roles Tags Test</a></td>
+ </tr>
+ <tr>
<td><a href="freemarker/ConfiguredDefinitionDbTest.html">FreeMarker:
Configured Definition Db Test</a></td>
</tr>
<tr>
Added:
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html?rev=747340&view=auto
==============================================================================
---
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
(added)
+++
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
Tue Feb 24 11:11:06 2009
@@ -0,0 +1,61 @@
+<!--
+/*
+ * $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 Attribute Roles Tags Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Attribute Roles Tags
Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=FreeMarker: Test Insert Configured Definition with Attribute
that have Roles in 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>assertTextNotPresent</td>
+ <td>This is a body</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Propchange:
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
