ViewVC Help

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

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

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

#	Line 11 | Line 11 | import java.io.*;
11
12		public class ConcurrentSkipListSetTest 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(ConcurrentSkipListSetTest.class);
#	Line 27 | Line 27 | public class ConcurrentSkipListSetTest e
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private ConcurrentSkipListSet populatedSet(int n) {
31	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
30	>	private ConcurrentSkipListSet<Integer> populatedSet(int n) {
31	>	ConcurrentSkipListSet<Integer> q =
32	>	new ConcurrentSkipListSet<Integer>();
33		assertTrue(q.isEmpty());
34		for (int i = n-1; i >= 0; i-=2)
35		assertTrue(q.add(new Integer(i)));
#	Line 203 | Line 204 | public class ConcurrentSkipListSetTest e
204		shouldThrow();
205		} catch (NullPointerException success) {}
206		}
207	+
208		/**
209		* addAll of a collection with null elements throws NPE
210		*/
#	Line 214 | Line 216 | public class ConcurrentSkipListSetTest e
216		shouldThrow();
217		} catch (NullPointerException success) {}
218		}
219	+
220		/**
221		* addAll of a collection with any null elements throws NPE after
222		* possibly adding some elements
#	Line 375 | Line 378 | public class ConcurrentSkipListSetTest e
378
379		Object e4 = q.lower(zero);
380		assertNull(e4);
378	–
381		}
382
383		/**
#	Line 394 | Line 396 | public class ConcurrentSkipListSetTest e
396
397		Object e4 = q.higher(six);
398		assertNull(e4);
397	–
399		}
400
401		/**
#	Line 413 | Line 414 | public class ConcurrentSkipListSetTest e
414
415		Object e4 = q.floor(zero);
416		assertNull(e4);
416	–
417		}
418
419		/**
#	Line 432 | Line 432 | public class ConcurrentSkipListSetTest e
432
433		Object e4 = q.ceiling(six);
434		assertNull(e4);
435	–
435		}
436
437		/**
438	<	* toArray contains all elements
438	>	* toArray contains all elements in sorted order
439		*/
440		public void testToArray() {
441		ConcurrentSkipListSet q = populatedSet(SIZE);
442		Object[] o = q.toArray();
444	–	Arrays.sort(o);
443		for (int i = 0; i < o.length; i++)
444	<	assertEquals(o[i], q.pollFirst());
444	>	assertSame(o[i], q.pollFirst());
445		}
446
447		/**
448	<	* toArray(a) contains all elements
448	>	* toArray(a) contains all elements in sorted order
449		*/
450		public void testToArray2() {
451	<	ConcurrentSkipListSet q = populatedSet(SIZE);
451	>	ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
452		Integer[] ints = new Integer[SIZE];
453	<	ints = (Integer[])q.toArray(ints);
454	<	Arrays.sort(ints);
453	>	Integer[] array = q.toArray(ints);
454	>	assertSame(ints, array);
455		for (int i = 0; i < ints.length; i++)
456	<	assertEquals(ints[i], q.pollFirst());
456	>	assertSame(ints[i], q.pollFirst());
457		}
458
459		/**
#	Line 489 | Line 487 | public class ConcurrentSkipListSetTest e
487		/**
488		* iterator.remove removes current element
489		*/
490	<	public void testIteratorRemove () {
490	>	public void testIteratorRemove() {
491		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
492		q.add(new Integer(2));
493		q.add(new Integer(1));
#	Line 661 | Line 659 | public class ConcurrentSkipListSetTest e
659		* Subsets of subsets subdivide correctly
660		*/
661		public void testRecursiveSubSets() throws Exception {
662	<	int setSize = 1000;
662	>	int setSize = expensiveTests ? 1000 : 100;
663		Class cl = ConcurrentSkipListSet.class;
664
665		NavigableSet<Integer> set = newSet(cl);
#	Line 877 | Line 875 | public class ConcurrentSkipListSetTest e
875		// BitSet should support this! Test would run much faster
876		while (element >= min) {
877		if (bs.get(element))
878	<	return(element);
878	>	return element;
879		element--;
880		}
881		return -1;

Diff Legend

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