ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.23 by jsr166, Thu Apr 14 22:55:08 2011 UTC vs.
Revision 1.27 by jsr166, Sat Nov 26 05:19:17 2011 UTC

#	Line 6 | Line 6
6
7		import junit.framework.*;
8		import java.util.*;
9	<	import java.util.concurrent.*;
10	<	import java.io.*;
9	>	import java.util.concurrent.ConcurrentSkipListMap;
10
11		public class ConcurrentSkipListMapTest extends JSR166TestCase {
12		public static void main(String[] args) {
#	Line 39 | Line 38 | public class ConcurrentSkipListMapTest e
38		public void testClear() {
39		ConcurrentSkipListMap map = map5();
40		map.clear();
41	<	assertEquals(map.size(), 0);
41	>	assertEquals(0, map.size());
42		}
43
44		/**
#	Line 119 | Line 118 | public class ConcurrentSkipListMapTest e
118		assertEquals(five, map.lastKey());
119		}
120
122	–
121		/**
122		* keySet.toArray returns contains all keys
123		*/
#	Line 176 | Line 174 | public class ConcurrentSkipListMapTest e
174		last = k;
175		++count;
176		}
177	<	assertEquals(count ,5);
177	>	assertEquals(5, count);
178		}
179
180		/**
#	Line 195 | Line 193 | public class ConcurrentSkipListMapTest e
193		last = k;
194		++count;
195		}
196	<	assertEquals(count ,5);
196	>	assertEquals(5, count);
197		}
198
199		/**
#	Line 214 | Line 212 | public class ConcurrentSkipListMapTest e
212		last = k;
213		++count;
214		}
215	<	assertEquals(count, 5);
215	>	assertEquals(5, count);
216		}
217
218		/**
#	Line 233 | Line 231 | public class ConcurrentSkipListMapTest e
231		last = k;
232		++count;
233		}
234	<	assertEquals(count, 5);
234	>	assertEquals(5, count);
235		}
236
237		/**
#	Line 382 | Line 380 | public class ConcurrentSkipListMapTest e
380		assertEquals("Z", map.get(one));
381		}
382
385	–
383		/**
384		* replace value fails when the given key not mapped to expected value
385		*/
#	Line 403 | Line 400 | public class ConcurrentSkipListMapTest e
400		assertEquals("Z", map.get(one));
401		}
402
406	–
403		/**
404		* remove removes the correct key-value pair from the map
405		*/
#	Line 505 | Line 501 | public class ConcurrentSkipListMapTest e
501		* lowerEntry, higherEntry, ceilingEntry, and floorEntry return
502		* immutable entries
503		*/
504	<	public void testEntryImmutablity() {
504	>	public void testEntryImmutability() {
505		ConcurrentSkipListMap map = map5();
506		Map.Entry e = map.lowerEntry(three);
507		assertEquals(two, e.getKey());
#	Line 533 | Line 529 | public class ConcurrentSkipListMapTest e
529		} catch (UnsupportedOperationException success) {}
530		}
531
536	–
537	–
532		/**
533		* lowerKey returns preceding element
534		*/
#	Line 678 | Line 672 | public class ConcurrentSkipListMapTest e
672		ConcurrentSkipListMap map = map5();
673		String s = map.toString();
674		for (int i = 1; i <= 5; ++i) {
675	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
675	>	assertTrue(s.contains(String.valueOf(i)));
676		}
677		}
678
#	Line 717 | Line 711 | public class ConcurrentSkipListMapTest e
711		} catch (NullPointerException success) {}
712		}
713
720	–
714		/**
715		* put(null,x) throws NPE
716		*/
#	Line 799 | Line 792 | public class ConcurrentSkipListMapTest e
792		* A deserialized map equals original
793		*/
794		public void testSerialization() throws Exception {
795	<	ConcurrentSkipListMap q = map5();
795	>	NavigableMap x = map5();
796	>	NavigableMap y = serialClone(x);
797
798	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
799	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
800	<	out.writeObject(q);
801	<	out.close();
802	<
809	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
810	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
811	<	ConcurrentSkipListMap r = (ConcurrentSkipListMap)in.readObject();
812	<	assertEquals(q.size(), r.size());
813	<	assertTrue(q.equals(r));
814	<	assertTrue(r.equals(q));
798	>	assertTrue(x != y);
799	>	assertEquals(x.size(), y.size());
800	>	assertEquals(x.toString(), y.toString());
801	>	assertEquals(x, y);
802	>	assertEquals(y, x);
803		}
804
817	–
818	–
805		/**
806		* subMap returns map with keys in requested range
807		*/
#	Line 1000 | Line 986 | public class ConcurrentSkipListMapTest e
986		static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
987		NavigableMap<Integer, Integer> result =
988		(NavigableMap<Integer, Integer>) cl.newInstance();
989	<	assertEquals(result.size(), 0);
989	>	assertEquals(0, result.size());
990		assertFalse(result.keySet().iterator().hasNext());
991		return result;
992		}

Diff Legend

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