You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/13 22:36:55 UTC

svn commit: r486846 [2/2] - in /tapestry/tapestry4/trunk/tapestry-framework/src: java/org/apache/tapestry/markup/ scripts/ test/org/apache/tapestry/components/ test/org/apache/tapestry/form/ test/org/apache/tapestry/html/ test/org/apache/tapestry/marku...

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLFormComponents.xml Wed Dec 13 13:36:53 2006
@@ -16,37 +16,37 @@
 -->
 
 <mock-test>
-    <context name="mock" root="context51"/>
+    <context name="mock" root="context51" />
 
     <servlet name="app" class="org.apache.tapestry.ApplicationServlet">
         <init-parameter
             name="org.apache.tapestry.application-specification"
-            value="/org/apache/tapestry/junit/mock/wml/Mock.application"/>
+            value="/org/apache/tapestry/junit/mock/wml/Mock.application" />
         <init-parameter
-            name="org.apache.tapestry.application-mode" value="wml"/>                 
+            name="org.apache.tapestry.application-mode" value="wml" />                 
     </servlet>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="Input"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="Input" />
 
         <assert-output name="Input component">
             <![CDATA[
-            <input type="text" name="fname" title="FName" value="Ronnie"/>
+            <input type="text" name="fname" title="FName" value="Ronnie" />
             ]]>
         </assert-output>
 
         <assert-output name="Input component">
             <![CDATA[
-            <input type="text" name="lname" title="LName"/>
+            <input type="text" name="lname" title="LName" />
             ]]>
         </assert-output>
 
     </request>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="NoGo"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="NoGo" />
 
         <assert-output name="Card">
             <![CDATA[
@@ -65,13 +65,13 @@
     </request>
 
     <request>
-        <parameter name="service" value="direct"/>
-        <parameter name="page" value="Rewind"/>
-        <parameter name="direct" value="1"/>
-        <parameter name="component" value="h"/>
-        <parameter name="formids" value="v"/>
-        <parameter name="reservedids" value="direct"/>
-        <parameter name="v" value="VVV"/>
+        <parameter name="service" value="direct" />
+        <parameter name="page" value="Rewind" />
+        <parameter name="direct" value="1" />
+        <parameter name="component" value="h" />
+        <parameter name="formids" value="v" />
+        <parameter name="reservedids" value="direct" />
+        <parameter name="v" value="VVV" />
 
         <assert-output name="Card">
             <![CDATA[
@@ -90,12 +90,12 @@
     </request>
 
     <request>
-        <parameter name="service" value="direct"/>
-        <parameter name="page" value="Rewind"/>
-        <parameter name="component" value="g"/>
+        <parameter name="service" value="direct" />
+        <parameter name="page" value="Rewind" />
+        <parameter name="component" value="g" />
 
-        <parameter name="formids" value="v"/>
-        <parameter name="u" value="VVV"/>
+        <parameter name="formids" value="v" />
+        <parameter name="u" value="VVV" />
 
         <assert-output name="Card">
             <![CDATA[

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLNestedCard.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLNestedCard.xml?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLNestedCard.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLNestedCard.xml Wed Dec 13 13:36:53 2006
@@ -16,19 +16,19 @@
 -->
 
 <mock-test>
-    <context name="mock" root="context51"/>
+    <context name="mock" root="context51" />
 
     <servlet name="app" class="org.apache.tapestry.ApplicationServlet">
         <init-parameter
             name="org.apache.tapestry.application-specification"
-            value="/org/apache/tapestry/junit/mock/wml/Mock.application"/>
+            value="/org/apache/tapestry/junit/mock/wml/Mock.application" />
         <init-parameter
-            name="org.apache.tapestry.application-mode" value="wml"/>                 
+            name="org.apache.tapestry.application-mode" value="wml" />                 
     </servlet>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="NestedCard"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="NestedCard" />
 
         <assert-output name="Card">
             <![CDATA[

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLSelect.xml Wed Dec 13 13:36:53 2006
@@ -16,19 +16,19 @@
 -->
 
 <mock-test>
-    <context name="mock" root="context51"/>
+    <context name="mock" root="context51" />
 
   	<servlet name="app" class="org.apache.tapestry.ApplicationServlet">
   		<init-parameter
   			name="org.apache.tapestry.application-specification"
-  			value="/org/apache/tapestry/junit/mock/wml/Mock.application"/>
+  			value="/org/apache/tapestry/junit/mock/wml/Mock.application" />
       <init-parameter
-          name="org.apache.tapestry.application-mode" value="wml"/>             
+          name="org.apache.tapestry.application-mode" value="wml" />             
   	</servlet>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="NestedSelect"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="NestedSelect" />
 
         <assert-output name="Card">
             <![CDATA[
@@ -50,8 +50,8 @@
     </request>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="Select"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="Select" />
 
         <assert-output name="Card">
             <![CDATA[
@@ -71,15 +71,15 @@
 
     <request>
 
-        <parameter name="service" value="direct"/>
-        <parameter name="direct" value="0"/>
-        <parameter name="page" value="Select"/>
-        <parameter name="component" value="go"/>
-
-        <parameter name="formids" value="sex,income,hobbies"/>
-        <parameter name="sex" value="Male"/>
-        <parameter name="income" value="Over $100K"/>
-        <parameter name="hobbies" value="Skiing,Book,Traveling"/>
+        <parameter name="service" value="direct" />
+        <parameter name="direct" value="0" />
+        <parameter name="page" value="Select" />
+        <parameter name="component" value="go" />
+
+        <parameter name="formids" value="sex,income,hobbies" />
+        <parameter name="sex" value="Male" />
+        <parameter name="income" value="Over $100K" />
+        <parameter name="hobbies" value="Skiing,Book,Traveling" />
 
         <assert-output name="Card">
             <![CDATA[

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLStaleSession.xml Wed Dec 13 13:36:53 2006
@@ -16,19 +16,19 @@
 -->
 
 <mock-test>
-    <context name="mock" root="context51"/>
+    <context name="mock" root="context51" />
 
     <servlet name="app" class="org.apache.tapestry.ApplicationServlet">
         <init-parameter
             name="org.apache.tapestry.application-specification"
-            value="/org/apache/tapestry/junit/mock/wml/Mock.application"/>
+            value="/org/apache/tapestry/junit/mock/wml/Mock.application" />
         <init-parameter
-            name="org.apache.tapestry.application-mode" value="wml"/>                 
+            name="org.apache.tapestry.application-mode" value="wml" />                 
     </servlet>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="Stale"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="Stale" />
  
         <assert-output name="Do component">
             <![CDATA[
@@ -62,7 +62,7 @@
 
         <assert-output-matches name="Go Parameter Values" subgroup="1">
             <![CDATA[
-            <postfield .*?value="(.*?)"/>
+            <postfield .*?value="(.*?)" />
             ]]>
             <match></match>
             <match>go</match>
@@ -75,10 +75,10 @@
     </request>
 
     <request>
-        <parameter name="service" value="direct"/>
-        <parameter name="session" value="T"/>
-        <parameter name="page" value="Stale"/>
-        <parameter name="component" value="directLink"/>
+        <parameter name="service" value="direct" />
+        <parameter name="session" value="T" />
+        <parameter name="page" value="Stale" />
+        <parameter name="component" value="directLink" />
 
 
         <assert-output name="StaleSession (DirectLink)">
@@ -89,12 +89,12 @@
     </request>
 
     <request>
-        <parameter name="service" value="direct"/>
-        <parameter name="session" value="T"/>
-        <parameter name="page" value="Stale"/>
-        <parameter name="component" value="go"/>
+        <parameter name="service" value="direct" />
+        <parameter name="session" value="T" />
+        <parameter name="page" value="Stale" />
+        <parameter name="component" value="go" />
 
-        <parameter name="formids" value=""/>
+        <parameter name="formids" value="" />
 
         <assert-output name="StaleSession (Go)">
             <![CDATA[

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLTimer.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLTimer.xml?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLTimer.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestWMLTimer.xml Wed Dec 13 13:36:53 2006
@@ -16,29 +16,29 @@
 -->
 
 <mock-test>
-    <context name="mock" root="context51"/>
+    <context name="mock" root="context51" />
 
   	<servlet name="app" class="org.apache.tapestry.ApplicationServlet">
   		<init-parameter
   			name="org.apache.tapestry.application-specification"
-  			value="/org/apache/tapestry/junit/mock/wml/Mock.application"/>
+  			value="/org/apache/tapestry/junit/mock/wml/Mock.application" />
       <init-parameter
-          name="org.apache.tapestry.application-mode" value="wml"/>             
+          name="org.apache.tapestry.application-mode" value="wml" />             
   	</servlet>
 
     <request>
-        <parameter name="service" value="page"/>
-        <parameter name="page" value="Timer"/>
+        <parameter name="service" value="page" />
+        <parameter name="page" value="Timer" />
 
         <assert-output name="Timer component">
             <![CDATA[
-            <timer name="timer_one" value="20"/>
+            <timer name="timer_one" value="20" />
             ]]>
         </assert-output>
 
         <assert-output name="Timer component">
             <![CDATA[
-            <timer name="timer_two" value="0"/>
+            <timer name="timer_two" value="0" />
             ]]>
         </assert-output>
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/components/TestInsert.java Wed Dec 13 13:36:53 2006
@@ -351,6 +351,6 @@
         
         nested.close();
         
-        assertBuffer("output<br/><b>raw</b>");
+        assertBuffer("output<br /><b>raw</b>");
     }
 }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestCheckbox.java Wed Dec 13 13:36:53 2006
@@ -88,10 +88,10 @@
 
         verify();
 
-        assertBuffer("<input type=\"checkbox\" name=\"barney\" checked=\"checked\" id=\"barney\"/>");
+        assertBuffer("<input type=\"checkbox\" name=\"barney\" checked=\"checked\" id=\"barney\" />");
     }
 
-    public void testRenderDisabled()
+    public void test_Render_Disabled()
     {
         IForm form = newMock(IForm.class);
         ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
@@ -120,10 +120,10 @@
 
         verify();
 
-        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" disabled=\"disabled\"/>");
+        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" disabled=\"disabled\" />");
     }
 
-    public void testRenderInformalParameters()
+    public void test_Render_Informal_Parameters()
     {
         IForm form = newMock(IForm.class);
         ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
@@ -155,10 +155,10 @@
 
         verify();
 
-        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" informal=\"informal-value\"/>");
+        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" informal=\"informal-value\" />");
     }
 
-    public void testRenderWithId()
+    public void test_Render_With_Id()
     {
         IForm form = newMock(IForm.class);
         ValidatableFieldSupport vfs = newMock(ValidatableFieldSupport.class);
@@ -189,7 +189,7 @@
 
         verify();
         
-        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" id=\"assignedName\"/>");
+        assertBuffer("<input type=\"checkbox\" name=\"assignedName\" checked=\"checked\" id=\"assignedName\" />");
     }
 
     public void testSubmitNull()

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestTextField.java Wed Dec 13 13:36:53 2006
@@ -293,7 +293,7 @@
         verify();
     }
 
-    public void testRender()
+    public void test_Render()
     {
         TranslatedFieldSupport tfs = newMock(TranslatedFieldSupport.class);
         
@@ -345,7 +345,8 @@
 
         verify();
 
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" " +
+                "value=\"10\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     public void testRenderHidden()
@@ -362,7 +363,9 @@
         MockDelegate delegate = new MockDelegate();
 
         TextField component = newInstance(TextField.class, new Object[]
-        { "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10), "hidden", Boolean.TRUE });
+        { "name", "fred", "translatedFieldSupport", tfs, 
+            "validatableFieldSupport", vfs, "value", 
+            new Integer(10), "hidden", Boolean.TRUE });
         
         expect(cycle.renderStackPush(component)).andReturn(component);
         
@@ -402,7 +405,8 @@
 
         verify();
 
-        assertBuffer("<span class=\"prefix\"><input type=\"password\" name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"password\" name=\"fred\" " +
+                "value=\"10\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     public void testRenderDisabled()
@@ -419,7 +423,9 @@
         MockDelegate delegate = new MockDelegate();
 
         TextField component = newInstance(TextField.class, new Object[]
-        { "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10), "disabled", Boolean.TRUE });
+        { "name", "fred", "translatedFieldSupport", tfs, 
+            "validatableFieldSupport", vfs, "value", new Integer(10), 
+            "disabled", Boolean.TRUE });
         
         expect(cycle.renderStackPush(component)).andReturn(component);
         
@@ -459,7 +465,8 @@
 
         verify();
 
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" disabled=\"disabled\" value=\"10\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" disabled=\"disabled\" " +
+                "value=\"10\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     public void testRenderWithInformalParameters()
@@ -478,7 +485,9 @@
         IBinding binding = newBinding("informal-value");
 
         TextField component = newInstance(TextField.class, new Object[]
-        { "name", "fred", "translatedFieldSupport", tfs, "validatableFieldSupport", vfs, "value", new Integer(10), "specification", new ComponentSpecification() });
+        { "name", "fred", "translatedFieldSupport", tfs, 
+            "validatableFieldSupport", vfs, "value", new Integer(10), 
+            "specification", new ComponentSpecification() });
         
         component.setBinding("informal", binding);
         
@@ -509,7 +518,8 @@
 
         verify();
 
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"10\" id=\"fred\" class=\"validation-delegate\" informal=\"informal-value\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" " +
+                "value=\"10\" id=\"fred\" class=\"validation-delegate\" informal=\"informal-value\" /></span>");
     }
 
     public void testRenderNullValue()
@@ -564,7 +574,8 @@
 
         verify();
 
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" " +
+                "value=\"\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     public void testIsRequired()

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestInsertText.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestInsertText.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestInsertText.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/TestInsertText.java Wed Dec 13 13:36:53 2006
@@ -173,6 +173,6 @@
         
         nested.close();
         
-        assertBuffer("output<br/><b>raw</b>");
+        assertBuffer("output<br /><b>raw</b>");
     }
 }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java Wed Dec 13 13:36:53 2006
@@ -452,7 +452,7 @@
         mw.beginEmpty("img");
         mw.closeTag();
 
-        assertOutput("<img/>");
+        assertOutput("<img />");
 
         verify();
     }
@@ -472,7 +472,7 @@
         mw.begin("span");
         mw.closeTag();
 
-        assertOutput("<h1><b><img/><span>");
+        assertOutput("<h1><b><img /><span>");
 
         mw.end();
 
@@ -506,7 +506,7 @@
         mw.begin("span");
         mw.closeTag();
 
-        assertOutput("<h1><b><img/><span>");
+        assertOutput("<h1><b><img /><span>");
 
         // Uses the stack to close elements.
 

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestForeachToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestForeachToken.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestForeachToken.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/script/TestForeachToken.java Wed Dec 13 13:36:53 2006
@@ -30,7 +30,7 @@
  * @author Howard M. Lewis Ship
  * @since 4.0
  */
-@Test
+@Test(sequential=true)
 public class TestForeachToken extends BaseComponentTestCase
 {
     private static class EchoToken extends AbstractToken

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Wed Dec 13 13:36:53 2006
@@ -377,8 +377,8 @@
                 "<!ENTITY nbsp \'&#160;\'>\n" + 
                 "]>\n" + 
                 "<ajax-response><response id=\"includescript\" type=\"script\">" 
-                + "<include url=\"http://noname/js/package.js\"/>"
-                + "<include url=\"http://noname/js/package2.js\"/></response></ajax-response>");
+                + "<include url=\"http://noname/js/package.js\" />"
+                + "<include url=\"http://noname/js/package2.js\" /></response></ajax-response>");
         
         verify();
     }

Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java?view=diff&rev=486846&r1=486845&r2=486846
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestValidField.java Wed Dec 13 13:36:53 2006
@@ -253,7 +253,8 @@
         verify();
 
         assertSame(component, delegate.getFormComponent());
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"fred value\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" " +
+                "value=\"fred value\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     private void trainToString(IValidator validator,
@@ -313,7 +314,7 @@
         verify();
 
         assertSame(component, delegate.getFormComponent());
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 
     public void testRenderWithError()
@@ -361,6 +362,7 @@
         verify();
 
         assertSame(component, delegate.getFormComponent());
-        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" value=\"recorded field value\" id=\"fred\" class=\"validation-delegate\"/></span>");
+        assertBuffer("<span class=\"prefix\"><input type=\"text\" name=\"fred\" " +
+                "value=\"recorded field value\" id=\"fred\" class=\"validation-delegate\" /></span>");
     }
 }