ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ConcurrentSkipListSetTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ConcurrentSkipListSetTest.java (file contents):
Revision 1.31 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.35 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 41 | Line 41 | public class ConcurrentSkipListSetTest e
41          ConcurrentSkipListSet<Integer> q =
42              new ConcurrentSkipListSet<Integer>();
43          assertTrue(q.isEmpty());
44 <        for (int i = n-1; i >= 0; i-=2)
44 >        for (int i = n-1; i >= 0; i -= 2)
45              assertTrue(q.add(new Integer(i)));
46 <        for (int i = (n & 1); i < n; i+=2)
46 >        for (int i = (n & 1); i < n; i += 2)
47              assertTrue(q.add(new Integer(i)));
48          assertFalse(q.isEmpty());
49          assertEquals(n, q.size());
# Line 284 | Line 284 | public class ConcurrentSkipListSetTest e
284       */
285      public void testRemoveElement() {
286          ConcurrentSkipListSet q = populatedSet(SIZE);
287 <        for (int i = 1; i < SIZE; i+=2) {
287 >        for (int i = 1; i < SIZE; i += 2) {
288              assertTrue(q.contains(i));
289              assertTrue(q.remove(i));
290              assertFalse(q.contains(i));
291              assertTrue(q.contains(i-1));
292          }
293 <        for (int i = 0; i < SIZE; i+=2) {
293 >        for (int i = 0; i < SIZE; i += 2) {
294              assertTrue(q.contains(i));
295              assertTrue(q.remove(i));
296              assertFalse(q.contains(i));
# Line 369 | Line 369 | public class ConcurrentSkipListSetTest e
369              assertTrue(q.removeAll(p));
370              assertEquals(SIZE-i, q.size());
371              for (int j = 0; j < i; ++j) {
372 <                Integer I = (Integer)(p.pollFirst());
373 <                assertFalse(q.contains(I));
372 >                Integer x = (Integer)(p.pollFirst());
373 >                assertFalse(q.contains(x));
374              }
375          }
376      }
# Line 473 | Line 473 | public class ConcurrentSkipListSetTest e
473       */
474      public void testIterator() {
475          ConcurrentSkipListSet q = populatedSet(SIZE);
476 –        int i = 0;
476          Iterator it = q.iterator();
477 <        while (it.hasNext()) {
477 >        int i;
478 >        for (i = 0; it.hasNext(); i++)
479              assertTrue(q.contains(it.next()));
480 –            ++i;
481 –        }
480          assertEquals(i, SIZE);
481 +        assertIteratorExhausted(it);
482      }
483  
484      /**
485       * iterator of empty set has no elements
486       */
487      public void testEmptyIterator() {
488 <        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
489 <        int i = 0;
490 <        Iterator it = q.iterator();
492 <        while (it.hasNext()) {
493 <            assertTrue(q.contains(it.next()));
494 <            ++i;
495 <        }
496 <        assertEquals(0, i);
488 >        NavigableSet s = new ConcurrentSkipListSet();
489 >        assertIteratorExhausted(s.iterator());
490 >        assertIteratorExhausted(s.descendingSet().iterator());
491      }
492  
493      /**
# Line 732 | Line 726 | public class ConcurrentSkipListSetTest e
726          // Add entries till we're back to original size
727          while (set.size() < size) {
728              int element = min + rnd.nextInt(rangeSize);
729 <            assertTrue(element >= min && element<= max);
729 >            assertTrue(element >= min && element <= max);
730              put(set, element, bs);
731          }
732      }
# Line 758 | Line 752 | public class ConcurrentSkipListSetTest e
752          // Add entries till we're back to original size
753          while (set.size() < size) {
754              int element = min - 5 + rnd.nextInt(rangeSize + 10);
755 <            if (element >= min && element<= max) {
755 >            if (element >= min && element <= max) {
756                  put(set, element, bs);
757              } else {
758                  try {

Diff Legend

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