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.10 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.15 by jsr166, Wed Sep 1 20:12:39 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 207 | Line 203 | public class ConcurrentSkipListSetTest e
203		shouldThrow();
204		} catch (NullPointerException success) {}
205		}
206	+
207		/**
208		* addAll of a collection with null elements throws NPE
209		*/
#	Line 218 | Line 215 | public class ConcurrentSkipListSetTest e
215		shouldThrow();
216		} catch (NullPointerException success) {}
217		}
218	+
219		/**
220		* addAll of a collection with any null elements throws NPE after
221		* possibly adding some elements
#	Line 245 | Line 243 | public class ConcurrentSkipListSetTest e
243		assertFalse(q.addAll(Arrays.asList(empty)));
244		assertTrue(q.addAll(Arrays.asList(ints)));
245		for (int i = 0; i < SIZE; ++i)
246	<	assertEquals(new Integer(i), q.pollFirst());
246	>	assertEquals(i, q.pollFirst());
247		}
248
249		/**
#	Line 254 | Line 252 | public class ConcurrentSkipListSetTest e
252		public void testPollFirst() {
253		ConcurrentSkipListSet q = populatedSet(SIZE);
254		for (int i = 0; i < SIZE; ++i) {
255	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
255	>	assertEquals(i, q.pollFirst());
256		}
257		assertNull(q.pollFirst());
258		}
#	Line 265 | Line 263 | public class ConcurrentSkipListSetTest e
263		public void testPollLast() {
264		ConcurrentSkipListSet q = populatedSet(SIZE);
265		for (int i = SIZE-1; i >= 0; --i) {
266	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
266	>	assertEquals(i, q.pollLast());
267		}
268		assertNull(q.pollFirst());
269		}
#	Line 379 | Line 377 | public class ConcurrentSkipListSetTest e
377
378		Object e4 = q.lower(zero);
379		assertNull(e4);
382	–
380		}
381
382		/**
#	Line 398 | Line 395 | public class ConcurrentSkipListSetTest e
395
396		Object e4 = q.higher(six);
397		assertNull(e4);
401	–
398		}
399
400		/**
#	Line 417 | Line 413 | public class ConcurrentSkipListSetTest e
413
414		Object e4 = q.floor(zero);
415		assertNull(e4);
420	–
416		}
417
418		/**
#	Line 436 | Line 431 | public class ConcurrentSkipListSetTest e
431
432		Object e4 = q.ceiling(six);
433		assertNull(e4);
439	–
434		}
435
436		/**
#	Line 493 | 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 881 | 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