You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2013/03/09 13:30:27 UTC
svn commit: r1454693 -
/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/
Author: simonetripodi
Date: Sat Mar 9 12:30:27 2013
New Revision: 1454693
URL: http://svn.apache.org/r1454693
Log:
trivial: unit tests code format aligned to main code format
Modified:
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/HttpServletRequestFactory.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MultipartStreamTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DefaultFileItemTest.java Sat Mar 9 12:30:27 2013
@@ -30,15 +30,13 @@ import java.util.Arrays;
import org.junit.Test;
-@SuppressWarnings("deprecation") // unit tests for deprecated class
-
/**
* Unit tests for {@link org.apache.commons.fileupload.DefaultFileItem}.
*
* @version $Id$
*/
-public class DefaultFileItemTest
- {
+@SuppressWarnings("deprecation") // unit tests for deprecated class
+public class DefaultFileItemTest {
/**
* Content type for regular form items.
@@ -59,8 +57,7 @@ public class DefaultFileItemTest
* Test construction of a regular text field.
*/
@Test
- public void testTextFieldConstruction()
- {
+ public void testTextFieldConstruction() {
FileItemFactory factory = createFactory(null);
String textFieldName = "textField";
@@ -81,8 +78,7 @@ public class DefaultFileItemTest
* Test construction of a file field.
*/
@Test
- public void testFileFieldConstruction()
- {
+ public void testFileFieldConstruction() {
FileItemFactory factory = createFactory(null);
String fileFieldName = "fileField";
String fileName = "originalFileName";
@@ -105,8 +101,7 @@ public class DefaultFileItemTest
* configured threshold.
*/
@Test
- public void testBelowThreshold()
- {
+ public void testBelowThreshold() {
FileItemFactory factory = createFactory(null);
String textFieldName = "textField";
String textFieldValue = "0123456789";
@@ -120,14 +115,11 @@ public class DefaultFileItemTest
);
assertNotNull(item);
- try
- {
+ try {
OutputStream os = item.getOutputStream();
os.write(testFieldValueBytes);
os.close();
- }
- catch(IOException e)
- {
+ } catch(IOException e) {
fail("Unexpected IOException");
}
assertTrue(item.isInMemory());
@@ -141,8 +133,7 @@ public class DefaultFileItemTest
* configured threshold, where no specific repository is configured.
*/
@Test
- public void testAboveThresholdDefaultRepository()
- {
+ public void testAboveThresholdDefaultRepository() {
doTestAboveThreshold(null);
}
@@ -151,8 +142,7 @@ public class DefaultFileItemTest
* configured threshold, where a specific repository is configured.
*/
@Test
- public void testAboveThresholdSpecifiedRepository()
- {
+ public void testAboveThresholdSpecifiedRepository() {
String tempPath = System.getProperty("java.io.tmpdir");
String tempDirName = "testAboveThresholdSpecifiedRepository";
File tempDir = new File(tempPath, tempDirName);
@@ -169,8 +159,7 @@ public class DefaultFileItemTest
* @param repository The directory within which temporary files will be
* created.
*/
- public void doTestAboveThreshold(File repository)
- {
+ public void doTestAboveThreshold(File repository) {
FileItemFactory factory = createFactory(repository);
String textFieldName = "textField";
String textFieldValue = "01234567890123456789";
@@ -184,14 +173,11 @@ public class DefaultFileItemTest
);
assertNotNull(item);
- try
- {
+ try {
OutputStream os = item.getOutputStream();
os.write(testFieldValueBytes);
os.close();
- }
- catch(IOException e)
- {
+ } catch(IOException e) {
fail("Unexpected IOException");
}
assertFalse(item.isInMemory());
@@ -206,8 +192,7 @@ public class DefaultFileItemTest
assertTrue(storeLocation.exists());
assertEquals(storeLocation.length(), testFieldValueBytes.length);
- if (repository != null)
- {
+ if (repository != null) {
assertEquals(storeLocation.getParentFile(), repository);
}
@@ -223,67 +208,58 @@ public class DefaultFileItemTest
* created.
* @return the new <code>FileItemFactory</code> instance.
*/
- protected FileItemFactory createFactory(File repository)
- {
+ protected FileItemFactory createFactory(File repository) {
return new DefaultFileItemFactory(threshold, repository);
}
-
static final String CHARSET_ISO88591 = "ISO-8859-1";
+
static final String CHARSET_ASCII = "US-ASCII";
+
static final String CHARSET_UTF8 = "UTF-8";
+
static final String CHARSET_KOI8_R = "KOI8_R";
+
static final String CHARSET_WIN1251 = "Cp1251";
- static final int SWISS_GERMAN_STUFF_UNICODE [] =
- {
+ static final int SWISS_GERMAN_STUFF_UNICODE [] = {
0x47, 0x72, 0xFC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xE4, 0x6D, 0xE4
};
- static final int SWISS_GERMAN_STUFF_ISO8859_1 [] =
- {
+ static final int SWISS_GERMAN_STUFF_ISO8859_1 [] = {
0x47, 0x72, 0xFC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xE4, 0x6D, 0xE4
};
- static final int SWISS_GERMAN_STUFF_UTF8 [] =
- {
+ static final int SWISS_GERMAN_STUFF_UTF8 [] = {
0x47, 0x72, 0xC3, 0xBC, 0x65, 0x7A, 0x69, 0x5F, 0x7A, 0xC3, 0xA4,
0x6D, 0xC3, 0xA4
};
- static final int RUSSIAN_STUFF_UNICODE [] =
- {
+ static final int RUSSIAN_STUFF_UNICODE [] = {
0x412, 0x441, 0x435, 0x43C, 0x5F, 0x43F, 0x440, 0x438,
0x432, 0x435, 0x442
};
- static final int RUSSIAN_STUFF_UTF8 [] =
- {
+ static final int RUSSIAN_STUFF_UTF8 [] = {
0xD0, 0x92, 0xD1, 0x81, 0xD0, 0xB5, 0xD0, 0xBC, 0x5F,
0xD0, 0xBF, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB2, 0xD0,
0xB5, 0xD1, 0x82
};
- static final int RUSSIAN_STUFF_KOI8R [] =
- {
+ static final int RUSSIAN_STUFF_KOI8R [] = {
0xF7, 0xD3, 0xC5, 0xCD, 0x5F, 0xD0, 0xD2, 0xC9, 0xD7,
0xC5, 0xD4
};
- static final int RUSSIAN_STUFF_WIN1251 [] =
- {
+ static final int RUSSIAN_STUFF_WIN1251 [] = {
0xC2, 0xF1, 0xE5, 0xEC, 0x5F, 0xEF, 0xF0, 0xE8, 0xE2,
0xE5, 0xF2
};
-
- private static String constructString(int[] unicodeChars)
- {
+ private static String constructString(int[] unicodeChars) {
StringBuffer buffer = new StringBuffer();
- if (unicodeChars != null)
- {
- for (int i = 0; i < unicodeChars.length; i++)
- {
+ if (unicodeChars != null) {
+ for (int i = 0; i < unicodeChars.length; i++) {
buffer.append((char) unicodeChars[i]);
}
}
@@ -293,8 +269,7 @@ public class DefaultFileItemTest
/**
* Test construction of content charset.
*/
- public void testContentCharSet() throws Exception
- {
+ public void testContentCharSet() throws Exception {
FileItemFactory factory = createFactory(null);
String teststr = constructString(SWISS_GERMAN_STUFF_UNICODE);
@@ -306,8 +281,7 @@ public class DefaultFileItemTest
true,
null);
OutputStream outstream = item.getOutputStream();
- for (int i = 0; i < SWISS_GERMAN_STUFF_ISO8859_1.length; i++)
- {
+ for (int i = 0; i < SWISS_GERMAN_STUFF_ISO8859_1.length; i++) {
outstream.write(SWISS_GERMAN_STUFF_ISO8859_1[i]);
}
outstream.close();
@@ -320,8 +294,7 @@ public class DefaultFileItemTest
true,
null);
outstream = item.getOutputStream();
- for (int i = 0; i < SWISS_GERMAN_STUFF_UTF8.length; i++)
- {
+ for (int i = 0; i < SWISS_GERMAN_STUFF_UTF8.length; i++) {
outstream.write(SWISS_GERMAN_STUFF_UTF8[i]);
}
outstream.close();
@@ -336,8 +309,7 @@ public class DefaultFileItemTest
true,
null);
outstream = item.getOutputStream();
- for (int i = 0; i < RUSSIAN_STUFF_KOI8R.length; i++)
- {
+ for (int i = 0; i < RUSSIAN_STUFF_KOI8R.length; i++) {
outstream.write(RUSSIAN_STUFF_KOI8R[i]);
}
outstream.close();
@@ -350,8 +322,7 @@ public class DefaultFileItemTest
true,
null);
outstream = item.getOutputStream();
- for (int i = 0; i < RUSSIAN_STUFF_WIN1251.length; i++)
- {
+ for (int i = 0; i < RUSSIAN_STUFF_WIN1251.length; i++) {
outstream.write(RUSSIAN_STUFF_WIN1251[i]);
}
outstream.close();
@@ -364,11 +335,11 @@ public class DefaultFileItemTest
true,
null);
outstream = item.getOutputStream();
- for (int i = 0; i < RUSSIAN_STUFF_UTF8.length; i++)
- {
+ for (int i = 0; i < RUSSIAN_STUFF_UTF8.length; i++) {
outstream.write(RUSSIAN_STUFF_UTF8[i]);
}
outstream.close();
assertEquals(teststr, teststr, item.getString());
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java Sat Mar 9 12:30:27 2013
@@ -38,8 +38,7 @@ import org.junit.Test;
*
* @version $Id$
*/
-public class DiskFileItemSerializeTest
-{
+public class DiskFileItemSerializeTest {
/**
* Content type for regular form items.
@@ -56,9 +55,7 @@ public class DiskFileItemSerializeTest
* configured threshold.
*/
@Test
- public void testBelowThreshold() throws Exception
- {
-
+ public void testBelowThreshold() throws Exception {
// Create the FileItem
byte[] testFieldValueBytes = createContentBytes(threshold - 1);
FileItem item = createFileItem(testFieldValueBytes);
@@ -77,7 +74,6 @@ public class DiskFileItemSerializeTest
// Compare FileItem's (except byte[])
compareFileItems(item, newItem);
-
}
/**
@@ -105,7 +101,6 @@ public class DiskFileItemSerializeTest
// Compare FileItem's (except byte[])
compareFileItems(item, newItem);
-
}
/**
@@ -114,7 +109,6 @@ public class DiskFileItemSerializeTest
*/
@Test
public void testAboveThreshold() throws Exception {
-
// Create the FileItem
byte[] testFieldValueBytes = createContentBytes(threshold + 1);
FileItem item = createFileItem(testFieldValueBytes);
@@ -187,14 +181,11 @@ public class DiskFileItemSerializeTest
true,
"My File Name"
);
- try
- {
+ try {
OutputStream os = item.getOutputStream();
os.write(contentBytes);
os.close();
- }
- catch(IOException e)
- {
+ } catch(IOException e) {
fail("Unexpected IOException" + e);
}
@@ -206,7 +197,6 @@ public class DiskFileItemSerializeTest
* Do serialization and deserialization.
*/
private Object serializeDeserialize(Object target) {
-
// Serialize the test object
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
@@ -230,7 +220,6 @@ public class DiskFileItemSerializeTest
fail("Exception during deserialization: " + e);
}
return result;
-
}
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileItemHeadersTest.java Sat Mar 9 12:30:27 2013
@@ -33,6 +33,7 @@ import org.junit.Test;
* @version $Id$
*/
public class FileItemHeadersTest {
+
/**
* @throws Exception
*/
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/FileUploadTestCase.java Sat Mar 9 12:30:27 2013
@@ -30,6 +30,7 @@ import org.apache.commons.fileupload.ser
* @version $Id$
*/
public abstract class FileUploadTestCase {
+
protected static final String CONTENT_TYPE = "multipart/form-data; boundary=---1234";
protected List<FileItem> parseUpload(byte[] bytes) throws FileUploadException {
@@ -45,9 +46,9 @@ public abstract class FileUploadTestCase
}
protected List<FileItem> parseUpload(String content)
- throws UnsupportedEncodingException, FileUploadException
- {
+ throws UnsupportedEncodingException, FileUploadException {
byte[] bytes = content.getBytes("US-ASCII");
return parseUpload(bytes, CONTENT_TYPE);
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/HttpServletRequestFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/HttpServletRequestFactory.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/HttpServletRequestFactory.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/HttpServletRequestFactory.java Sat Mar 9 12:30:27 2013
@@ -21,10 +21,9 @@ import javax.servlet.http.HttpServletReq
/**
* @version $Id$
*/
-final class HttpServletRequestFactory
-{
- static public HttpServletRequest createHttpServletRequestWithNullContentType()
- {
+final class HttpServletRequestFactory {
+
+ static public HttpServletRequest createHttpServletRequestWithNullContentType() {
byte[] requestData = "foobar".getBytes();
return new MockHttpServletRequest(
requestData,
@@ -32,8 +31,7 @@ final class HttpServletRequestFactory
}
static public HttpServletRequest createValidHttpServletRequest(
- final String[] strFileNames)
- {
+ final String[] strFileNames) {
// todo - provide a real implementation
StringBuffer sbRequestData = new StringBuffer();
@@ -51,11 +49,11 @@ final class HttpServletRequestFactory
FileUploadBase.MULTIPART_FORM_DATA);
}
- static public HttpServletRequest createInvalidHttpServletRequest()
- {
+ static public HttpServletRequest createInvalidHttpServletRequest() {
byte[] requestData = "foobar".getBytes();
return new MockHttpServletRequest(
requestData,
FileUploadBase.MULTIPART_FORM_DATA);
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockHttpServletRequest.java Sat Mar 9 12:30:27 2013
@@ -35,12 +35,14 @@ import javax.servlet.http.HttpSession;
/**
* @version $Id$
*/
-class MockHttpServletRequest implements HttpServletRequest
-{
+class MockHttpServletRequest implements HttpServletRequest {
private final InputStream m_requestData;
+
private final long length;
+
private String m_strContentType;
+
private final Map<String, String> m_headers = new java.util.HashMap<String, String>();
/**
@@ -49,8 +51,7 @@ class MockHttpServletRequest implements
*/
public MockHttpServletRequest(
final byte[] requestData,
- final String strContentType)
- {
+ final String strContentType) {
this(new ByteArrayInputStream(requestData),
requestData.length, strContentType);
}
@@ -62,8 +63,7 @@ class MockHttpServletRequest implements
public MockHttpServletRequest(
final InputStream requestData,
final long requestLength,
- final String strContentType)
- {
+ final String strContentType) {
m_requestData = requestData;
length = requestLength;
m_strContentType = strContentType;
@@ -73,40 +73,35 @@ class MockHttpServletRequest implements
/**
* @see javax.servlet.http.HttpServletRequest#getAuthType()
*/
- public String getAuthType()
- {
+ public String getAuthType() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getCookies()
*/
- public Cookie[] getCookies()
- {
+ public Cookie[] getCookies() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getDateHeader(String)
*/
- public long getDateHeader(String arg0)
- {
+ public long getDateHeader(String arg0) {
return 0;
}
/**
* @see javax.servlet.http.HttpServletRequest#getHeader(String)
*/
- public String getHeader(String headerName)
- {
+ public String getHeader(String headerName) {
return m_headers.get(headerName);
}
/**
* @see javax.servlet.http.HttpServletRequest#getHeaders(String)
*/
- public Enumeration<String> getHeaders(String arg0)
- {
+ public Enumeration<String> getHeaders(String arg0) {
// todo - implement
return null;
}
@@ -114,8 +109,7 @@ class MockHttpServletRequest implements
/**
* @see javax.servlet.http.HttpServletRequest#getHeaderNames()
*/
- public Enumeration<String> getHeaderNames()
- {
+ public Enumeration<String> getHeaderNames() {
// todo - implement
return null;
}
@@ -123,144 +117,126 @@ class MockHttpServletRequest implements
/**
* @see javax.servlet.http.HttpServletRequest#getIntHeader(String)
*/
- public int getIntHeader(String arg0)
- {
+ public int getIntHeader(String arg0) {
return 0;
}
/**
* @see javax.servlet.http.HttpServletRequest#getMethod()
*/
- public String getMethod()
- {
+ public String getMethod() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getPathInfo()
*/
- public String getPathInfo()
- {
+ public String getPathInfo() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getPathTranslated()
*/
- public String getPathTranslated()
- {
+ public String getPathTranslated() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getContextPath()
*/
- public String getContextPath()
- {
+ public String getContextPath() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getQueryString()
*/
- public String getQueryString()
- {
+ public String getQueryString() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getRemoteUser()
*/
- public String getRemoteUser()
- {
+ public String getRemoteUser() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#isUserInRole(String)
*/
- public boolean isUserInRole(String arg0)
- {
+ public boolean isUserInRole(String arg0) {
return false;
}
/**
* @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
*/
- public Principal getUserPrincipal()
- {
+ public Principal getUserPrincipal() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getRequestedSessionId()
*/
- public String getRequestedSessionId()
- {
+ public String getRequestedSessionId() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
*/
- public String getRequestURI()
- {
+ public String getRequestURI() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getRequestURL()
*/
- public StringBuffer getRequestURL()
- {
+ public StringBuffer getRequestURL() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getServletPath()
*/
- public String getServletPath()
- {
+ public String getServletPath() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getSession(boolean)
*/
- public HttpSession getSession(boolean arg0)
- {
+ public HttpSession getSession(boolean arg0) {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#getSession()
*/
- public HttpSession getSession()
- {
+ public HttpSession getSession() {
return null;
}
/**
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
*/
- public boolean isRequestedSessionIdValid()
- {
+ public boolean isRequestedSessionIdValid() {
return false;
}
/**
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
*/
- public boolean isRequestedSessionIdFromCookie()
- {
+ public boolean isRequestedSessionIdFromCookie() {
return false;
}
/**
* @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
*/
- public boolean isRequestedSessionIdFromURL()
- {
+ public boolean isRequestedSessionIdFromURL() {
return false;
}
@@ -269,32 +245,28 @@ class MockHttpServletRequest implements
* @deprecated
*/
@Deprecated
- public boolean isRequestedSessionIdFromUrl()
- {
+ public boolean isRequestedSessionIdFromUrl() {
return false;
}
/**
* @see javax.servlet.ServletRequest#getAttribute(String)
*/
- public Object getAttribute(String arg0)
- {
+ public Object getAttribute(String arg0) {
return null;
}
/**
* @see javax.servlet.ServletRequest#getAttributeNames()
*/
- public Enumeration<String> getAttributeNames()
- {
+ public Enumeration<String> getAttributeNames() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getCharacterEncoding()
*/
- public String getCharacterEncoding()
- {
+ public String getCharacterEncoding() {
return null;
}
@@ -302,23 +274,18 @@ class MockHttpServletRequest implements
* @see javax.servlet.ServletRequest#setCharacterEncoding(String)
*/
public void setCharacterEncoding(String arg0)
- throws UnsupportedEncodingException
- {
+ throws UnsupportedEncodingException {
}
/**
* @see javax.servlet.ServletRequest#getContentLength()
*/
- public int getContentLength()
- {
+ public int getContentLength() {
int iLength = 0;
- if (null == m_requestData)
- {
+ if (null == m_requestData) {
iLength = -1;
- }
- else
- {
+ } else {
if (length > Integer.MAX_VALUE) {
throw new RuntimeException("Value '" + length + "' is too large to be converted to int");
}
@@ -330,16 +297,14 @@ class MockHttpServletRequest implements
/**
* @see javax.servlet.ServletRequest#getContentType()
*/
- public String getContentType()
- {
+ public String getContentType() {
return m_strContentType;
}
/**
* @see javax.servlet.ServletRequest#getInputStream()
*/
- public ServletInputStream getInputStream() throws IOException
- {
+ public ServletInputStream getInputStream() throws IOException {
ServletInputStream sis = new MyServletInputStream(m_requestData);
return sis;
}
@@ -347,166 +312,145 @@ class MockHttpServletRequest implements
/**
* @see javax.servlet.ServletRequest#getParameter(String)
*/
- public String getParameter(String arg0)
- {
+ public String getParameter(String arg0) {
return null;
}
/**
* @see javax.servlet.ServletRequest#getParameterNames()
*/
- public Enumeration<String> getParameterNames()
- {
+ public Enumeration<String> getParameterNames() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getParameterValues(String)
*/
- public String[] getParameterValues(String arg0)
- {
+ public String[] getParameterValues(String arg0) {
return null;
}
/**
* @see javax.servlet.ServletRequest#getParameterMap()
*/
- public Map<String, String[]> getParameterMap()
- {
+ public Map<String, String[]> getParameterMap() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getProtocol()
*/
- public String getProtocol()
- {
+ public String getProtocol() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getScheme()
*/
- public String getScheme()
- {
+ public String getScheme() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getServerName()
*/
- public String getServerName()
- {
+ public String getServerName() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getLocalName()
*/
- public String getLocalName()
- {
+ public String getLocalName() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getServerPort()
*/
- public int getServerPort()
- {
+ public int getServerPort() {
return 0;
}
/**
* @see javax.servlet.ServletRequest#getLocalPort()
*/
- public int getLocalPort()
- {
+ public int getLocalPort() {
return 0;
}
/**
* @see javax.servlet.ServletRequest#getRemotePort()
*/
- public int getRemotePort()
- {
+ public int getRemotePort() {
return 0;
}
/**
* @see javax.servlet.ServletRequest#getReader()
*/
- public BufferedReader getReader() throws IOException
- {
+ public BufferedReader getReader() throws IOException {
return null;
}
/**
* @see javax.servlet.ServletRequest#getRemoteAddr()
*/
- public String getRemoteAddr()
- {
+ public String getRemoteAddr() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getLocalAddr()
*/
- public String getLocalAddr()
- {
+ public String getLocalAddr() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getRemoteHost()
*/
- public String getRemoteHost()
- {
+ public String getRemoteHost() {
return null;
}
/**
* @see javax.servlet.ServletRequest#setAttribute(String, Object)
*/
- public void setAttribute(String arg0, Object arg1)
- {
+ public void setAttribute(String arg0, Object arg1) {
}
/**
* @see javax.servlet.ServletRequest#removeAttribute(String)
*/
- public void removeAttribute(String arg0)
- {
+ public void removeAttribute(String arg0) {
}
/**
* @see javax.servlet.ServletRequest#getLocale()
*/
- public Locale getLocale()
- {
+ public Locale getLocale() {
return null;
}
/**
* @see javax.servlet.ServletRequest#getLocales()
*/
- public Enumeration<Locale> getLocales()
- {
+ public Enumeration<Locale> getLocales() {
return null;
}
/**
* @see javax.servlet.ServletRequest#isSecure()
*/
- public boolean isSecure()
- {
+ public boolean isSecure() {
return false;
}
/**
* @see javax.servlet.ServletRequest#getRequestDispatcher(String)
*/
- public RequestDispatcher getRequestDispatcher(String arg0)
- {
+ public RequestDispatcher getRequestDispatcher(String arg0) {
return null;
}
@@ -515,8 +459,7 @@ class MockHttpServletRequest implements
* @deprecated
*/
@Deprecated
- public String getRealPath(String arg0)
- {
+ public String getRealPath(String arg0) {
return null;
}
@@ -527,29 +470,28 @@ class MockHttpServletRequest implements
*
*/
private static class MyServletInputStream
- extends javax.servlet.ServletInputStream
- {
+ extends javax.servlet.ServletInputStream {
+
private final InputStream in;
/**
* Creates a new instance, which returns the given
* streams data.
*/
- public MyServletInputStream(InputStream pStream)
- {
+ public MyServletInputStream(InputStream pStream) {
in = pStream;
}
@Override
- public int read() throws IOException
- {
+ public int read() throws IOException {
return in.read();
}
@Override
- public int read(byte b[], int off, int len) throws IOException
- {
+ public int read(byte b[], int off, int len) throws IOException {
return in.read(b, off, len);
}
+
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletRequest.java Sat Mar 9 12:30:27 2013
@@ -33,282 +33,310 @@ import javax.portlet.WindowState;
*
* @version $Id$
*/
-public class MockPortletRequest implements PortletRequest
-{
+public class MockPortletRequest implements PortletRequest {
+
MockPortletSession session = null;
- public MockPortletRequest()
- {
+ public MockPortletRequest() {
session = new MockPortletSession();
}
/* (non-Javadoc)
* @see javax.portlet.PortletRequest#isWindowStateAllowed(javax.portlet.WindowState)
*/
- public boolean isWindowStateAllowed(WindowState state)
- {
+ public boolean isWindowStateAllowed(WindowState state) {
// TODO Auto-generated method stub
return false;
}
+
/* (non-Javadoc)
* @see javax.portlet.PortletRequest#isPortletModeAllowed(javax.portlet.PortletMode)
*/
- public boolean isPortletModeAllowed(PortletMode mode)
- {
+ public boolean isPortletModeAllowed(PortletMode mode) {
// TODO Auto-generated method stub
return false;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPortletMode()
*/
- public PortletMode getPortletMode()
- {
+ public PortletMode getPortletMode() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getWindowState()
*/
- public WindowState getWindowState()
- {
+ public WindowState getWindowState() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPreferences()
*/
- public PortletPreferences getPreferences()
- {
+ public PortletPreferences getPreferences() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPortletSession()
*/
- public PortletSession getPortletSession()
- {
+ public PortletSession getPortletSession() {
return session;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPortletSession(boolean)
*/
- public PortletSession getPortletSession(boolean create)
- {
- if (session == null)
+ public PortletSession getPortletSession( boolean create ) {
+ if ( session == null )
{
session = new MockPortletSession();
}
return session;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getProperty(java.lang.String)
*/
- public String getProperty(String name)
- {
+ public String getProperty( String name ) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getProperties(java.lang.String)
*/
- public Enumeration<String> getProperties(String name)
- {
+ public Enumeration<String> getProperties( String name ) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPropertyNames()
*/
- public Enumeration<String> getPropertyNames()
- {
+ public Enumeration<String> getPropertyNames() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getPortalContext()
*/
- public PortalContext getPortalContext()
- {
+ public PortalContext getPortalContext() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getAuthType()
*/
- public String getAuthType()
- {
+ public String getAuthType() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getContextPath()
*/
- public String getContextPath()
- {
+ public String getContextPath() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getRemoteUser()
*/
- public String getRemoteUser()
- {
+ public String getRemoteUser() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getUserPrincipal()
*/
- public Principal getUserPrincipal()
- {
+ public Principal getUserPrincipal() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#isUserInRole(java.lang.String)
*/
- public boolean isUserInRole(String role)
- {
+ public boolean isUserInRole( String role ) {
// TODO Auto-generated method stub
return false;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getAttribute(java.lang.String)
*/
- public Object getAttribute(String name)
- {
+ public Object getAttribute( String name ) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getAttributeNames()
*/
- public Enumeration<String> getAttributeNames()
- {
+ public Enumeration<String> getAttributeNames() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getParameter(java.lang.String)
*/
- public String getParameter(String name)
- {
+ public String getParameter( String name ) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getParameterNames()
*/
- public Enumeration<String> getParameterNames()
- {
+ public Enumeration<String> getParameterNames() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getParameterValues(java.lang.String)
*/
- public String[] getParameterValues(String name)
- {
+ public String[] getParameterValues( String name ) {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getParameterMap()
*/
- public Map<String, String[]> getParameterMap()
- {
+ public Map<String, String[]> getParameterMap() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#isSecure()
*/
- public boolean isSecure()
- {
+ public boolean isSecure() {
// TODO Auto-generated method stub
return false;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#setAttribute(java.lang.String, java.lang.Object)
*/
- public void setAttribute(String name, Object o)
- {
+ public void setAttribute( String name, Object o ) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#removeAttribute(java.lang.String)
*/
- public void removeAttribute(String name)
- {
+ public void removeAttribute( String name ) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getRequestedSessionId()
*/
- public String getRequestedSessionId()
- {
+ public String getRequestedSessionId() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#isRequestedSessionIdValid()
*/
- public boolean isRequestedSessionIdValid()
- {
+ public boolean isRequestedSessionIdValid() {
// TODO Auto-generated method stub
return false;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getResponseContentType()
*/
- public String getResponseContentType()
- {
+ public String getResponseContentType() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getResponseContentTypes()
*/
- public Enumeration<String> getResponseContentTypes()
- {
+ public Enumeration<String> getResponseContentTypes() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getLocale()
*/
- public Locale getLocale()
- {
+ public Locale getLocale() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getScheme()
*/
- public String getScheme()
- {
+ public String getScheme() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getServerName()
*/
- public String getServerName()
- {
+ public String getServerName() {
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
* @see javax.portlet.PortletRequest#getServerPort()
*/
- public int getServerPort()
- {
+ public int getServerPort() {
// TODO Auto-generated method stub
return 0;
}
- public Enumeration<Locale> getLocales()
- {
+ public Enumeration<Locale> getLocales() {
return null;
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MockPortletSession.java Sat Mar 9 12:30:27 2013
@@ -27,45 +27,39 @@ import javax.portlet.PortletSession;
*
* @version $Id$
*/
-public class MockPortletSession implements PortletSession
-{
+public class MockPortletSession implements PortletSession {
+
// Hashtable (not HashMap) makes enumerations easier to work with
Hashtable<String, Object> attributes = new Hashtable<String, Object>();
- public MockPortletSession()
- {
+ public MockPortletSession() {
}
-
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getAttribute(java.lang.String)
*/
- public Object getAttribute(String name)
- {
+ public Object getAttribute(String name) {
return attributes.get(name);
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getAttribute(java.lang.String, int)
*/
- public Object getAttribute(String name, int scope)
- {
+ public Object getAttribute(String name, int scope) {
return attributes.get(name);
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getAttributeNames(int)
*/
- public Enumeration<String> getAttributeNames(int scope)
- {
+ public Enumeration<String> getAttributeNames(int scope) {
return attributes.keys();
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getCreationTime()
*/
- public long getCreationTime()
- {
+ public long getCreationTime() {
// TODO Auto-generated method stub
return 0;
}
@@ -73,8 +67,7 @@ public class MockPortletSession implemen
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getId()
*/
- public String getId()
- {
+ public String getId() {
// TODO Auto-generated method stub
return null;
}
@@ -82,8 +75,7 @@ public class MockPortletSession implemen
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getLastAccessedTime()
*/
- public long getLastAccessedTime()
- {
+ public long getLastAccessedTime() {
// TODO Auto-generated method stub
return 0;
}
@@ -91,8 +83,7 @@ public class MockPortletSession implemen
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getMaxInactiveInterval()
*/
- public int getMaxInactiveInterval()
- {
+ public int getMaxInactiveInterval() {
// TODO Auto-generated method stub
return 0;
}
@@ -100,16 +91,14 @@ public class MockPortletSession implemen
/* (non-Javadoc)
* @see javax.portlet.PortletSession#invalidate()
*/
- public void invalidate()
- {
+ public void invalidate() {
// TODO Auto-generated method stub
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#isNew()
*/
- public boolean isNew()
- {
+ public boolean isNew() {
// TODO Auto-generated method stub
return false;
}
@@ -117,54 +106,48 @@ public class MockPortletSession implemen
/* (non-Javadoc)
* @see javax.portlet.PortletSession#removeAttribute(java.lang.String)
*/
- public void removeAttribute(String name)
- {
+ public void removeAttribute(String name) {
attributes.remove(name);
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#removeAttribute(java.lang.String, int)
*/
- public void removeAttribute(String name, int scope)
- {
+ public void removeAttribute(String name, int scope) {
attributes.remove(name);
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#setAttribute(java.lang.String, java.lang.Object)
*/
- public void setAttribute(String name, Object value)
- {
+ public void setAttribute(String name, Object value) {
attributes.put(name, value);
}
- public Enumeration<String> getAttributeNames()
- {
+ public Enumeration<String> getAttributeNames() {
return this.getAttributeNames(PortletSession.PORTLET_SCOPE);
}
-
/* (non-Javadoc)
* @see javax.portlet.PortletSession#setAttribute(java.lang.String, java.lang.Object, int)
*/
- public void setAttribute(String name, Object value, int scope)
- {
+ public void setAttribute(String name, Object value, int scope) {
attributes.put(name, value);
}
/* (non-Javadoc)
* @see javax.portlet.PortletSession#setMaxInactiveInterval(int)
*/
- public void setMaxInactiveInterval(int interval)
- {
+ public void setMaxInactiveInterval(int interval) {
// TODO Auto-generated method stub
}
+
/* (non-Javadoc)
* @see javax.portlet.PortletSession#getPortletContext()
*/
- public PortletContext getPortletContext()
- {
+ public PortletContext getPortletContext() {
// TODO Auto-generated method stub
return null;
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MultipartStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MultipartStreamTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MultipartStreamTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/MultipartStreamTest.java Sat Mar 9 12:30:27 2013
@@ -16,18 +16,16 @@
*/
package org.apache.commons.fileupload;
-
import junit.framework.TestCase;
import java.io.*;
-
/**
* Unit tests {@link org.apache.commons.fileupload.MultipartStream}.
*
* @version $Id$
*/
-public class MultipartStreamTest extends TestCase
-{
+public class MultipartStreamTest extends TestCase {
+
static private final String BOUNDARY_TEXT = "myboundary";
public void testThreeParamConstructor() throws Exception {
@@ -55,4 +53,5 @@ public class MultipartStreamTest extends
new MultipartStream.ProgressNotifier(null, contents.length));
assertNotNull(ms);
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ParameterParserTest.java Sat Mar 9 12:30:27 2013
@@ -28,12 +28,10 @@ import org.junit.Test;
*
* @version $Id$
*/
-public class ParameterParserTest
-{
+public class ParameterParserTest {
@Test
- public void testParsing()
- {
+ public void testParsing() {
String s =
"test; test1 = stuff ; test2 = \"stuff; stuff\"; test3=\"stuff";
ParameterParser parser = new ParameterParser();
@@ -70,8 +68,7 @@ public class ParameterParserTest
}
@Test
- public void testContentTypeParsing()
- {
+ public void testContentTypeParsing() {
String s = "text/plain; Charset=UTF-8";
ParameterParser parser = new ParameterParser();
parser.setLowerCaseNames(true);
@@ -80,8 +77,7 @@ public class ParameterParserTest
}
@Test
- public void testParsingEscapedChars()
- {
+ public void testParsingEscapedChars() {
String s = "param = \"stuff\\\"; more stuff\"";
ParameterParser parser = new ParameterParser();
Map<String, String> params = parser.parse(s, ';');
@@ -97,8 +93,7 @@ public class ParameterParserTest
// See: http://issues.apache.org/jira/browse/FILEUPLOAD-139
@Test
- public void testFileUpload139()
- {
+ public void testFileUpload139() {
ParameterParser parser = new ParameterParser();
String s = "Content-type: multipart/form-data , boundary=AaB03x";
Map<String, String> params = parser.parse(s, new char[] { ',', ';' });
@@ -112,4 +107,5 @@ public class ParameterParserTest
params = parser.parse(s, new char[] { ',', ';' });
assertEquals("BbC04y", params.get("boundary"));
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ProgressListenerTest.java Sat Mar 9 12:30:27 2013
@@ -27,22 +27,28 @@ import java.io.InputStream;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.junit.Test;
-
/**
* Tests the progress listener.
*
* @version $Id$
*/
public class ProgressListenerTest extends FileUploadTestCase {
+
private class ProgressListenerImpl implements ProgressListener {
+
private final long expectedContentLength;
+
private final int expectedItems;
+
private Long bytesRead;
+
private Integer items;
+
ProgressListenerImpl(long pContentLength, int pItems) {
expectedContentLength = pContentLength;
expectedItems = pItems;
}
+
public void update(long pBytesRead, long pContentLength, int pItems) {
assertTrue(pBytesRead >= 0 && pBytesRead <= expectedContentLength);
assertTrue(pContentLength == -1 || pContentLength == expectedContentLength);
@@ -53,10 +59,12 @@ public class ProgressListenerTest extend
assertTrue(items == null || pItems >= items.intValue());
items = new Integer(pItems);
}
+
void checkFinished(){
assertEquals(expectedContentLength, bytesRead.longValue());
assertEquals(expectedItems, items.intValue());
}
+
}
/**
@@ -116,4 +124,5 @@ public class ProgressListenerTest extend
assertTrue(!iter.hasNext());
listener.checkFinished();
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/ServletFileUploadTest.java Sat Mar 9 12:30:27 2013
@@ -30,18 +30,16 @@ import javax.servlet.http.HttpServletReq
import org.junit.Test;
-@SuppressWarnings("deprecation") // unit tests for deprecated class
-
/**
* Unit tests {@link org.apache.commons.fileupload.DiskFileUpload}.
*
* @version $Id$
*/
-public class ServletFileUploadTest extends FileUploadTestCase
-{
+@SuppressWarnings("deprecation") // unit tests for deprecated class
+public class ServletFileUploadTest extends FileUploadTestCase {
+
@Test
- public void testWithInvalidRequest()
- {
+ public void testWithInvalidRequest() {
FileUploadBase fu = null;
fu = new DiskFileUpload();
@@ -58,36 +56,27 @@ public class ServletFileUploadTest exten
{
// this exception is expected
}
-
}
@Test
- public void testWithNullContentType()
- {
+ public void testWithNullContentType() {
FileUploadBase fu = new DiskFileUpload();
HttpServletRequest req = HttpServletRequestFactory.createHttpServletRequestWithNullContentType();
- try
- {
+ try {
fu.parseRequest(req);
fail("testWithNullContentType: expected exception was not thrown");
- }
- catch (DiskFileUpload.InvalidContentTypeException expected)
- {
+ } catch (DiskFileUpload.InvalidContentTypeException expected) {
// this exception is expected
- }
- catch (FileUploadException unexpected)
- {
+ } catch (FileUploadException unexpected) {
fail("testWithNullContentType: unexpected exception was thrown");
}
-
}
@Test
public void testFileUpload()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
List<FileItem> fileItems = parseUpload("-----1234\r\n" +
"Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
"Content-Type: text/whatever\r\n" +
@@ -134,8 +123,7 @@ public class ServletFileUploadTest exten
@Test
public void testFilenameCaseSensitivity()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
List<FileItem> fileItems = parseUpload("-----1234\r\n" +
"Content-Disposition: form-data; name=\"FiLe\"; filename=\"FOO.tab\"\r\n" +
"Content-Type: text/whatever\r\n" +
@@ -155,8 +143,7 @@ public class ServletFileUploadTest exten
*/
@Test
public void testEmptyFile()
- throws UnsupportedEncodingException, FileUploadException
- {
+ throws UnsupportedEncodingException, FileUploadException {
List<FileItem> fileItems = parseUpload ("-----1234\r\n" +
"Content-Disposition: form-data; name=\"file\"; filename=\"\"\r\n" +
"\r\n" +
@@ -177,8 +164,7 @@ public class ServletFileUploadTest exten
*/
@Test
public void testIE5MacBug()
- throws UnsupportedEncodingException, FileUploadException
- {
+ throws UnsupportedEncodingException, FileUploadException {
List<FileItem> fileItems = parseUpload("-----1234\r\n" +
"Content-Disposition: form-data; name=\"field1\"\r\n" +
"\r\n" +
@@ -316,14 +302,12 @@ public class ServletFileUploadTest exten
assertEquals("value2", multi1.getString());
}
-
/**
* Test case for <a href="http://issues.apache.org/jira/browse/FILEUPLOAD-130">
*/
@Test
public void testFileUpload130()
- throws Exception
- {
+ throws Exception {
final String[] headerNames = new String[]
{
"SomeHeader", "OtherHeader", "YetAnotherHeader", "WhatAHeader"
@@ -373,19 +357,15 @@ public class ServletFileUploadTest exten
}
private void assertHeaders(String[] pHeaderNames, String[] pHeaderValues,
- FileItem pItem, int pIndex)
- {
- for (int i = 0; i < pHeaderNames.length; i++)
- {
+ FileItem pItem, int pIndex) {
+ for (int i = 0; i < pHeaderNames.length; i++) {
final String value = pItem.getHeaders().getHeader(pHeaderNames[i]);
- if (i == pIndex)
- {
+ if (i == pIndex) {
assertEquals(pHeaderValues[i], value);
- }
- else
- {
+ } else {
assertNull(value);
}
}
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/SizesTest.java Sat Mar 9 12:30:27 2013
@@ -31,20 +31,19 @@ import org.apache.commons.fileupload.dis
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.junit.Test;
-
/**
* Unit test for items with varying sizes.
*
* @version $Id$
*/
-public class SizesTest extends FileUploadTestCase
-{
- /** Runs a test with varying file sizes.
+public class SizesTest extends FileUploadTestCase {
+
+ /**
+ * Runs a test with varying file sizes.
*/
@Test
public void testFileUpload()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int add = 16;
int num = 0;
@@ -86,8 +85,7 @@ public class SizesTest extends FileUploa
*/
@Test
public void testFileSizeLimit()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
final String request =
"-----1234\r\n" +
"Content-Disposition: form-data; name=\"file\"; filename=\"foo.tab\"\r\n" +
@@ -123,4 +121,5 @@ public class SizesTest extends FileUploa
assertEquals(30, e.getPermittedSize());
}
}
+
}
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java?rev=1454693&r1=1454692&r2=1454693&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/StreamingTest.java Sat Mar 9 12:30:27 2013
@@ -33,20 +33,18 @@ import org.apache.commons.fileupload.ser
import junit.framework.TestCase;
-
/**
* Unit test for items with varying sizes.
*
* @version $Id$
*/
-public class StreamingTest extends TestCase
-{
+public class StreamingTest extends TestCase {
+
/**
* Tests a file upload with varying file sizes.
*/
public void testFileUpload()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
byte[] request = newRequest();
List<FileItem> fileItems = parseUpload(request);
Iterator<FileItem> fileIter = fileItems.iterator();
@@ -67,7 +65,6 @@ public class StreamingTest extends TestC
assertTrue(!fileIter.hasNext());
}
-
/**
* Tests, whether an invalid request throws a proper
* exception.
@@ -126,8 +123,7 @@ public class StreamingTest extends TestC
* Test for FILEUPLOAD-135
*/
public void testFILEUPLOAD135()
- throws IOException, FileUploadException
- {
+ throws IOException, FileUploadException {
byte[] request = newShortRequest();
final ByteArrayInputStream bais = new ByteArrayInputStream(request);
List<FileItem> fileItems = parseUpload(new InputStream() {
@@ -277,4 +273,5 @@ public class StreamingTest extends TestC
assertTrue(e.getMessage().indexOf("foo.exe\\0.png") != -1);
}
}
+
}