ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java (file contents):
Revision 1.11 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.16 by jsr166, Fri Nov 5 00:17:22 2010 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
13		public static void main(String[] args) {
14	<	junit.textui.TestRunner.run (suite());
14	>	junit.textui.TestRunner.run(suite());
15		}
16		public static Test suite() {
17		return new TestSuite(ConcurrentSkipListSubSetTest.class);
#	Line 27 | Line 27 | public class ConcurrentSkipListSubSetTes
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private NavigableSet populatedSet(int n) {
31	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
30	>	private NavigableSet<Integer> populatedSet(int n) {
31	>	ConcurrentSkipListSet<Integer> q =
32	>	new ConcurrentSkipListSet<Integer>();
33		assertTrue(q.isEmpty());
34
35		for (int i = n-1; i >= 0; i-=2)
#	Line 178 | Line 179 | public class ConcurrentSkipListSubSetTes
179		shouldThrow();
180		} catch (NullPointerException success) {}
181		}
182	+
183		/**
184		* addAll of a collection with null elements throws NPE
185		*/
#	Line 189 | Line 191 | public class ConcurrentSkipListSubSetTes
191		shouldThrow();
192		} catch (NullPointerException success) {}
193		}
194	+
195		/**
196		* addAll of a collection with any null elements throws NPE after
197		* possibly adding some elements
#	Line 338 | Line 341 | public class ConcurrentSkipListSubSetTes
341
342		Object e4 = q.lower(zero);
343		assertNull(e4);
341	–
344		}
345
346		/**
#	Line 357 | Line 359 | public class ConcurrentSkipListSubSetTes
359
360		Object e4 = q.higher(six);
361		assertNull(e4);
360	–
362		}
363
364		/**
#	Line 376 | Line 377 | public class ConcurrentSkipListSubSetTes
377
378		Object e4 = q.floor(zero);
379		assertNull(e4);
379	–
380		}
381
382		/**
#	Line 395 | Line 395 | public class ConcurrentSkipListSubSetTes
395
396		Object e4 = q.ceiling(six);
397		assertNull(e4);
398	–
398		}
399
400		/**
401	<	* toArray contains all elements
401	>	* toArray contains all elements in sorted order
402		*/
403		public void testToArray() {
404		NavigableSet q = populatedSet(SIZE);
405		Object[] o = q.toArray();
407	–	Arrays.sort(o);
406		for (int i = 0; i < o.length; i++)
407	<	assertEquals(o[i], q.pollFirst());
407	>	assertSame(o[i], q.pollFirst());
408		}
409
410		/**
411	<	* toArray(a) contains all elements
411	>	* toArray(a) contains all elements in sorted order
412		*/
413		public void testToArray2() {
414	<	NavigableSet q = populatedSet(SIZE);
414	>	NavigableSet<Integer> q = populatedSet(SIZE);
415		Integer[] ints = new Integer[SIZE];
416	<	ints = (Integer[])q.toArray(ints);
417	<	Arrays.sort(ints);
416	>	Integer[] array = q.toArray(ints);
417	>	assertSame(ints, array);
418		for (int i = 0; i < ints.length; i++)
419	<	assertEquals(ints[i], q.pollFirst());
419	>	assertSame(ints[i], q.pollFirst());
420		}
421
422		/**
#	Line 452 | Line 450 | public class ConcurrentSkipListSubSetTes
450		/**
451		* iterator.remove removes current element
452		*/
453	<	public void testIteratorRemove () {
453	>	public void testIteratorRemove() {
454		final NavigableSet q = set0();
455		q.add(new Integer(2));
456		q.add(new Integer(1));
#	Line 684 | Line 682 | public class ConcurrentSkipListSubSetTes
682		shouldThrow();
683		} catch (NullPointerException success) {}
684		}
685	+
686		/**
687		* addAll of a collection with null elements throws NPE
688		*/
#	Line 695 | Line 694 | public class ConcurrentSkipListSubSetTes
694		shouldThrow();
695		} catch (NullPointerException success) {}
696		}
697	+
698		/**
699		* addAll of a collection with any null elements throws NPE after
700		* possibly adding some elements
#	Line 844 | Line 844 | public class ConcurrentSkipListSubSetTes
844
845		Object e4 = q.lower(zero);
846		assertNull(e4);
847	–
847		}
848
849		/**
#	Line 863 | Line 862 | public class ConcurrentSkipListSubSetTes
862
863		Object e4 = q.higher(m6);
864		assertNull(e4);
866	–
865		}
866
867		/**
#	Line 882 | Line 880 | public class ConcurrentSkipListSubSetTes
880
881		Object e4 = q.floor(zero);
882		assertNull(e4);
885	–
883		}
884
885		/**
#	Line 901 | Line 898 | public class ConcurrentSkipListSubSetTes
898
899		Object e4 = q.ceiling(m6);
900		assertNull(e4);
904	–
901		}
902
903		/**
#	Line 921 | Line 917 | public class ConcurrentSkipListSubSetTes
917		public void testDescendingToArray2() {
918		NavigableSet q = populatedSet(SIZE);
919		Integer[] ints = new Integer[SIZE];
920	<	ints = (Integer[])q.toArray(ints);
920	>	assertSame(ints, q.toArray(ints));
921		Arrays.sort(ints);
922		for (int i = 0; i < ints.length; i++)
923		assertEquals(ints[i], q.pollFirst());
#	Line 958 | Line 954 | public class ConcurrentSkipListSubSetTes
954		/**
955		* iterator.remove removes current element
956		*/
957	<	public void testDescendingIteratorRemove () {
957	>	public void testDescendingIteratorRemove() {
958		final NavigableSet q = dset0();
959		q.add(new Integer(2));
960		q.add(new Integer(1));

Diff Legend

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