You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by re...@apache.org on 2023/04/22 04:40:44 UTC
[wicket] 01/01: [WICKET-7051] reorder exception handling in Form + re-enable disabled tests
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a commit to branch bugfix/reiern70/WICKET-7051
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 35dcc3f15f1dd2bcc64ab27bcc74a88a8e682d0a
Author: reiern70 <re...@gmail.com>
AuthorDate: Sat Apr 22 07:40:31 2023 +0300
[WICKET-7051] reorder exception handling in Form + re-enable disabled tests
---
.../java/org/apache/wicket/markup/html/form/Form.java | 19 +++++++++----------
.../upload/resource/AbstractFileUploadResource.java | 7 ++++++-
.../markup/html/form/upload/FileUploadErrorTest.java | 2 +-
.../markup/html/form/upload/FileUploadFieldTest.java | 1 -
.../html/form/upload/FileUploadServletPartTest.java | 1 -
.../html/form/upload/MultiFileUploadFieldTest.java | 1 -
6 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index 7a7927a989..58024f4b23 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -612,7 +612,6 @@ public class Form<T> extends WebMarkupContainer
* Gets the maximum size for uploads. If null, the setting
* {@link org.apache.wicket.settings.ApplicationSettings#getDefaultMaximumUploadSize()} is used.
*
- *
* @return the maximum size
*/
public final Bytes getMaxSize()
@@ -649,7 +648,7 @@ public class Form<T> extends WebMarkupContainer
/**
* Gets maximum size for each file of an upload.
*
- * @return
+ * @return Bytes
*/
public Bytes getFileMaxSize()
{
@@ -748,7 +747,7 @@ public class Form<T> extends WebMarkupContainer
/**
* THIS METHOD IS NOT PART OF THE WICKET API. DO NOT ATTEMPT TO OVERRIDE OR CALL IT.
- *
+ * <p>
* Handles form submissions.
*
* @see #onFormSubmitted(IFormSubmitter)
@@ -774,7 +773,7 @@ public class Form<T> extends WebMarkupContainer
/**
* THIS METHOD IS NOT PART OF THE WICKET API. DO NOT ATTEMPT TO OVERRIDE OR CALL IT.
- *
+ * <p>
* Handles form submissions.
*
* @param submitter
@@ -1520,8 +1519,8 @@ public class Form<T> extends WebMarkupContainer
* <p>
* Don't forget to call super.onFileUploadException(e, model) at the end of your method.
*
- * @param e
- * @param model
+ * @param e FileUploadException
+ * @param model {@code Map<String, Object>} containing info to be interpolated into keys
*/
protected void onFileUploadException(final FileUploadException e,
final Map<String, Object> model)
@@ -1531,14 +1530,14 @@ public class Form<T> extends WebMarkupContainer
String msg = getString(UPLOAD_SINGLE_FILE_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
error(msg);
}
- else if (e instanceof FileUploadSizeException)
+ else if (e instanceof FileUploadFileCountLimitException)
{
- String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
+ String msg = getString(UPLOAD_TOO_MANY_FILES_RESOURCE_KEY, Model.ofMap(model));
error(msg);
}
- else if (e instanceof FileUploadFileCountLimitException)
+ else if (e instanceof FileUploadSizeException)
{
- String msg = getString(UPLOAD_TOO_MANY_FILES_RESOURCE_KEY, Model.ofMap(model));
+ String msg = getString(UPLOAD_TOO_LARGE_RESOURCE_KEY, Model.ofMap(model));
error(msg);
}
else
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java
index 2198ccb795..b16e4707a1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/upload/resource/AbstractFileUploadResource.java
@@ -25,6 +25,7 @@ import org.apache.wicket.commons.fileupload2.FileUploadException;
import org.apache.wicket.commons.fileupload2.pub.FileUploadByteCountLimitException;
import org.apache.wicket.commons.fileupload2.pub.FileUploadFileCountLimitException;
import org.apache.wicket.Application;
+import org.apache.wicket.commons.fileupload2.pub.FileUploadSizeException;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
@@ -188,12 +189,16 @@ public abstract class AbstractFileUploadResource extends AbstractResource
{
if (e instanceof FileUploadByteCountLimitException)
{
- return Form.UPLOAD_TOO_LARGE_RESOURCE_KEY;
+ return Form.UPLOAD_SINGLE_FILE_TOO_LARGE_RESOURCE_KEY;
}
else if (e instanceof FileUploadFileCountLimitException)
{
return Form.UPLOAD_TOO_MANY_FILES_RESOURCE_KEY;
}
+ else if (e instanceof FileUploadSizeException)
+ {
+ return Form.UPLOAD_TOO_LARGE_RESOURCE_KEY;
+ }
else
{
return Form.UPLOAD_FAILED_RESOURCE_KEY;
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
index 046c9e47ba..b217345209 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadErrorTest.java
@@ -128,7 +128,7 @@ class FileUploadErrorTest extends WicketTestCase
try
{
formTester.submit();
- fail("Value not succesfully submitted.");
+ fail("Value not successfully submitted.");
}
catch (RuntimeException ex)
{
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
index 0b24bc9ed4..c20ac90e76 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
@@ -45,7 +45,6 @@ import org.junit.jupiter.api.Test;
* @author Frank Bille (billen)
*/
// FIXME Wicket 10
-@Disabled
class FileUploadFieldTest extends WicketTestCase
{
private static final String TEST_FILE_NAME = FileUploadFieldTest.class.getName();
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
index 0938bb22e6..c4a117a07c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadServletPartTest.java
@@ -46,7 +46,6 @@ import org.junit.jupiter.api.Test;
* Test of FileUpload with simulated Servlet 3.0 multipart config
*/
// FIXME Wicket 10
-@Disabled
class FileUploadServletPartTest extends WicketTestCase
{
/**
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
index 37e105d569..db267cceda 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadFieldTest.java
@@ -42,7 +42,6 @@ import org.junit.jupiter.api.Test;
* Tests for MultiFileUploadField
*/
// FIXME Wicket 10
-@Disabled
class MultiFileUploadFieldTest extends WicketTestCase
{
/**