You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/03/06 02:55:59 UTC
svn commit: r1453130 -
/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
Author: sebb
Date: Wed Mar 6 01:55:59 2013
New Revision: 1453130
URL: http://svn.apache.org/r1453130
Log:
Simplify
Modified:
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/DiskFileItemSerializeTest.java
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=1453130&r1=1453129&r2=1453130&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 Wed Mar 6 01:55:59 2013
@@ -54,7 +54,7 @@ public class DiskFileItemSerializeTest
* configured threshold.
*/
@Test
- public void testBelowThreshold()
+ public void testBelowThreshold() throws Exception
{
// Create the FileItem
@@ -67,23 +67,14 @@ public class DiskFileItemSerializeTest
compareBytes("Initial", item.get(), testFieldValueBytes);
// Serialize & Deserialize
- try
- {
- FileItem newItem = (FileItem)serializeDeserialize(item);
+ FileItem newItem = (FileItem)serializeDeserialize(item);
- // Test deserialized content is as expected
- assertTrue("Check in memory", newItem.isInMemory());
- compareBytes("Check", testFieldValueBytes, newItem.get());
-
- // Compare FileItem's (except byte[])
- compareFileItems(item, newItem);
-
- }
- catch(Exception e)
- {
- fail("Error Serializing/Deserializing: " + e);
- }
+ // Test deserialized content is as expected
+ assertTrue("Check in memory", newItem.isInMemory());
+ compareBytes("Check", testFieldValueBytes, newItem.get());
+ // Compare FileItem's (except byte[])
+ compareFileItems(item, newItem);
}
@@ -92,7 +83,7 @@ public class DiskFileItemSerializeTest
* configured threshold.
*/
@Test
- public void testThreshold() {
+ public void testThreshold() throws Exception {
// Create the FileItem
byte[] testFieldValueBytes = createContentBytes(threshold);
FileItem item = createFileItem(testFieldValueBytes);
@@ -104,22 +95,15 @@ public class DiskFileItemSerializeTest
// Serialize & Deserialize
- try
- {
- FileItem newItem = (FileItem)serializeDeserialize(item);
+ FileItem newItem = (FileItem)serializeDeserialize(item);
- // Test deserialized content is as expected
- assertTrue("Check in memory", newItem.isInMemory());
- compareBytes("Check", testFieldValueBytes, newItem.get());
+ // Test deserialized content is as expected
+ assertTrue("Check in memory", newItem.isInMemory());
+ compareBytes("Check", testFieldValueBytes, newItem.get());
- // Compare FileItem's (except byte[])
- compareFileItems(item, newItem);
+ // Compare FileItem's (except byte[])
+ compareFileItems(item, newItem);
- }
- catch(Exception e)
- {
- fail("Error Serializing/Deserializing: " + e);
- }
}
/**
@@ -127,7 +111,7 @@ public class DiskFileItemSerializeTest
* configured threshold.
*/
@Test
- public void testAboveThreshold() {
+ public void testAboveThreshold() throws Exception {
// Create the FileItem
byte[] testFieldValueBytes = createContentBytes(threshold + 1);
@@ -139,22 +123,14 @@ public class DiskFileItemSerializeTest
compareBytes("Initial", item.get(), testFieldValueBytes);
// Serialize & Deserialize
- try
- {
- FileItem newItem = (FileItem)serializeDeserialize(item);
+ FileItem newItem = (FileItem)serializeDeserialize(item);
- // Test deserialized content is as expected
- assertFalse("Check in memory", newItem.isInMemory());
- compareBytes("Check", testFieldValueBytes, newItem.get());
+ // Test deserialized content is as expected
+ assertFalse("Check in memory", newItem.isInMemory());
+ compareBytes("Check", testFieldValueBytes, newItem.get());
- // Compare FileItem's (except byte[])
- compareFileItems(item, newItem);
-
- }
- catch(Exception e)
- {
- fail("Error Serializing/Deserializing: " + e);
- }
+ // Compare FileItem's (except byte[])
+ compareFileItems(item, newItem);
}
/**