svn commit: r689256 - in /tapestry/tapestry5/trunk/tapestry-upload/src: main/java/org/apache/tapestry5/upload/components/Upload.java test/java/org/apache/tapestry5/upload/components/UploadTest.java

[hlship]

Author: hlship
Date: Tue Aug 26 14:49:59 2008
New Revision: 689256

URL: http://svn.apache.org/viewvc?rev=689256&view=rev
Log:
TAPESTRY-2352: Client side validation does not enforce the format of input 
(i.e., that numeric fields contain numbers)

Modified:
    
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
    
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java

Modified: 
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java?rev=689256&r1=689255&r2=689256&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
 Tue Aug 26 14:49:59 2008
@@ -165,4 +165,9 @@
         // As does AbstractField
         setFormSupport(formSupport);
     }
+
+    void injectFieldValidator(FieldValidator validator)
+    {
+        this.validate = validator;
+    }
 }

Modified: 
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java?rev=689256&r1=689255&r2=689256&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
 Tue Aug 26 14:49:59 2008
@@ -39,9 +39,12 @@
         writer.element("form");
         FormSupport formSupport = mockFormSupport();
         ComponentResources resources = mockComponentResources();
+        FieldValidator validator = mockFieldValidator();
 
         formSupport.setEncodingType(Upload.MULTIPART_ENCTYPE);
 
+        validator.render(writer);
+
         resources.renderInformalParameters(writer);
 
         replay();
@@ -50,9 +53,11 @@
 
         component.injectDecorator(new BaseValidationDecorator());
         component.injectFormSupport(formSupport);
+        component.injectFieldValidator(validator);
 
         component.beginRender(writer);
 
+
         Element element = writer.getElement();
         assertNotNull(element);
         assertEquals(element.getName(), "input");
@@ -72,6 +77,7 @@
         Upload component = new Upload(null, null, null, null, resources, null);
         MarkupWriter writer = createMarkupWriter();
         writer.element("form");
+        FieldValidator validator = mockFieldValidator();
 
         FormSupport formSupport = mockFormSupport();
         formSupport.setEncodingType(Upload.MULTIPART_ENCTYPE);
@@ -81,6 +87,9 @@
         ValidationDecorator decorator = mockValidationDecorator();
 
         component.injectDecorator(decorator);
+        component.injectFieldValidator(validator);
+
+        validator.render(writer);
 
         resources.renderInformalParameters(writer);
         decorator.insideField(component);