svn commit: r498099 - in /tapestry/tapestry5/tapestry-core/trunk/src/test: java/org/apache/tapestry/integration/app2/pages/ java/org/apache/tapestry/integration/pagelevel/ resources/org/apache/tapestry/integration/app2/pages/

[freemant]

Author: freemant
Date: Sat Jan 20 02:42:51 2007
New Revision: 498099

URL: http://svn.apache.org/viewvc?view=rev&rev=498099
Log:
Simplified TestPageForSubmit.java

Modified:
    
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
    
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java
    
tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html

Modified: 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java?view=diff&rev=498099&r1=498098&r2=498099
==============================================================================
--- 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
 (original)
+++ 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.java
 Sat Jan 20 02:42:51 2007
@@ -42,48 +42,31 @@
     private Submit capitalize2;
 
     @SuppressWarnings("unused")
-    @Component(parameters = "value=value1")
+    @Component(parameters = "value=value")
     private TextField t1;
 
     @SuppressWarnings("unused")
-    @Component(parameters = "value=value2")
+    @Component(parameters = "value=value")
     private TextField t2;
 
     @Persist
-    private String value1;
+    private String value;
 
-    @Persist
-    private String value2;
-
-    public String getValue1()
-    {
-        return value1;
-    }
-
-    public void setValue1(String value)
+    public String getValue()
     {
-        this.value1 = value;
+        return value;
     }
 
-    @OnEvent(component = "capitalize1", value = "selected")
-    public void onCapitalize1()
+    public void setValue(String value)
     {
-        value1 = value1.toUpperCase();
+        this.value = value;
     }
 
-    @OnEvent(component = "capitalize2", value = "selected")
-    public void onCapitalize2()
+    @OnEvent(component =
+    { "capitalize1", "capitalize2" }, value = "selected")
+    public void onCapitalize()
     {
-        value2 = value2.toUpperCase();
+        value = value.toUpperCase();
     }
 
-    public String getValue2()
-    {
-        return value2;
-    }
-
-    public void setValue2(String value2)
-    {
-        this.value2 = value2;
-    }
 }

Modified: 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java?view=diff&rev=498099&r1=498098&r2=498099
==============================================================================
--- 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java
 (original)
+++ 
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java
 Sat Jan 20 02:42:51 2007
@@ -39,7 +39,7 @@
         Element submitButton = _doc.getElementById("capitalize1");
         _fieldValues.put("t1", "hello");
         _doc = _tester.clickSubmit(submitButton, _fieldValues);
-        assertTrue(_doc.toString().contains("t1 is: HELLO"));
+        assertTrue(_doc.toString().contains("Value is: HELLO"));
     }
 
     @Test
@@ -48,7 +48,7 @@
         Element submitButton = _doc.getElementById("capitalize2");
         _fieldValues.put("t2", "world");
         _doc = _tester.clickSubmit(submitButton, _fieldValues);
-        assertTrue(_doc.toString().contains("t2 is: WORLD"));
+        assertTrue(_doc.toString().contains("Value is: WORLD"));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class)

Modified: 
tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html?view=diff&rev=498099&r1=498098&r2=498099
==============================================================================
--- 
tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html
 (original)
+++ 
tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html
 Sat Jan 20 02:42:51 2007
@@ -10,7 +10,6 @@
 </form></p>
 <input type="submit" id="orphanedSubmit"/>
 <p>
-t1 is: ${value1}.
-t2 is: ${value2}.
+Value is: ${value}.
 </p>
 </html>