ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/JSR166TestCase.java

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.90 by jsr166, Wed Jun 22 07:46:57 2011 UTC vs.
Revision 1.91 by jsr166, Thu Dec 8 18:54:46 2011 UTC

#	Line 1202 | Line 1202 | public class JSR166TestCase extends Test
1202		}
1203		}
1204
1205	<	@SuppressWarnings("unchecked")
1206	<	<T> T serialClone(T o) {
1205	>	void assertSerialEquals(Object x, Object y) {
1206	>	assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1207	>	}
1208	>
1209	>	void assertNotSerialEquals(Object x, Object y) {
1210	>	assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1211	>	}
1212	>
1213	>	byte[] serialBytes(Object o) {
1214		try {
1215		ByteArrayOutputStream bos = new ByteArrayOutputStream();
1216		ObjectOutputStream oos = new ObjectOutputStream(bos);
1217		oos.writeObject(o);
1218		oos.flush();
1219		oos.close();
1220	+	return bos.toByteArray();
1221	+	} catch (Throwable t) {
1222	+	threadUnexpectedException(t);
1223	+	return new byte[0];
1224	+	}
1225	+	}
1226	+
1227	+	@SuppressWarnings("unchecked")
1228	+	<T> T serialClone(T o) {
1229	+	try {
1230		ObjectInputStream ois = new ObjectInputStream
1231	<	(new ByteArrayInputStream(bos.toByteArray()));
1231	>	(new ByteArrayInputStream(serialBytes(o)));
1232		T clone = (T) ois.readObject();
1233		assertSame(o.getClass(), clone.getClass());
1234		return clone;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines