commit 1415c9a2a6317dbdca6f1fbb530db1f558d9bef5
author Allon Mureinik <amureini@redhat.com> Wed Apr 04 07:07:20 2018 +0300
committer pascalschumacher <pascalschumacher@gmx.net> Wed Apr 04 09:32:22 2018 +0200
tree 1245a8aa1ab1914a9cfe6fb38d95ca6be8903d00
parent aff0fae2ec3a7d74356776c183c6986eb9eed520

SerializationUtilsTest expected exceptions

Use the expected argument of the @Test annotation instead of
boiler-plate implementing this behavior with a try-catch-fail
construct in order to clean up the code and make it more obvious to
the reader.

src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java

diff --git a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
index cd20602..ff65cb4 100644
--- a/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/SerializationUtilsTest.java
@@ -23,7 +23,6 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -116,16 +115,11 @@ public void testSerializeStream() throws Exception {
         }
     }
 
-    @Test
+    @Test(expected = SerializationException.class)
     public void testSerializeStreamUnserializable() throws Exception {
         final ByteArrayOutputStream streamTest = new ByteArrayOutputStream();
-        try {
-            iMap.put(new Object(), new Object());
-            SerializationUtils.serialize(iMap, streamTest);
-        } catch (final SerializationException ex) {
-            return;
-        }
-        fail();
+        iMap.put(new Object(), new Object());
+        SerializationUtils.serialize(iMap, streamTest);
     }
 
     @Test
@@ -147,24 +141,14 @@ public void testSerializeStreamNullObj() throws Exception {
         }
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testSerializeStreamObjNull() throws Exception {
-        try {
-            SerializationUtils.serialize(iMap, null);
-        } catch (final IllegalArgumentException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.serialize(iMap, null);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testSerializeStreamNullNull() throws Exception {
-        try {
-            SerializationUtils.serialize(null, null);
-        } catch (final IllegalArgumentException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.serialize(null, null);
     }
 
     @Test
@@ -230,24 +214,14 @@ public void testDeserializeStreamOfNull() throws Exception {
         assertNull(test);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testDeserializeStreamNull() throws Exception {
-        try {
-            SerializationUtils.deserialize((InputStream) null);
-        } catch (final IllegalArgumentException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.deserialize((InputStream) null);
     }
 
-    @Test
+    @Test(expected = SerializationException.class)
     public void testDeserializeStreamBadStream() throws Exception {
-        try {
-            SerializationUtils.deserialize(new ByteArrayInputStream(new byte[0]));
-        } catch (final SerializationException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.deserialize(new ByteArrayInputStream(new byte[0]));
     }
 
     @Test
@@ -293,15 +267,10 @@ public void testSerializeBytes() throws Exception {
         }
     }
 
-    @Test
+    @Test(expected = SerializationException.class)
     public void testSerializeBytesUnserializable() throws Exception {
-        try {
-            iMap.put(new Object(), new Object());
-            SerializationUtils.serialize(iMap);
-        } catch (final SerializationException ex) {
-            return;
-        }
-        fail();
+        iMap.put(new Object(), new Object());
+        SerializationUtils.serialize(iMap);
     }
 
     @Test
@@ -355,24 +324,14 @@ public void testDeserializeBytesOfNull() throws Exception {
         assertNull(test);
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void testDeserializeBytesNull() throws Exception {
-        try {
-            SerializationUtils.deserialize((byte[]) null);
-        } catch (final IllegalArgumentException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.deserialize((byte[]) null);
     }
 
-    @Test
+    @Test(expected = SerializationException.class)
     public void testDeserializeBytesBadStream() throws Exception {
-        try {
-            SerializationUtils.deserialize(new byte[0]);
-        } catch (final SerializationException ex) {
-            return;
-        }
-        fail();
+        SerializationUtils.deserialize(new byte[0]);
     }
 
     //-----------------------------------------------------------------------
@@ -397,15 +356,10 @@ public void testCloneNull() throws Exception {
         assertNull(test);
     }
 
-    @Test
+    @Test(expected = SerializationException.class)
     public void testCloneUnserializable() throws Exception {
-        try {
-            iMap.put(new Object(), new Object());
-            SerializationUtils.clone(iMap);
-        } catch (final SerializationException ex) {
-            return;
-        }
-        fail();
+        iMap.put(new Object(), new Object());
+        SerializationUtils.clone(iMap);
     }
 
     @Test