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.9 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.14 by jsr166, Wed Aug 25 01:44:48 2010 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);
# Line 19 | Line 19 | public class ConcurrentSkipListSubSetTes
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 182 | Line 178 | public class ConcurrentSkipListSubSetTes
178              shouldThrow();
179          } catch (NullPointerException success) {}
180      }
181 +
182      /**
183       * addAll of a collection with null elements throws NPE
184       */
# Line 193 | Line 190 | public class ConcurrentSkipListSubSetTes
190              shouldThrow();
191          } catch (NullPointerException success) {}
192      }
193 +
194      /**
195       * addAll of a collection with any null elements throws NPE after
196       * possibly adding some elements
# Line 212 | Line 210 | public class ConcurrentSkipListSubSetTes
210       * Set contains all elements of successful addAll
211       */
212      public void testAddAll5() {
213 <        try {
214 <            Integer[] empty = new Integer[0];
215 <            Integer[] ints = new Integer[SIZE];
216 <            for (int i = 0; i < SIZE; ++i)
217 <                ints[i] = new Integer(SIZE-1- i);
218 <            NavigableSet q = set0();
219 <            assertFalse(q.addAll(Arrays.asList(empty)));
220 <            assertTrue(q.addAll(Arrays.asList(ints)));
221 <            for (int i = 0; i < SIZE; ++i)
224 <                assertEquals(new Integer(i), q.pollFirst());
225 <        }
226 <        finally {}
213 >        Integer[] empty = new Integer[0];
214 >        Integer[] ints = new Integer[SIZE];
215 >        for (int i = 0; i < SIZE; ++i)
216 >            ints[i] = new Integer(SIZE-1- i);
217 >        NavigableSet q = set0();
218 >        assertFalse(q.addAll(Arrays.asList(empty)));
219 >        assertTrue(q.addAll(Arrays.asList(ints)));
220 >        for (int i = 0; i < SIZE; ++i)
221 >            assertEquals(new Integer(i), q.pollFirst());
222      }
223  
224      /**
# Line 232 | Line 227 | public class ConcurrentSkipListSubSetTes
227      public void testPoll() {
228          NavigableSet q = populatedSet(SIZE);
229          for (int i = 0; i < SIZE; ++i) {
230 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
230 >            assertEquals(i, q.pollFirst());
231          }
232          assertNull(q.pollFirst());
233      }
# Line 345 | Line 340 | public class ConcurrentSkipListSubSetTes
340  
341          Object e4 = q.lower(zero);
342          assertNull(e4);
348 –
343      }
344  
345      /**
# Line 364 | Line 358 | public class ConcurrentSkipListSubSetTes
358  
359          Object e4 = q.higher(six);
360          assertNull(e4);
367 –
361      }
362  
363      /**
# Line 383 | Line 376 | public class ConcurrentSkipListSubSetTes
376  
377          Object e4 = q.floor(zero);
378          assertNull(e4);
386 –
379      }
380  
381      /**
# Line 402 | Line 394 | public class ConcurrentSkipListSubSetTes
394  
395          Object e4 = q.ceiling(six);
396          assertNull(e4);
405 –
397      }
398  
399      /**
# Line 459 | Line 450 | public class ConcurrentSkipListSubSetTes
450      /**
451       * iterator.remove removes current element
452       */
453 <    public void testIteratorRemove () {
453 >    public void testIteratorRemove() {
454          final NavigableSet q = set0();
455          q.add(new Integer(2));
456          q.add(new Integer(1));
# Line 691 | Line 682 | public class ConcurrentSkipListSubSetTes
682              shouldThrow();
683          } catch (NullPointerException success) {}
684      }
685 +
686      /**
687       * addAll of a collection with null elements throws NPE
688       */
# Line 702 | Line 694 | public class ConcurrentSkipListSubSetTes
694              shouldThrow();
695          } catch (NullPointerException success) {}
696      }
697 +
698      /**
699       * addAll of a collection with any null elements throws NPE after
700       * possibly adding some elements
# Line 721 | Line 714 | public class ConcurrentSkipListSubSetTes
714       * Set contains all elements of successful addAll
715       */
716      public void testDescendingAddAll5() {
717 <        try {
718 <            Integer[] empty = new Integer[0];
719 <            Integer[] ints = new Integer[SIZE];
720 <            for (int i = 0; i < SIZE; ++i)
721 <                ints[i] = new Integer(SIZE-1- i);
722 <            NavigableSet q = dset0();
723 <            assertFalse(q.addAll(Arrays.asList(empty)));
724 <            assertTrue(q.addAll(Arrays.asList(ints)));
725 <            for (int i = 0; i < SIZE; ++i)
733 <                assertEquals(new Integer(i), q.pollFirst());
734 <        }
735 <        finally {}
717 >        Integer[] empty = new Integer[0];
718 >        Integer[] ints = new Integer[SIZE];
719 >        for (int i = 0; i < SIZE; ++i)
720 >            ints[i] = new Integer(SIZE-1- i);
721 >        NavigableSet q = dset0();
722 >        assertFalse(q.addAll(Arrays.asList(empty)));
723 >        assertTrue(q.addAll(Arrays.asList(ints)));
724 >        for (int i = 0; i < SIZE; ++i)
725 >            assertEquals(new Integer(i), q.pollFirst());
726      }
727  
728      /**
# Line 741 | Line 731 | public class ConcurrentSkipListSubSetTes
731      public void testDescendingPoll() {
732          NavigableSet q = populatedSet(SIZE);
733          for (int i = 0; i < SIZE; ++i) {
734 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
734 >            assertEquals(i, q.pollFirst());
735          }
736          assertNull(q.pollFirst());
737      }
# Line 854 | Line 844 | public class ConcurrentSkipListSubSetTes
844  
845          Object e4 = q.lower(zero);
846          assertNull(e4);
857 –
847      }
848  
849      /**
# Line 873 | Line 862 | public class ConcurrentSkipListSubSetTes
862  
863          Object e4 = q.higher(m6);
864          assertNull(e4);
876 –
865      }
866  
867      /**
# Line 892 | Line 880 | public class ConcurrentSkipListSubSetTes
880  
881          Object e4 = q.floor(zero);
882          assertNull(e4);
895 –
883      }
884  
885      /**
# Line 911 | Line 898 | public class ConcurrentSkipListSubSetTes
898  
899          Object e4 = q.ceiling(m6);
900          assertNull(e4);
914 –
901      }
902  
903      /**
# Line 968 | Line 954 | public class ConcurrentSkipListSubSetTes
954      /**
955       * iterator.remove removes current element
956       */
957 <    public void testDescendingIteratorRemove () {
957 >    public void testDescendingIteratorRemove() {
958          final NavigableSet q = dset0();
959          q.add(new Integer(2));
960          q.add(new Integer(1));

Diff Legend

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