You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/07/29 22:47:53 UTC
svn commit: r680839 -
/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
Author: hlship
Date: Tue Jul 29 13:47:52 2008
New Revision: 680839
URL: http://svn.apache.org/viewvc?rev=680839&view=rev
Log:
TAPESTRY-2543: Simplify Tapestry to use UTF-8 (or another, configurable character set) across the entire application
Modified:
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java?rev=680839&r1=680838&r2=680839&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java Tue Jul 29 13:47:52 2008
@@ -82,8 +82,6 @@
{
HttpServletRequest request = mockHttpServletRequest();
- train_getCharacterEncoding(request, "UTF-8");
-
MultipartDecoderImpl decoder = new MultipartDecoderImpl("/tmp", 888, -1, -1, CHARSET);
List<FileItem> fileItems = Arrays.asList(createValueItem("one", "first"), createValueItem("two", "second"));
@@ -104,8 +102,6 @@
{
HttpServletRequest request = mockHttpServletRequest();
- train_getCharacterEncoding(request, null);
-
MultipartDecoderImpl decoder = new MultipartDecoderImpl("/tmp", 888, -1, -1, CHARSET);
List<FileItem> fileItems = Arrays.asList(createValueItem("one", "first"), createValueItem("two", "second"));
@@ -130,8 +126,6 @@
List<FileItem> fileItems = Arrays.asList(createFileItem("one", "first.txt"),
createFileItem("two", "second.txt"));
- train_getCharacterEncoding(request, null);
-
replay();
HttpServletRequest decodedRequest = decoder.processFileItems(request, fileItems);
@@ -152,8 +146,6 @@
List<FileItem> fileItems = Arrays.asList(createFileItem("one", "first.txt"),
createFileItem("two", "second.txt"));
- train_getCharacterEncoding(request, null);
-
replay();
decoder.processFileItems(request, fileItems);
@@ -176,8 +168,6 @@
StubFileItem secondItem = new StubFileItem("two");
secondItem.setFormField(false);
- train_getCharacterEncoding(request, null);
-
List<FileItem> fileItems = new ArrayList<FileItem>();
fileItems.add(firstItem);
fileItems.add(secondItem);
@@ -216,8 +206,4 @@
return item;
}
- protected final void train_getCharacterEncoding(HttpServletRequest request, String encoding)
- {
- expect(request.getCharacterEncoding()).andReturn(encoding).atLeastOnce();
- }
}