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.9 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.13 by jsr166, Wed Aug 25 00:07:03 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 19 | Line 19 | public class ConcurrentSkipListSetTest e
19
20		static class MyReverseComparator implements Comparator {
21		public int compare(Object x, Object y) {
22	<	int i = ((Integer)x).intValue();
23	<	int j = ((Integer)y).intValue();
24	<	if (i < j) return 1;
25	<	if (i > j) return -1;
26	<	return 0;
22	>	return ((Comparable)y).compareTo(x);
23		}
24		}
25
#	Line 245 | Line 241 | public class ConcurrentSkipListSetTest e
241		assertFalse(q.addAll(Arrays.asList(empty)));
242		assertTrue(q.addAll(Arrays.asList(ints)));
243		for (int i = 0; i < SIZE; ++i)
244	<	assertEquals(new Integer(i), q.pollFirst());
244	>	assertEquals(i, q.pollFirst());
245		}
246
247		/**
#	Line 254 | Line 250 | public class ConcurrentSkipListSetTest e
250		public void testPollFirst() {
251		ConcurrentSkipListSet q = populatedSet(SIZE);
252		for (int i = 0; i < SIZE; ++i) {
253	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
253	>	assertEquals(i, q.pollFirst());
254		}
255		assertNull(q.pollFirst());
256		}
#	Line 265 | Line 261 | public class ConcurrentSkipListSetTest e
261		public void testPollLast() {
262		ConcurrentSkipListSet q = populatedSet(SIZE);
263		for (int i = SIZE-1; i >= 0; --i) {
264	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
264	>	assertEquals(i, q.pollLast());
265		}
266		assertNull(q.pollFirst());
267		}
#	Line 379 | Line 375 | public class ConcurrentSkipListSetTest e
375
376		Object e4 = q.lower(zero);
377		assertNull(e4);
382	–
378		}
379
380		/**
#	Line 398 | Line 393 | public class ConcurrentSkipListSetTest e
393
394		Object e4 = q.higher(six);
395		assertNull(e4);
401	–
396		}
397
398		/**
#	Line 417 | Line 411 | public class ConcurrentSkipListSetTest e
411
412		Object e4 = q.floor(zero);
413		assertNull(e4);
420	–
414		}
415
416		/**
#	Line 436 | Line 429 | public class ConcurrentSkipListSetTest e
429
430		Object e4 = q.ceiling(six);
431		assertNull(e4);
439	–
432		}
433
434		/**
#	Line 493 | Line 485 | public class ConcurrentSkipListSetTest e
485		/**
486		* iterator.remove removes current element
487		*/
488	<	public void testIteratorRemove () {
488	>	public void testIteratorRemove() {
489		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
490		q.add(new Integer(2));
491		q.add(new Integer(1));
#	Line 664 | Line 656 | public class ConcurrentSkipListSetTest e
656		/**
657		* Subsets of subsets subdivide correctly
658		*/
659	<	public void testRecursiveSubSets() {
659	>	public void testRecursiveSubSets() throws Exception {
660		int setSize = 1000;
661		Class cl = ConcurrentSkipListSet.class;
662
#	Line 683 | Line 675 | public class ConcurrentSkipListSetTest e
675		0, setSize - 1, true);
676		}
677
678	<	static NavigableSet<Integer> newSet(Class cl) {
679	<	NavigableSet<Integer> result = null;
688	<	try {
689	<	result = (NavigableSet<Integer>) cl.newInstance();
690	<	} catch (Exception e) {
691	<	fail();
692	<	}
678	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
679	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
680		assertEquals(result.size(), 0);
681		assertFalse(result.iterator().hasNext());
682		return result;
#	Line 752 | Line 739 | public class ConcurrentSkipListSetTest e
739		} else {
740		try {
741		set.add(element);
742	<	fail();
743	<	} catch (IllegalArgumentException e) {
757	<	// expected
758	<	}
742	>	shouldThrow();
743	>	} catch (IllegalArgumentException success) {}
744		}
745		}
746		}
#	Line 954 | Line 939 | public class ConcurrentSkipListSetTest e
939		assertEq(rs.last(),  -1);
940		try {
941		set.first();
942	<	fail();
943	<	} catch (NoSuchElementException e) {
959	<	// expected
960	<	}
942	>	shouldThrow();
943	>	} catch (NoSuchElementException success) {}
944		try {
945		set.last();
946	<	fail();
947	<	} catch (NoSuchElementException e) {
965	<	// expected
966	<	}
946	>	shouldThrow();
947	>	} catch (NoSuchElementException success) {}
948		}
949		}
950

Diff Legend

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