Author: hlship
Date: Thu Aug  7 19:48:06 2008
New Revision: 683808

URL: http://svn.apache.org/viewvc?rev=683808&view=rev
Log:
TAPESTRY-2509: Add type coercions from String to Renderable, Block

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/test/app1/PaletteDemo.tml
    
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/PaletteDemo.tml
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/PaletteDemo.tml?rev=683808&r1=683807&r2=683808&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/PaletteDemo.tml 
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/PaletteDemo.tml Thu 
Aug  7 19:48:06 2008
@@ -14,10 +14,8 @@
 
             <t:palette t:id="languages" model="languageModel" 
reorder="reorder" encoder="languageEncoder"
                        availableLabel="Languages Offered">
-                <t:parameter name="selectedLabel">
-                    Selected
-                    <t:if test="reorder">/Ranked</t:if>
-                    Languages
+                <t:parameter name="selectedLabel" xml:space="default">
+                    Selected <t:if test="reorder">/ Ranked</t:if> Languages
                 </t:parameter>
             </t:palette>
             <br/>

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java?rev=683808&r1=683807&r2=683808&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
 Thu Aug  7 19:48:06 2008
@@ -979,7 +979,7 @@
         check("reorder");
         clickAndWait(SUBMIT);
 
-        assertText("//[EMAIL PROTECTED]'t-palette-selected']/[EMAIL 
PROTECTED]'t-palette-title']", "Selected/Ranked Languages");
+        assertText("//[EMAIL PROTECTED]'t-palette-selected']/[EMAIL 
PROTECTED]'t-palette-title']", "Selected / Ranked Languages");
 
         addSelection("languages", "label=Ruby");
 


Reply via email to