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.21 by jsr166, Mon Oct 11 05:40:41 2010 UTC vs.
Revision 1.25 by jsr166, Tue May 31 16:16:23 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
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 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 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 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 1161 | Line 1147 | public class ConcurrentSkipListMapTest e
1147		*/
1148		void check(NavigableMap<Integer, Integer> map,
1149		final int min, final int max, final boolean ascending) {
1150	<	class ReferenceSet {
1150	>	class ReferenceSet {
1151		int lower(int key) {
1152		return ascending ? lowerAscending(key) : higherAscending(key);
1153		}

Diff Legend

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