You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/09/09 00:04:55 UTC
svn commit: r573916 - in /tapestry/tapestry5/trunk/tapestry-upload/src:
main/java/org/apache/tapestry/upload/components/Upload.java
test/java/org/apache/tapestry/upload/components/UploadTest.java
Author: hlship
Date: Sat Sep 8 15:04:55 2007
New Revision: 573916
URL: http://svn.apache.org/viewvc?rev=573916&view=rev
Log:
TAPESTRY-1417: CSS classes on text input fields are discarded when field is in error
Modified:
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java?rev=573916&r1=573915&r2=573916&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java Sat Sep 8 15:04:55 2007
@@ -96,12 +96,13 @@
// For testing
Upload(UploadedFile value, FieldValidator<Object> validate, MultipartDecoder decoder,
- ValidationTracker tracker)
+ ValidationTracker tracker, ComponentResources resources)
{
_value = value;
if (validate != null) _validate = validate;
_decoder = decoder;
_tracker = tracker;
+ _resources = resources;
}
protected void processSubmission(FormSupport formSupport, String elementName)
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java?rev=573916&r1=573915&r2=573916&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java Sat Sep 8 15:04:55 2007
@@ -16,6 +16,7 @@
import static org.easymock.EasyMock.expectLastCall;
+import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Field;
import org.apache.tapestry.FieldValidator;
import org.apache.tapestry.MarkupWriter;
@@ -44,12 +45,15 @@
MarkupWriter writer = createMarkupWriter();
writer.element("form");
FormSupport formSupport = mockFormSupport();
+ ComponentResources resources = mockComponentResources();
formSupport.setEncodingType(Upload.MULTIPART_ENCTYPE);
+ resources.renderInformalParameters(writer);
+
replay();
- Upload component = new Upload();
+ Upload component = new Upload(null, null, null, null, resources);
setValidationDecorator(component, new StubValidationDecorator());
@@ -82,7 +86,10 @@
@Test
public void validation_decorator_invoked_inside_begin_render() throws Exception
{
- Upload component = new Upload();
+ getMocksControl().checkOrder(true);
+
+ ComponentResources resources = mockComponentResources();
+ Upload component = new Upload(null, null, null, null, resources);
MarkupWriter writer = createMarkupWriter();
writer.element("form");
@@ -94,6 +101,7 @@
setValidationDecorator(component, decorator);
+ resources.renderInformalParameters(writer);
decorator.insideField(component);
replay();
@@ -111,8 +119,11 @@
@Test
public void begin_render_invokes_field_validator() throws Exception
{
+ getMocksControl().checkOrder(true);
+
FieldValidator<Object> validate = mockFieldValidator();
- Upload component = new Upload(null, validate, null, null);
+ ComponentResources resources = mockComponentResources();
+ Upload component = new Upload(null, validate, null, null, resources);
MarkupWriter writer = createMarkupWriter();
writer.element("form");
@@ -125,6 +136,7 @@
setValidationDecorator(component, decorator);
validate.render(writer);
+ resources.renderInformalParameters(writer);
decorator.insideField(component);
replay();
@@ -157,7 +169,7 @@
MultipartDecoder decoder = mockMultipartDecoder();
UploadedFile uploadedFile = mockUploadedFile();
- Upload component = new Upload(null, null, decoder, null);
+ Upload component = new Upload(null, null, decoder, null, null);
expect(decoder.getFileUpload("test")).andReturn(uploadedFile);
expect(uploadedFile.getFileName()).andReturn("foo").anyTimes();
@@ -178,7 +190,7 @@
MultipartDecoder decoder = mockMultipartDecoder();
UploadedFile uploadedFile = mockUploadedFile();
- Upload component = new Upload(null, null, decoder, null);
+ Upload component = new Upload(null, null, decoder, null, null);
expect(decoder.getFileUpload("test")).andReturn(uploadedFile);
expect(uploadedFile.getFileName()).andReturn("").atLeastOnce();
@@ -200,7 +212,7 @@
UploadedFile uploadedFile = mockUploadedFile();
FieldValidator<Object> validate = mockFieldValidator();
- Upload component = new Upload(null, validate, decoder, null);
+ Upload component = new Upload(null, validate, decoder, null, null);
expect(decoder.getFileUpload("test")).andReturn(uploadedFile);
expect(uploadedFile.getFileName()).andReturn("test").atLeastOnce();
@@ -221,7 +233,7 @@
FieldValidator<Object> validate = mockFieldValidator();
ValidationTracker tracker = mockValidationTracker();
- Upload component = new Upload(null, validate, decoder, tracker);
+ Upload component = new Upload(null, validate, decoder, tracker, null);
expect(decoder.getFileUpload("test")).andReturn(uploadedFile);
expect(uploadedFile.getFileName()).andReturn("test").atLeastOnce();