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 2007/02/22 14:49:53 UTC
svn commit: r510516 - in /tiles/framework/trunk/tiles-test/src:
main/webapp/index.jsp main/webapp/testdef_extend.jsp
test/selenium/DefinitionTagExtendTest.html test/selenium/TestSuite.html
Author: apetrelli
Date: Thu Feb 22 05:49:52 2007
New Revision: 510516
URL: http://svn.apache.org/viewvc?view=rev&rev=510516
Log:
TILES-118
Added JSP page and Selenium test to check custom definition inheritance.
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html (with props)
Modified:
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/index.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp?view=diff&rev=510516&r1=510515&r2=510516
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Thu Feb 22 05:49:52 2007
@@ -52,6 +52,7 @@
<h3>Mutable Container Tests</h3>
<a href="testinitcontainer.jsp">Test Initialize Container</a><br/>
<a href="testdef.jsp">Test Definition Tag</a><br/>
+ <a href="testdef_extend.jsp">Test Definition Tag extending configured and custom definitions</a><br/>
<a href="testinsertdefinition_composite_tags_includes_configured.jsp">Test Insert Definition that contains another definition inside (configured via tiles-defs.xml) using JSP tags</a><br/>
<a href="testinsertdefinition_composite_tags.jsp">Test Insert Definition that contains another definition inside using JSP tags</a><br/>
<a href="testinsertdefinition_composite_tags_includes_configured_notype.jsp">Test Insert Definition that contains another definition inside (configured via tiles-defs.xml) using JSP tags without types</a><br/>
Added: tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp?view=auto&rev=510516
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp Thu Feb 22 05:49:52 2007
@@ -0,0 +1,32 @@
+<%--
+/*
+ * $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.definition.override.one" extends="test.definition">
+ <tiles:putAttribute name="body" value="/override.jsp" />
+</tiles:definition>
+<tiles:definition name="test.definition.override.two" extends="test.definition.override.one">
+ <tiles:putAttribute name="title" value="This is an overridden title" />
+</tiles:definition>
+<tiles:insertDefinition name="test.definition.override.two" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testdef_extend.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html?view=auto&rev=510516
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html Thu Feb 22 05:49:52 2007
@@ -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>Definition Tag Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Definition Tag Extend 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 Definition Tag extending configured and custom definitions</td>
+ <td></td>
+ </tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is an overridden 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 an overridden content</td>
+ <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.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?view=diff&rev=510516&r1=510515&r2=510516
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Thu Feb 22 05:49:52 2007
@@ -86,6 +86,9 @@
<td><a href="DefinitionTagTest.html">Definition Tag Test</a></td>
</tr>
<tr>
+ <td><a href="DefinitionTagExtendTest.html">Definition Tag Extend Test</a></td>
+ </tr>
+ <tr>
<td><a href="CompositeDefinitionWithInnerConfiguredDefinitionTest.html">Composite Definition with inner Configured Definition Test</a></td>
</tr>
<tr>