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/07/21 21:02:38 UTC
svn commit: r796478 - in /tiles/framework/trunk/tiles-test/src:
main/java/org/apache/tiles/test/factory/ main/webapp/ main/webapp/WEB-INF/
main/webapp/WEB-INF/freemarker/ main/webapp/WEB-INF/velocity/
main/webapp/freemarker/ main/webapp/velocity/ test/...
Author: apetrelli
Date: Tue Jul 21 19:02:37 2009
New Revision: 796478
URL: http://svn.apache.org/viewvc?rev=796478&view=rev
Log:
TILES-433
Added test for Regular Expression evaluation.
Added:
tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp (with props)
tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html (with props)
tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html (with props)
Modified:
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-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/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java?rev=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/factory/TestAlternateTilesContainerFactory.java Tue Jul 21 19:02:37 2009
@@ -32,6 +32,11 @@
import org.apache.tiles.definition.LocaleDefinitionsFactory;
import org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO;
import org.apache.tiles.definition.dao.CachingLocaleUrlDefinitionDAO;
+import org.apache.tiles.definition.pattern.DefinitionPatternMatcherFactory;
+import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
+import org.apache.tiles.definition.pattern.PrefixedPatternDefinitionResolver;
+import org.apache.tiles.definition.pattern.regexp.RegexpDefinitionPatternMatcherFactory;
+import org.apache.tiles.definition.pattern.wildcard.WildcardDefinitionPatternMatcherFactory;
import org.apache.tiles.locale.LocaleResolver;
/**
@@ -77,4 +82,16 @@
TilesRequestContextFactory contextFactory, LocaleResolver resolver) {
return new CachingLocaleUrlDefinitionDAO();
}
+
+ /** {@inheritDoc} */
+ @Override
+ protected <T> PatternDefinitionResolver<T> createPatternDefinitionResolver(
+ Class<T> customizationKeyClass) {
+ DefinitionPatternMatcherFactory wildcardFactory = new WildcardDefinitionPatternMatcherFactory();
+ DefinitionPatternMatcherFactory regexpFactory = new RegexpDefinitionPatternMatcherFactory();
+ PrefixedPatternDefinitionResolver<T> resolver = new PrefixedPatternDefinitionResolver<T>();
+ resolver.registerDefinitionPatternMatcherFactory("WILDCARD", wildcardFactory);
+ resolver.registerDefinitionPatternMatcherFactory("REGEXP", regexpFactory);
+ return resolver;
+ }
}
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml?rev=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-alt-defs.xml Tue Jul 21 19:02:37 2009
@@ -32,7 +32,12 @@
<put-attribute name="header" value="/freemarker/header.ftl"/>
<put-attribute name="body" value="/freemarker/body.ftl"/>
</definition>
- <definition name="freemarker.test.definition*.message*" template="/freemarker/layout{1}.ftl">
+ <definition name="WILDCARD:freemarker.test.definition*.message*" template="/freemarker/layout{1}.ftl">
+ <put-attribute name="title" value="This definition has a message: {2}."/>
+ <put-attribute name="header" value="/freemarker/header.ftl"/>
+ <put-attribute name="body" value="/freemarker/body.ftl"/>
+ </definition>
+ <definition name="REGEXP:freemarker\.test\.regexp\.definition(.*)\.message(.*)" template="/freemarker/layout{1}.ftl">
<put-attribute name="title" value="This definition has a message: {2}."/>
<put-attribute name="header" value="/freemarker/header.ftl"/>
<put-attribute name="body" value="/freemarker/body.ftl"/>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml?rev=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-alt-defs.xml Tue Jul 21 19:02:37 2009
@@ -32,7 +32,12 @@
<put-attribute name="header" value="/header.jsp"/>
<put-attribute name="body" value="/body.jsp"/>
</definition>
- <definition name="test.definition*.message*" template="/layout{1}.jsp">
+ <definition name="WILDCARD:test.definition*.message*" template="/layout{1}.jsp">
+ <put-attribute name="title" value="This definition has a message: {2}."/>
+ <put-attribute name="header" value="/header.jsp"/>
+ <put-attribute name="body" value="/body.jsp"/>
+ </definition>
+ <definition name="REGEXP:test\.regexp\.definition(.*)\.message(.*)" template="/layout{1}.jsp">
<put-attribute name="title" value="This definition has a message: {2}."/>
<put-attribute name="header" value="/header.jsp"/>
<put-attribute name="body" value="/body.jsp"/>
Modified: tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml?rev=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-alt-defs.xml Tue Jul 21 19:02:37 2009
@@ -32,7 +32,12 @@
<put-attribute name="header" value="/velocity/header.vm"/>
<put-attribute name="body" value="/velocity/body.vm"/>
</definition>
- <definition name="velocity.test.definition*.message*" template="/velocity/layout{1}.vm">
+ <definition name="WILDCARD:velocity.test.definition*.message*" template="/velocity/layout{1}.vm">
+ <put-attribute name="title" value="This definition has a message: {2}."/>
+ <put-attribute name="header" value="/velocity/header.vm"/>
+ <put-attribute name="body" value="/velocity/body.vm"/>
+ </definition>
+ <definition name="REGEXP:velocity\.test\.regexp\.definition(.*)\.message(.*)" template="/velocity/layout{1}.vm">
<put-attribute name="title" value="This definition has a message: {2}."/>
<put-attribute name="header" value="/velocity/header.vm"/>
<put-attribute name="body" value="/velocity/body.vm"/>
Added: tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl Tue Jul 21 19:02:37 2009
@@ -0,0 +1,26 @@
+<#--
+/*
+ * $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.setCurrentContainer containerKey="alternate" />
+<@tiles.insertDefinition name="freemarker.test.regexp.definitionOne.messageHello" />
+<@tiles.insertDefinition name="freemarker.test.regexp.definitionTwo.messageBye" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.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=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp (original)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/index.jsp Tue Jul 21 19:02:37 2009
@@ -95,6 +95,7 @@
<a href="testinsertdefinition_ognl.jsp">Test Insert Configured Definition with OGNL</a><br/>
<a href="testinsertdefinition_el_singleeval.jsp">Test Insert Configured Definition with EL to test Single Evaluation</a><br/>
<a href="testinsertdefinition_wildcard.jsp">Test Insert Configured Definition with Wildcards</a><br/>
+ <a href="testinsertdefinition_regexp.jsp">Test Insert Configured Definition with Regular Expression</a><br/>
<a href="testinsertdefinition_defaultvalues.jsp">Test Insert Configured Definition with Default Values</a><br/>
<a href="testput_cascaded.jsp">Test Put Tag with Cascaded Attributes</a><br/>
<a href="testput_cascaded_overridden.jsp">Test Put Tag with Overridden Cascaded Attributes</a><br/>
@@ -179,6 +180,7 @@
<a href="freemarker/testinsertdefinition_ognl.ftl">FreeMarker: Test Insert Configured Definition with OGNL</a><br/>
<a href="freemarker/testinsertdefinition_el_singleeval.ftl">FreeMarker: Test Insert Configured Definition with EL to test Single Evaluation</a><br/>
<a href="freemarker/testinsertdefinition_wildcard.ftl">FreeMarker: Test Insert Configured Definition with Wildcards</a><br/>
+ <a href="freemarker/testinsertdefinition_regexp.ftl">FreeMarker: Test Insert Configured Definition with Regular Expression</a><br/>
<a href="freemarker/testinsertdefinition_defaultvalues.ftl">FreeMarker: Test Insert Configured Definition with Default Values</a><br/>
<a href="freemarker/testput_cascaded.ftl">FreeMarker: Test Put Tag with Cascaded Attributes</a><br/>
<a href="freemarker/testput_cascaded_overridden.ftl">FreeMarker: Test Put Tag with Overridden Cascaded Attributes</a><br/>
@@ -263,6 +265,7 @@
<a href="velocity/testinsertdefinition_ognl.vm">Velocity: Test Insert Configured Definition with OGNL</a><br/>
<a href="velocity/testinsertdefinition_el_singleeval.vm">Velocity: Test Insert Configured Definition with EL to test Single Evaluation</a><br/>
<a href="velocity/testinsertdefinition_wildcard.vm">Velocity: Test Insert Configured Definition with Wildcards</a><br/>
+ <a href="velocity/testinsertdefinition_regexp.vm">Velocity: Test Insert Configured Definition with Regular Expression</a><br/>
<a href="velocity/testinsertdefinition_defaultvalues.vm">Velocity: Test Insert Configured Definition with Default Values</a><br/>
<a href="velocity/testput_cascaded.vm">Velocity: Test Put Tag with Cascaded Attributes</a><br/>
<a href="velocity/testput_cascaded_overridden.vm">Velocity: Test Put Tag with Overridden Cascaded Attributes</a><br/>
Added: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp Tue Jul 21 19:02:37 2009
@@ -0,0 +1,28 @@
+<%@ 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:setCurrentContainer containerKey="alternate" />
+<tiles:insertDefinition name="test.regexp.definitionOne.messageHello" />
+<tiles:insertDefinition name="test.regexp.definitionTwo.messageBye" />
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm (added)
+++ tiles/framework/trunk/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm Tue Jul 21 19:02:37 2009
@@ -0,0 +1,24 @@
+#*
+ * $Id: testinsertdefinition_wildcard.vm 782137 2009-06-05 21:18:52Z apetrelli $
+ *
+ * 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.setCurrentContainer("alternate")
+$tiles.insertDefinition({"name":"velocity.test.regexp.definitionOne.messageHello"})
+$tiles.insertDefinition({"name":"velocity.test.regexp.definitionTwo.messageBye"})
Added: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html Tue Jul 21 19:02:37 2009
@@ -0,0 +1,76 @@
+<!--
+/*
+ * $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 Regular Expression Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Regular Expression 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 Regular Expression</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout one.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout two.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Hello.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Bye.</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/ConfiguredDefinitionRegexpTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.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=796478&r1=796477&r2=796478&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html (original)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html Tue Jul 21 19:02:37 2009
@@ -121,6 +121,9 @@
<td><a href="ConfiguredDefinitionWildcardTest.html">Configured Definition Wildcard Test</a></td>
</tr>
<tr>
+ <td><a href="ConfiguredDefinitionRegexpTest.html">Configured Definition Regular Expression Test</a></td>
+ </tr>
+ <tr>
<td><a href="PutTagTest.html">Put Tag Test</a></td>
</tr>
<tr>
@@ -322,6 +325,9 @@
<td><a href="freemarker/ConfiguredDefinitionWildcardTest.html">FreeMarker: Configured Definition Wildcard Test</a></td>
</tr>
<tr>
+ <td><a href="freemarker/ConfiguredDefinitionRegexpTest.html">FreeMarker: Configured Definition Regular Expression Test</a></td>
+ </tr>
+ <tr>
<td><a href="freemarker/PutTagTest.html">FreeMarker: Put Tag Test</a></td>
</tr>
<tr>
@@ -520,6 +526,9 @@
<td><a href="velocity/ConfiguredDefinitionWildcardTest.html">Velocity: Configured Definition Wildcard Test</a></td>
</tr>
<tr>
+ <td><a href="velocity/ConfiguredDefinitionRegexpTest.html">Velocity: Configured Definition Regular Expression Test</a></td>
+ </tr>
+ <tr>
<td><a href="velocity/PutTagTest.html">Velocity: Put Tag Test</a></td>
</tr>
<tr>
Added: tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html Tue Jul 21 19:02:37 2009
@@ -0,0 +1,76 @@
+<!--
+/*
+ * $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 Regular Expression Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Regular Expression 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 Regular Expression</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout one.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout two.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Hello.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Bye.</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/freemarker/ConfiguredDefinitionRegexpTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html?rev=796478&view=auto
==============================================================================
--- tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html (added)
+++ tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html Tue Jul 21 19:02:37 2009
@@ -0,0 +1,76 @@
+<!--
+/*
+ * $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 Regular Expression Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Configured Definition Regular Expression Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/tiles-test/index.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Velocity: Test Insert Configured Definition with Regular Expression</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout one.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This is layout two.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Hello.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertTextPresent</td>
+ <td>This definition has a message: Bye.</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/velocity/ConfiguredDefinitionRegexpTest.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL