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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java (file contents):
Revision 1.20 by jsr166, Tue May 31 16:16:23 2011 UTC vs.
Revision 1.29 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 – import junit.framework.*;
7   import java.util.Arrays;
9 – import java.util.BitSet;
10 – import java.util.Collection;
8   import java.util.Comparator;
9   import java.util.Iterator;
10   import java.util.NavigableSet;
14 – import java.util.NoSuchElementException;
15 – import java.util.Random;
16 – import java.util.Set;
11   import java.util.SortedSet;
12   import java.util.concurrent.ConcurrentSkipListSet;
13  
14 + import junit.framework.Test;
15 + import junit.framework.TestSuite;
16 +
17   public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
18      public static void main(String[] args) {
19          junit.textui.TestRunner.run(suite());
# Line 32 | Line 29 | public class ConcurrentSkipListSubSetTes
29      }
30  
31      /**
32 <     * Create a set of given size containing consecutive
32 >     * Returns a new set of given size containing consecutive
33       * Integers 0 ... n.
34       */
35      private NavigableSet<Integer> populatedSet(int n) {
# Line 40 | Line 37 | public class ConcurrentSkipListSubSetTes
37              new ConcurrentSkipListSet<Integer>();
38          assertTrue(q.isEmpty());
39  
40 <        for (int i = n-1; i >= 0; i-=2)
40 >        for (int i = n-1; i >= 0; i -= 2)
41              assertTrue(q.add(new Integer(i)));
42 <        for (int i = (n & 1); i < n; i+=2)
42 >        for (int i = (n & 1); i < n; i += 2)
43              assertTrue(q.add(new Integer(i)));
44          assertTrue(q.add(new Integer(-n)));
45          assertTrue(q.add(new Integer(n)));
# Line 53 | Line 50 | public class ConcurrentSkipListSubSetTes
50      }
51  
52      /**
53 <     * Create set of first 5 ints
53 >     * Returns a new set of first 5 ints.
54       */
55      private NavigableSet set5() {
56          ConcurrentSkipListSet q = new ConcurrentSkipListSet();
# Line 71 | Line 68 | public class ConcurrentSkipListSubSetTes
68      }
69  
70      /**
71 <     * Create set of first 5 negative ints
71 >     * Returns a new set of first 5 negative ints.
72       */
73      private NavigableSet dset5() {
74          ConcurrentSkipListSet q = new ConcurrentSkipListSet();
# Line 244 | Line 241 | public class ConcurrentSkipListSubSetTes
241       */
242      public void testRemoveElement() {
243          NavigableSet q = populatedSet(SIZE);
244 <        for (int i = 1; i < SIZE; i+=2) {
244 >        for (int i = 1; i < SIZE; i += 2) {
245              assertTrue(q.contains(i));
246              assertTrue(q.remove(i));
247              assertFalse(q.contains(i));
248              assertTrue(q.contains(i-1));
249          }
250 <        for (int i = 0; i < SIZE; i+=2) {
250 >        for (int i = 0; i < SIZE; i += 2) {
251              assertTrue(q.contains(i));
252              assertTrue(q.remove(i));
253              assertFalse(q.contains(i));
# Line 329 | Line 326 | public class ConcurrentSkipListSubSetTes
326              assertTrue(q.removeAll(p));
327              assertEquals(SIZE-i, q.size());
328              for (int j = 0; j < i; ++j) {
329 <                Integer I = (Integer)(p.pollFirst());
330 <                assertFalse(q.contains(I));
329 >                Integer x = (Integer)(p.pollFirst());
330 >                assertFalse(q.contains(x));
331              }
332          }
333      }
# Line 434 | Line 431 | public class ConcurrentSkipListSubSetTes
431       */
432      public void testIterator() {
433          NavigableSet q = populatedSet(SIZE);
437 –        int i = 0;
434          Iterator it = q.iterator();
435 <        while (it.hasNext()) {
435 >        int i;
436 >        for (i = 0; it.hasNext(); i++)
437              assertTrue(q.contains(it.next()));
441 –            ++i;
442 –        }
438          assertEquals(i, SIZE);
439 +        assertIteratorExhausted(it);
440      }
441  
442      /**
443       * iterator of empty set has no elements
444       */
445      public void testEmptyIterator() {
446 <        NavigableSet q = set0();
451 <        int i = 0;
452 <        Iterator it = q.iterator();
453 <        while (it.hasNext()) {
454 <            assertTrue(q.contains(it.next()));
455 <            ++i;
456 <        }
457 <        assertEquals(i, 0);
446 >        assertIteratorExhausted(set0().iterator());
447      }
448  
449      /**
# Line 494 | Line 483 | public class ConcurrentSkipListSubSetTes
483          NavigableSet x = populatedSet(SIZE);
484          NavigableSet y = serialClone(x);
485  
486 <        assertTrue(x != y);
486 >        assertNotSame(y, x);
487          assertEquals(x.size(), y.size());
488          assertEquals(x, y);
489          assertEquals(y, x);
# Line 749 | Line 738 | public class ConcurrentSkipListSubSetTes
738       */
739      public void testDescendingRemoveElement() {
740          NavigableSet q = populatedSet(SIZE);
741 <        for (int i = 1; i < SIZE; i+=2) {
741 >        for (int i = 1; i < SIZE; i += 2) {
742              assertTrue(q.remove(new Integer(i)));
743          }
744 <        for (int i = 0; i < SIZE; i+=2) {
744 >        for (int i = 0; i < SIZE; i += 2 ) {
745              assertTrue(q.remove(new Integer(i)));
746              assertFalse(q.remove(new Integer(i+1)));
747          }
# Line 828 | Line 817 | public class ConcurrentSkipListSubSetTes
817              assertTrue(q.removeAll(p));
818              assertEquals(SIZE-i, q.size());
819              for (int j = 0; j < i; ++j) {
820 <                Integer I = (Integer)(p.pollFirst());
821 <                assertFalse(q.contains(I));
820 >                Integer x = (Integer)(p.pollFirst());
821 >                assertFalse(q.contains(x));
822              }
823          }
824      }
# Line 954 | Line 943 | public class ConcurrentSkipListSubSetTes
943              assertTrue(q.contains(it.next()));
944              ++i;
945          }
946 <        assertEquals(i, 0);
946 >        assertEquals(0, i);
947      }
948  
949      /**
# Line 994 | Line 983 | public class ConcurrentSkipListSubSetTes
983          NavigableSet x = dset5();
984          NavigableSet y = serialClone(x);
985  
986 <        assertTrue(x != y);
986 >        assertNotSame(y, x);
987          assertEquals(x.size(), y.size());
988          assertEquals(x, y);
989          assertEquals(y, x);

Diff Legend

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