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.20 by jsr166, Tue May 31 16:16:23 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7   import junit.framework.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
10 < import java.io.*;
8 > import java.util.Arrays;
9 > import java.util.BitSet;
10 > import java.util.Collection;
11 > import java.util.Comparator;
12 > import java.util.Iterator;
13 > import java.util.NavigableSet;
14 > import java.util.NoSuchElementException;
15 > import java.util.Random;
16 > import java.util.Set;
17 > import java.util.SortedSet;
18 > import java.util.concurrent.ConcurrentSkipListSet;
19  
20   public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
21      public static void main(String[] args) {
22 <        junit.textui.TestRunner.run (suite());
22 >        junit.textui.TestRunner.run(suite());
23      }
24      public static Test suite() {
25          return new TestSuite(ConcurrentSkipListSubSetTest.class);
# Line 19 | Line 27 | public class ConcurrentSkipListSubSetTes
27  
28      static class MyReverseComparator implements Comparator {
29          public int compare(Object x, Object y) {
30 <            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;
30 >            return ((Comparable)y).compareTo(x);
31          }
32      }
33  
# Line 31 | Line 35 | public class ConcurrentSkipListSubSetTes
35       * Create a set of given size containing consecutive
36       * Integers 0 ... n.
37       */
38 <    private NavigableSet populatedSet(int n) {
39 <        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
38 >    private NavigableSet<Integer> populatedSet(int n) {
39 >        ConcurrentSkipListSet<Integer> q =
40 >            new ConcurrentSkipListSet<Integer>();
41          assertTrue(q.isEmpty());
42  
43          for (int i = n-1; i >= 0; i-=2)
# Line 100 | Line 105 | public class ConcurrentSkipListSubSetTes
105          assertEquals(0, set0().size());
106      }
107  
103
108      /**
109       * isEmpty is true before add, false after
110       */
# Line 171 | Line 175 | public class ConcurrentSkipListSubSetTes
175          } catch (ClassCastException success) {}
176      }
177  
174
178      /**
179       * addAll(null) throws NPE
180       */
# Line 182 | Line 185 | public class ConcurrentSkipListSubSetTes
185              shouldThrow();
186          } catch (NullPointerException success) {}
187      }
188 +
189      /**
190       * addAll of a collection with null elements throws NPE
191       */
# Line 193 | Line 197 | public class ConcurrentSkipListSubSetTes
197              shouldThrow();
198          } catch (NullPointerException success) {}
199      }
200 +
201      /**
202       * addAll of a collection with any null elements throws NPE after
203       * possibly adding some elements
# Line 212 | Line 217 | public class ConcurrentSkipListSubSetTes
217       * Set contains all elements of successful addAll
218       */
219      public void testAddAll5() {
220 <        try {
221 <            Integer[] empty = new Integer[0];
222 <            Integer[] ints = new Integer[SIZE];
223 <            for (int i = 0; i < SIZE; ++i)
224 <                ints[i] = new Integer(SIZE-1- i);
225 <            NavigableSet q = set0();
226 <            assertFalse(q.addAll(Arrays.asList(empty)));
227 <            assertTrue(q.addAll(Arrays.asList(ints)));
228 <            for (int i = 0; i < SIZE; ++i)
224 <                assertEquals(new Integer(i), q.pollFirst());
225 <        }
226 <        finally {}
220 >        Integer[] empty = new Integer[0];
221 >        Integer[] ints = new Integer[SIZE];
222 >        for (int i = 0; i < SIZE; ++i)
223 >            ints[i] = new Integer(SIZE-1- i);
224 >        NavigableSet q = set0();
225 >        assertFalse(q.addAll(Arrays.asList(empty)));
226 >        assertTrue(q.addAll(Arrays.asList(ints)));
227 >        for (int i = 0; i < SIZE; ++i)
228 >            assertEquals(new Integer(i), q.pollFirst());
229      }
230  
231      /**
# Line 232 | Line 234 | public class ConcurrentSkipListSubSetTes
234      public void testPoll() {
235          NavigableSet q = populatedSet(SIZE);
236          for (int i = 0; i < SIZE; ++i) {
237 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
237 >            assertEquals(i, q.pollFirst());
238          }
239          assertNull(q.pollFirst());
240      }
# Line 243 | Line 245 | public class ConcurrentSkipListSubSetTes
245      public void testRemoveElement() {
246          NavigableSet q = populatedSet(SIZE);
247          for (int i = 1; i < SIZE; i+=2) {
248 <            assertTrue(q.remove(new Integer(i)));
248 >            assertTrue(q.contains(i));
249 >            assertTrue(q.remove(i));
250 >            assertFalse(q.contains(i));
251 >            assertTrue(q.contains(i-1));
252          }
253          for (int i = 0; i < SIZE; i+=2) {
254 <            assertTrue(q.remove(new Integer(i)));
255 <            assertFalse(q.remove(new Integer(i+1)));
254 >            assertTrue(q.contains(i));
255 >            assertTrue(q.remove(i));
256 >            assertFalse(q.contains(i));
257 >            assertFalse(q.remove(i+1));
258 >            assertFalse(q.contains(i+1));
259          }
260          assertTrue(q.isEmpty());
261      }
# Line 327 | Line 335 | public class ConcurrentSkipListSubSetTes
335          }
336      }
337  
330
331
338      /**
339       * lower returns preceding element
340       */
# Line 345 | Line 351 | public class ConcurrentSkipListSubSetTes
351  
352          Object e4 = q.lower(zero);
353          assertNull(e4);
348
354      }
355  
356      /**
# Line 364 | Line 369 | public class ConcurrentSkipListSubSetTes
369  
370          Object e4 = q.higher(six);
371          assertNull(e4);
367
372      }
373  
374      /**
# Line 383 | Line 387 | public class ConcurrentSkipListSubSetTes
387  
388          Object e4 = q.floor(zero);
389          assertNull(e4);
386
390      }
391  
392      /**
# Line 402 | Line 405 | public class ConcurrentSkipListSubSetTes
405  
406          Object e4 = q.ceiling(six);
407          assertNull(e4);
405
408      }
409  
410      /**
411 <     * toArray contains all elements
411 >     * toArray contains all elements in sorted order
412       */
413      public void testToArray() {
414          NavigableSet q = populatedSet(SIZE);
415          Object[] o = q.toArray();
414        Arrays.sort(o);
416          for (int i = 0; i < o.length; i++)
417 <            assertEquals(o[i], q.pollFirst());
417 >            assertSame(o[i], q.pollFirst());
418      }
419  
420      /**
421 <     * toArray(a) contains all elements
421 >     * toArray(a) contains all elements in sorted order
422       */
423      public void testToArray2() {
424 <        NavigableSet q = populatedSet(SIZE);
424 >        NavigableSet<Integer> q = populatedSet(SIZE);
425          Integer[] ints = new Integer[SIZE];
426 <        ints = (Integer[])q.toArray(ints);
427 <        Arrays.sort(ints);
426 >        Integer[] array = q.toArray(ints);
427 >        assertSame(ints, array);
428          for (int i = 0; i < ints.length; i++)
429 <            assertEquals(ints[i], q.pollFirst());
429 >            assertSame(ints[i], q.pollFirst());
430      }
431  
432      /**
# Line 459 | Line 460 | public class ConcurrentSkipListSubSetTes
460      /**
461       * iterator.remove removes current element
462       */
463 <    public void testIteratorRemove () {
463 >    public void testIteratorRemove() {
464          final NavigableSet q = set0();
465          q.add(new Integer(2));
466          q.add(new Integer(1));
# Line 475 | Line 476 | public class ConcurrentSkipListSubSetTes
476          assertFalse(it.hasNext());
477      }
478  
478
479      /**
480       * toString contains toStrings of elements
481       */
# Line 483 | Line 483 | public class ConcurrentSkipListSubSetTes
483          NavigableSet q = populatedSet(SIZE);
484          String s = q.toString();
485          for (int i = 0; i < SIZE; ++i) {
486 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
486 >            assertTrue(s.contains(String.valueOf(i)));
487          }
488      }
489  
# Line 491 | Line 491 | public class ConcurrentSkipListSubSetTes
491       * A deserialized serialized set has same elements
492       */
493      public void testSerialization() throws Exception {
494 <        NavigableSet q = populatedSet(SIZE);
495 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
496 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
497 <        out.writeObject(q);
498 <        out.close();
499 <
500 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
501 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
502 <        NavigableSet r = (NavigableSet)in.readObject();
503 <        assertEquals(q.size(), r.size());
504 <        while (!q.isEmpty())
505 <            assertEquals(q.pollFirst(), r.pollFirst());
494 >        NavigableSet x = populatedSet(SIZE);
495 >        NavigableSet y = serialClone(x);
496 >
497 >        assertTrue(x != y);
498 >        assertEquals(x.size(), y.size());
499 >        assertEquals(x, y);
500 >        assertEquals(y, x);
501 >        while (!x.isEmpty()) {
502 >            assertFalse(y.isEmpty());
503 >            assertEquals(x.pollFirst(), y.pollFirst());
504 >        }
505 >        assertTrue(y.isEmpty());
506      }
507  
508      /**
# Line 680 | Line 680 | public class ConcurrentSkipListSubSetTes
680          } catch (ClassCastException success) {}
681      }
682  
683
683      /**
684       * addAll(null) throws NPE
685       */
# Line 691 | Line 690 | public class ConcurrentSkipListSubSetTes
690              shouldThrow();
691          } catch (NullPointerException success) {}
692      }
693 +
694      /**
695       * addAll of a collection with null elements throws NPE
696       */
# Line 702 | Line 702 | public class ConcurrentSkipListSubSetTes
702              shouldThrow();
703          } catch (NullPointerException success) {}
704      }
705 +
706      /**
707       * addAll of a collection with any null elements throws NPE after
708       * possibly adding some elements
# Line 721 | Line 722 | public class ConcurrentSkipListSubSetTes
722       * Set contains all elements of successful addAll
723       */
724      public void testDescendingAddAll5() {
725 <        try {
726 <            Integer[] empty = new Integer[0];
727 <            Integer[] ints = new Integer[SIZE];
728 <            for (int i = 0; i < SIZE; ++i)
729 <                ints[i] = new Integer(SIZE-1- i);
730 <            NavigableSet q = dset0();
731 <            assertFalse(q.addAll(Arrays.asList(empty)));
732 <            assertTrue(q.addAll(Arrays.asList(ints)));
733 <            for (int i = 0; i < SIZE; ++i)
733 <                assertEquals(new Integer(i), q.pollFirst());
734 <        }
735 <        finally {}
725 >        Integer[] empty = new Integer[0];
726 >        Integer[] ints = new Integer[SIZE];
727 >        for (int i = 0; i < SIZE; ++i)
728 >            ints[i] = new Integer(SIZE-1- i);
729 >        NavigableSet q = dset0();
730 >        assertFalse(q.addAll(Arrays.asList(empty)));
731 >        assertTrue(q.addAll(Arrays.asList(ints)));
732 >        for (int i = 0; i < SIZE; ++i)
733 >            assertEquals(new Integer(i), q.pollFirst());
734      }
735  
736      /**
# Line 741 | Line 739 | public class ConcurrentSkipListSubSetTes
739      public void testDescendingPoll() {
740          NavigableSet q = populatedSet(SIZE);
741          for (int i = 0; i < SIZE; ++i) {
742 <            assertEquals(i, ((Integer)q.pollFirst()).intValue());
742 >            assertEquals(i, q.pollFirst());
743          }
744          assertNull(q.pollFirst());
745      }
# Line 836 | Line 834 | public class ConcurrentSkipListSubSetTes
834          }
835      }
836  
839
840
837      /**
838       * lower returns preceding element
839       */
# Line 854 | Line 850 | public class ConcurrentSkipListSubSetTes
850  
851          Object e4 = q.lower(zero);
852          assertNull(e4);
857
853      }
854  
855      /**
# Line 873 | Line 868 | public class ConcurrentSkipListSubSetTes
868  
869          Object e4 = q.higher(m6);
870          assertNull(e4);
876
871      }
872  
873      /**
# Line 892 | Line 886 | public class ConcurrentSkipListSubSetTes
886  
887          Object e4 = q.floor(zero);
888          assertNull(e4);
895
889      }
890  
891      /**
# Line 911 | Line 904 | public class ConcurrentSkipListSubSetTes
904  
905          Object e4 = q.ceiling(m6);
906          assertNull(e4);
914
907      }
908  
909      /**
# Line 931 | Line 923 | public class ConcurrentSkipListSubSetTes
923      public void testDescendingToArray2() {
924          NavigableSet q = populatedSet(SIZE);
925          Integer[] ints = new Integer[SIZE];
926 <        ints = (Integer[])q.toArray(ints);
926 >        assertSame(ints, q.toArray(ints));
927          Arrays.sort(ints);
928          for (int i = 0; i < ints.length; i++)
929              assertEquals(ints[i], q.pollFirst());
# Line 968 | Line 960 | public class ConcurrentSkipListSubSetTes
960      /**
961       * iterator.remove removes current element
962       */
963 <    public void testDescendingIteratorRemove () {
963 >    public void testDescendingIteratorRemove() {
964          final NavigableSet q = dset0();
965          q.add(new Integer(2));
966          q.add(new Integer(1));
# Line 984 | Line 976 | public class ConcurrentSkipListSubSetTes
976          assertFalse(it.hasNext());
977      }
978  
987
979      /**
980       * toString contains toStrings of elements
981       */
# Line 992 | Line 983 | public class ConcurrentSkipListSubSetTes
983          NavigableSet q = populatedSet(SIZE);
984          String s = q.toString();
985          for (int i = 0; i < SIZE; ++i) {
986 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
986 >            assertTrue(s.contains(String.valueOf(i)));
987          }
988      }
989  
# Line 1000 | Line 991 | public class ConcurrentSkipListSubSetTes
991       * A deserialized serialized set has same elements
992       */
993      public void testDescendingSerialization() throws Exception {
994 <        NavigableSet q = populatedSet(SIZE);
995 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
996 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
997 <        out.writeObject(q);
998 <        out.close();
999 <
1000 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1001 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1002 <        NavigableSet r = (NavigableSet)in.readObject();
1003 <        assertEquals(q.size(), r.size());
1004 <        while (!q.isEmpty())
1005 <            assertEquals(q.pollFirst(), r.pollFirst());
994 >        NavigableSet x = dset5();
995 >        NavigableSet y = serialClone(x);
996 >
997 >        assertTrue(x != y);
998 >        assertEquals(x.size(), y.size());
999 >        assertEquals(x, y);
1000 >        assertEquals(y, x);
1001 >        while (!x.isEmpty()) {
1002 >            assertFalse(y.isEmpty());
1003 >            assertEquals(x.pollFirst(), y.pollFirst());
1004 >        }
1005 >        assertTrue(y.isEmpty());
1006      }
1007  
1008      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines