From 1587d8d0da2d184fe6f005d76149eb7e0942f0e0 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 4 Mar 2010 12:24:00 +0000
Subject: [PATCH] Add tests for serialization utils (and change exception
 types)

---
 .../batch/support/SerializationUtils.java     |  4 +-
 .../support/SerializationUtilsTests.java      | 69 +++++++++++++++++++
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SerializationUtilsTests.java

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java
index 756f03a5c..6c6473b56 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java
@@ -46,7 +46,7 @@ public class SerializationUtils {
 		try {
 			new ObjectOutputStream(stream).writeObject(object);
 		} catch (IOException e) {
-			throw new IllegalStateException("Could not serialize object of type: "+object.getClass(), e);
+			throw new IllegalArgumentException("Could not serialize object of type: "+object.getClass(), e);
 		}
 
 		return stream.toByteArray();
@@ -67,7 +67,7 @@ public class SerializationUtils {
 			return new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject();
 		}
 		catch (IOException e) {
-			throw new IllegalStateException("Could not deserialize object", e);
+			throw new IllegalArgumentException("Could not deserialize object", e);
 		}
 		catch (ClassNotFoundException e) {
 			throw new IllegalStateException("Could not deserialize object type", e);
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SerializationUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SerializationUtilsTests.java
new file mode 100644
index 000000000..2fd8da735
--- /dev/null
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SerializationUtilsTests.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2006-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.math.BigInteger;
+
+import org.junit.Test;
+
+/**
+ * Static utility to help with serialization.
+ * 
+ * @author Dave Syer
+ * 
+ */
+public class SerializationUtilsTests {
+
+	private static BigInteger FOO = new BigInteger(
+			"-97029424235490125267223648383278313796609415534328015655051436753861088839708112925637575585166033560096810615697574744209306031461371833798723505120163874786203211176873686513374052845353833564048");
+
+	@Test
+	public void testSerializeCycleSunnyDay() throws Exception {
+		assertEquals("foo", SerializationUtils.deserialize(SerializationUtils.serialize("foo")));
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void testDeserializeUndefined() throws Exception {
+		byte[] bytes = FOO.toByteArray();
+		Object foo = SerializationUtils.deserialize(bytes);
+		assertNotNull(foo);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testSerializeNonSerializable() throws Exception {
+		SerializationUtils.serialize(new Object());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testDeserializeNonSerializable() throws Exception {
+		SerializationUtils.deserialize("foo".getBytes());
+	}
+
+	@Test
+	public void testSerializeNull() throws Exception {
+		assertNull(SerializationUtils.serialize(null));
+	}
+
+	@Test
+	public void testDeserializeNull() throws Exception {
+		assertNull(SerializationUtils.deserialize(null));
+	}
+
+}