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.7 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.8 by jsr166, Sat Nov 21 02:07:26 2009 UTC

# Line 11 | Line 11 | import java.io.*;
11  
12   public class ConcurrentSkipListSubSetTest 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(ConcurrentSkipListSubSetTest.class);
17 >        return new TestSuite(ConcurrentSkipListSubSetTest.class);
18      }
19  
20      static class MyReverseComparator implements Comparator {
# Line 35 | Line 35 | public class ConcurrentSkipListSubSetTes
35          ConcurrentSkipListSet q = new ConcurrentSkipListSet();
36          assertTrue(q.isEmpty());
37  
38 <        for (int i = n-1; i >= 0; i-=2)
39 <            assertTrue(q.add(new Integer(i)));
40 <        for (int i = (n & 1); i < n; i+=2)
41 <            assertTrue(q.add(new Integer(i)));
38 >        for (int i = n-1; i >= 0; i-=2)
39 >            assertTrue(q.add(new Integer(i)));
40 >        for (int i = (n & 1); i < n; i+=2)
41 >            assertTrue(q.add(new Integer(i)));
42          assertTrue(q.add(new Integer(-n)));
43          assertTrue(q.add(new Integer(n)));
44          NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
45          assertFalse(s.isEmpty());
46 <        assertEquals(n, s.size());
46 >        assertEquals(n, s.size());
47          return s;
48      }
49  
# Line 61 | Line 61 | public class ConcurrentSkipListSubSetTes
61          q.add(zero);
62          q.add(seven);
63          NavigableSet s = q.subSet(one, true, seven, false);
64 <        assertEquals(5, s.size());
64 >        assertEquals(5, s.size());
65          return s;
66      }
67  
# Line 77 | Line 77 | public class ConcurrentSkipListSubSetTes
77          q.add(m4);
78          q.add(m5);
79          NavigableSet s = q.descendingSet();
80 <        assertEquals(5, s.size());
80 >        assertEquals(5, s.size());
81          return s;
82      }
83  
84      private static NavigableSet set0() {
85 <        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
85 >        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
86          assertTrue(set.isEmpty());
87          return set.tailSet(m1, true);
88      }
89  
90      private static NavigableSet dset0() {
91 <        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
91 >        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
92          assertTrue(set.isEmpty());
93          return set;
94      }
# Line 134 | Line 134 | public class ConcurrentSkipListSubSetTes
134       * add(null) throws NPE
135       */
136      public void testAddNull() {
137 <        try {
137 >        try {
138              NavigableSet q = set0();
139              q.add(null);
140              shouldThrow();
# Line 238 | Line 238 | public class ConcurrentSkipListSubSetTes
238          for (int i = 0; i < SIZE; ++i) {
239              assertEquals(i, ((Integer)q.pollFirst()).intValue());
240          }
241 <        assertNull(q.pollFirst());
241 >        assertNull(q.pollFirst());
242      }
243  
244      /**
# Line 414 | Line 414 | public class ConcurrentSkipListSubSetTes
414       */
415      public void testToArray() {
416          NavigableSet q = populatedSet(SIZE);
417 <        Object[] o = q.toArray();
417 >        Object[] o = q.toArray();
418          Arrays.sort(o);
419 <        for (int i = 0; i < o.length; i++)
420 <            assertEquals(o[i], q.pollFirst());
419 >        for (int i = 0; i < o.length; i++)
420 >            assertEquals(o[i], q.pollFirst());
421      }
422  
423      /**
# Line 425 | Line 425 | public class ConcurrentSkipListSubSetTes
425       */
426      public void testToArray2() {
427          NavigableSet q = populatedSet(SIZE);
428 <        Integer[] ints = new Integer[SIZE];
429 <        ints = (Integer[])q.toArray(ints);
428 >        Integer[] ints = new Integer[SIZE];
429 >        ints = (Integer[])q.toArray(ints);
430          Arrays.sort(ints);
431          for (int i = 0; i < ints.length; i++)
432              assertEquals(ints[i], q.pollFirst());
# Line 438 | Line 438 | public class ConcurrentSkipListSubSetTes
438      public void testIterator() {
439          NavigableSet q = populatedSet(SIZE);
440          int i = 0;
441 <        Iterator it = q.iterator();
441 >        Iterator it = q.iterator();
442          while (it.hasNext()) {
443              assertTrue(q.contains(it.next()));
444              ++i;
# Line 452 | Line 452 | public class ConcurrentSkipListSubSetTes
452      public void testEmptyIterator() {
453          NavigableSet q = set0();
454          int i = 0;
455 <        Iterator it = q.iterator();
455 >        Iterator it = q.iterator();
456          while (it.hasNext()) {
457              assertTrue(q.contains(it.next()));
458              ++i;
# Line 652 | Line 652 | public class ConcurrentSkipListSubSetTes
652       * add(null) throws NPE
653       */
654      public void testDescendingAddNull() {
655 <        try {
655 >        try {
656              NavigableSet q = dset0();
657              q.add(null);
658              shouldThrow();
# Line 756 | Line 756 | public class ConcurrentSkipListSubSetTes
756          for (int i = 0; i < SIZE; ++i) {
757              assertEquals(i, ((Integer)q.pollFirst()).intValue());
758          }
759 <        assertNull(q.pollFirst());
759 >        assertNull(q.pollFirst());
760      }
761  
762      /**
# Line 932 | Line 932 | public class ConcurrentSkipListSubSetTes
932       */
933      public void testDescendingToArray() {
934          NavigableSet q = populatedSet(SIZE);
935 <        Object[] o = q.toArray();
935 >        Object[] o = q.toArray();
936          Arrays.sort(o);
937 <        for (int i = 0; i < o.length; i++)
938 <            assertEquals(o[i], q.pollFirst());
937 >        for (int i = 0; i < o.length; i++)
938 >            assertEquals(o[i], q.pollFirst());
939      }
940  
941      /**
# Line 943 | Line 943 | public class ConcurrentSkipListSubSetTes
943       */
944      public void testDescendingToArray2() {
945          NavigableSet q = populatedSet(SIZE);
946 <        Integer[] ints = new Integer[SIZE];
947 <        ints = (Integer[])q.toArray(ints);
946 >        Integer[] ints = new Integer[SIZE];
947 >        ints = (Integer[])q.toArray(ints);
948          Arrays.sort(ints);
949          for (int i = 0; i < ints.length; i++)
950              assertEquals(ints[i], q.pollFirst());
# Line 956 | Line 956 | public class ConcurrentSkipListSubSetTes
956      public void testDescendingIterator() {
957          NavigableSet q = populatedSet(SIZE);
958          int i = 0;
959 <        Iterator it = q.iterator();
959 >        Iterator it = q.iterator();
960          while (it.hasNext()) {
961              assertTrue(q.contains(it.next()));
962              ++i;
# Line 970 | Line 970 | public class ConcurrentSkipListSubSetTes
970      public void testDescendingEmptyIterator() {
971          NavigableSet q = dset0();
972          int i = 0;
973 <        Iterator it = q.iterator();
973 >        Iterator it = q.iterator();
974          while (it.hasNext()) {
975              assertTrue(q.contains(it.next()));
976              ++i;

Diff Legend

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