ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java (file contents):
Revision 1.18 by jsr166, Fri May 27 19:21:27 2011 UTC vs.
Revision 1.19 by jsr166, Tue May 31 16:16:23 2011 UTC

#	Line 5 | Line 5
5		*/
6
7		import junit.framework.*;
8	+	import java.util.concurrent.ConcurrentNavigableMap;
9	+	import java.util.concurrent.ConcurrentSkipListMap;
10		import java.util.*;
9	–	import java.util.concurrent.*;
10	–	import java.io.*;
11
12		public class ConcurrentSkipListSubMapTest extends JSR166TestCase {
13		public static void main(String[] args) {
#	Line 592 | Line 592 | public class ConcurrentSkipListSubMapTes
592		* A deserialized map equals original
593		*/
594		public void testSerialization() throws Exception {
595	<	ConcurrentNavigableMap q = map5();
595	>	NavigableMap x = map5();
596	>	NavigableMap y = serialClone(x);
597
598	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
599	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
600	<	out.writeObject(q);
601	<	out.close();
602	<
602	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
603	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
604	<	ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
605	<	assertEquals(q.size(), r.size());
606	<	assertTrue(q.equals(r));
607	<	assertTrue(r.equals(q));
598	>	assertTrue(x != y);
599	>	assertEquals(x.size(), y.size());
600	>	assertEquals(x.toString(), y.toString());
601	>	assertEquals(x, y);
602	>	assertEquals(y, x);
603		}
604
605		/**
#	Line 1271 | Line 1266 | public class ConcurrentSkipListSubMapTes
1266		* A deserialized map equals original
1267		*/
1268		public void testDescendingSerialization() throws Exception {
1269	<	ConcurrentNavigableMap q = dmap5();
1269	>	NavigableMap x = dmap5();
1270	>	NavigableMap y = serialClone(x);
1271
1272	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1273	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1274	<	out.writeObject(q);
1275	<	out.close();
1276	<
1281	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1282	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1283	<	ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
1284	<	assertEquals(q.size(), r.size());
1285	<	assertTrue(q.equals(r));
1286	<	assertTrue(r.equals(q));
1272	>	assertTrue(x != y);
1273	>	assertEquals(x.size(), y.size());
1274	>	assertEquals(x.toString(), y.toString());
1275	>	assertEquals(x, y);
1276	>	assertEquals(y, x);
1277		}
1278
1279		/**

Diff Legend

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