You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/05/28 20:42:36 UTC
svn commit: r1128737 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
groovy/org/apache/tapestry5/integration/app1/
java/org/apache/tapestry5/integration/app1/pages/
resources/org/apache/tapestry5/integration/app1/pages/
Author: hlship
Date: Sat May 28 18:42:35 2011
New Revision: 1128737
URL: http://svn.apache.org/viewvc?rev=1128737&view=rev
Log:
Fix broken test related to invalid expressions inside dynamic templates
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.java
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/invalid-expression.xml
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/DynamicTest.groovy
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/DynamicTest.groovy
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/DynamicTest.groovy?rev=1128737&r1=1128736&r2=1128737&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/DynamicTest.groovy (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/DynamicTest.groovy Sat May 28 18:42:35 2011
@@ -71,7 +71,7 @@ class DynamicTest extends SeleniumTestCa
@Test
void exception_inside_expansion() {
- clickThru "Invalid expression in a dynamic template"
+ clickThru "Invalid Dynamic Expression"
assertTextPresent "An unexpected application exception has occurred",
"InvalidExpressionInDynamicTemplate does not contain a property (or public field) named 'xyzzyx'",
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java?rev=1128737&r1=1128736&r2=1128737&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java Sat May 28 18:42:35 2011
@@ -57,6 +57,9 @@ public class Index
private static final List<Item> ITEMS = CollectionFactory
.newList(
+ new Item("InvalidExpressionInDynamicTemplate", "Invalid Dynamic Expression",
+ "Invalid expression in a Dynamic Template"),
+
new Item("DynamicDemo", "Dynamic Demo", "Basic Dynamic component tests"),
new Item("DynamicExpansionsDemo", "Expansions in Dynamic Templates",
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.java?rev=1128737&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.java Sat May 28 18:42:35 2011
@@ -0,0 +1,20 @@
+// Copyright 2011 The Apache Software Foundation
+//
+// Licensed 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.tapestry5.integration.app1.pages;
+
+public class InvalidExpressionInDynamicTemplate
+{
+
+}
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.tml?rev=1128737&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.tml (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/InvalidExpressionInDynamicTemplate.tml Sat May 28 18:42:35 2011
@@ -0,0 +1,5 @@
+<t:border xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter">
+
+ <t:dynamic template="invalid-expression.xml"/>
+
+</t:border>
\ No newline at end of file
Added: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/invalid-expression.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/invalid-expression.xml?rev=1128737&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/invalid-expression.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/invalid-expression.xml Sat May 28 18:42:35 2011
@@ -0,0 +1,3 @@
+<div>
+ The magic word is: ${xyzzyx}
+</div>
\ No newline at end of file