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.25 by jsr166, Wed Dec 31 16:44:01 2014 UTC vs.
Revision 1.28 by jsr166, Wed Dec 31 20:17:39 2014 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 – import junit.framework.*;
7   import java.util.Arrays;
8   import java.util.Comparator;
9   import java.util.Iterator;
# Line 12 | Line 11 | import java.util.NavigableSet;
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 35 | 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 239 | 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 324 | 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 744 | Line 746 | public class ConcurrentSkipListSubSetTes
746       */
747      public void testDescendingRemoveElement() {
748          NavigableSet q = populatedSet(SIZE);
749 <        for (int i = 1; i < SIZE; i+=2) {
749 >        for (int i = 1; i < SIZE; i += 2) {
750              assertTrue(q.remove(new Integer(i)));
751          }
752 <        for (int i = 0; i < SIZE; i+=2) {
752 >        for (int i = 0; i < SIZE; i += 2 ) {
753              assertTrue(q.remove(new Integer(i)));
754              assertFalse(q.remove(new Integer(i+1)));
755          }
# Line 823 | Line 825 | public class ConcurrentSkipListSubSetTes
825              assertTrue(q.removeAll(p));
826              assertEquals(SIZE-i, q.size());
827              for (int j = 0; j < i; ++j) {
828 <                Integer I = (Integer)(p.pollFirst());
829 <                assertFalse(q.contains(I));
828 >                Integer x = (Integer)(p.pollFirst());
829 >                assertFalse(q.contains(x));
830              }
831          }
832      }

Diff Legend

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