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.11 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.26 by jsr166, Wed Dec 31 19:05:42 2014 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.*;
7 > import java.util.Arrays;
8 > import java.util.Comparator;
9 > import java.util.Iterator;
10 > 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());
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22          return new TestSuite(ConcurrentSkipListSubSetTest.class);
# Line 24 | 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 populatedSet(int n) {
36 <        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
35 >    private NavigableSet<Integer> populatedSet(int n) {
36 >        ConcurrentSkipListSet<Integer> q =
37 >            new ConcurrentSkipListSet<Integer>();
38          assertTrue(q.isEmpty());
39  
40          for (int i = n-1; i >= 0; i-=2)
# Line 44 | 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 62 | 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 96 | Line 102 | public class ConcurrentSkipListSubSetTes
102          assertEquals(0, set0().size());
103      }
104  
99
105      /**
106       * isEmpty is true before add, false after
107       */
# Line 167 | Line 172 | public class ConcurrentSkipListSubSetTes
172          } catch (ClassCastException success) {}
173      }
174  
170
175      /**
176       * addAll(null) throws NPE
177       */
# Line 178 | Line 182 | public class ConcurrentSkipListSubSetTes
182              shouldThrow();
183          } catch (NullPointerException success) {}
184      }
185 +
186      /**
187       * addAll of a collection with null elements throws NPE
188       */
# Line 189 | Line 194 | public class ConcurrentSkipListSubSetTes
194              shouldThrow();
195          } catch (NullPointerException success) {}
196      }
197 +
198      /**
199       * addAll of a collection with any null elements throws NPE after
200       * possibly adding some elements
# Line 236 | Line 242 | public class ConcurrentSkipListSubSetTes
242      public void testRemoveElement() {
243          NavigableSet q = populatedSet(SIZE);
244          for (int i = 1; i < SIZE; i+=2) {
245 <            assertTrue(q.remove(new Integer(i)));
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) {
251 <            assertTrue(q.remove(new Integer(i)));
252 <            assertFalse(q.remove(new Integer(i+1)));
251 >            assertTrue(q.contains(i));
252 >            assertTrue(q.remove(i));
253 >            assertFalse(q.contains(i));
254 >            assertFalse(q.remove(i+1));
255 >            assertFalse(q.contains(i+1));
256          }
257          assertTrue(q.isEmpty());
258      }
# Line 320 | Line 332 | public class ConcurrentSkipListSubSetTes
332          }
333      }
334  
323
324
335      /**
336       * lower returns preceding element
337       */
# Line 338 | Line 348 | public class ConcurrentSkipListSubSetTes
348  
349          Object e4 = q.lower(zero);
350          assertNull(e4);
341
351      }
352  
353      /**
# Line 357 | Line 366 | public class ConcurrentSkipListSubSetTes
366  
367          Object e4 = q.higher(six);
368          assertNull(e4);
360
369      }
370  
371      /**
# Line 376 | Line 384 | public class ConcurrentSkipListSubSetTes
384  
385          Object e4 = q.floor(zero);
386          assertNull(e4);
379
387      }
388  
389      /**
# Line 395 | Line 402 | public class ConcurrentSkipListSubSetTes
402  
403          Object e4 = q.ceiling(six);
404          assertNull(e4);
398
405      }
406  
407      /**
408 <     * toArray contains all elements
408 >     * toArray contains all elements in sorted order
409       */
410      public void testToArray() {
411          NavigableSet q = populatedSet(SIZE);
412          Object[] o = q.toArray();
407        Arrays.sort(o);
413          for (int i = 0; i < o.length; i++)
414 <            assertEquals(o[i], q.pollFirst());
414 >            assertSame(o[i], q.pollFirst());
415      }
416  
417      /**
418 <     * toArray(a) contains all elements
418 >     * toArray(a) contains all elements in sorted order
419       */
420      public void testToArray2() {
421 <        NavigableSet q = populatedSet(SIZE);
421 >        NavigableSet<Integer> q = populatedSet(SIZE);
422          Integer[] ints = new Integer[SIZE];
423 <        ints = (Integer[])q.toArray(ints);
424 <        Arrays.sort(ints);
423 >        Integer[] array = q.toArray(ints);
424 >        assertSame(ints, array);
425          for (int i = 0; i < ints.length; i++)
426 <            assertEquals(ints[i], q.pollFirst());
426 >            assertSame(ints[i], q.pollFirst());
427      }
428  
429      /**
# Line 446 | Line 451 | public class ConcurrentSkipListSubSetTes
451              assertTrue(q.contains(it.next()));
452              ++i;
453          }
454 <        assertEquals(i, 0);
454 >        assertEquals(0, i);
455      }
456  
457      /**
458       * iterator.remove removes current element
459       */
460 <    public void testIteratorRemove () {
460 >    public void testIteratorRemove() {
461          final NavigableSet q = set0();
462          q.add(new Integer(2));
463          q.add(new Integer(1));
# Line 468 | Line 473 | public class ConcurrentSkipListSubSetTes
473          assertFalse(it.hasNext());
474      }
475  
471
476      /**
477       * toString contains toStrings of elements
478       */
# Line 476 | Line 480 | public class ConcurrentSkipListSubSetTes
480          NavigableSet q = populatedSet(SIZE);
481          String s = q.toString();
482          for (int i = 0; i < SIZE; ++i) {
483 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
483 >            assertTrue(s.contains(String.valueOf(i)));
484          }
485      }
486  
# Line 484 | Line 488 | public class ConcurrentSkipListSubSetTes
488       * A deserialized serialized set has same elements
489       */
490      public void testSerialization() throws Exception {
491 <        NavigableSet q = populatedSet(SIZE);
492 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
493 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
494 <        out.writeObject(q);
495 <        out.close();
496 <
497 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
498 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
499 <        NavigableSet r = (NavigableSet)in.readObject();
500 <        assertEquals(q.size(), r.size());
501 <        while (!q.isEmpty())
502 <            assertEquals(q.pollFirst(), r.pollFirst());
491 >        NavigableSet x = populatedSet(SIZE);
492 >        NavigableSet y = serialClone(x);
493 >
494 >        assertNotSame(y, x);
495 >        assertEquals(x.size(), y.size());
496 >        assertEquals(x, y);
497 >        assertEquals(y, x);
498 >        while (!x.isEmpty()) {
499 >            assertFalse(y.isEmpty());
500 >            assertEquals(x.pollFirst(), y.pollFirst());
501 >        }
502 >        assertTrue(y.isEmpty());
503      }
504  
505      /**
# Line 673 | Line 677 | public class ConcurrentSkipListSubSetTes
677          } catch (ClassCastException success) {}
678      }
679  
676
680      /**
681       * addAll(null) throws NPE
682       */
# Line 684 | Line 687 | public class ConcurrentSkipListSubSetTes
687              shouldThrow();
688          } catch (NullPointerException success) {}
689      }
690 +
691      /**
692       * addAll of a collection with null elements throws NPE
693       */
# Line 695 | Line 699 | public class ConcurrentSkipListSubSetTes
699              shouldThrow();
700          } catch (NullPointerException success) {}
701      }
702 +
703      /**
704       * addAll of a collection with any null elements throws NPE after
705       * possibly adding some elements
# Line 826 | Line 831 | public class ConcurrentSkipListSubSetTes
831          }
832      }
833  
829
830
834      /**
835       * lower returns preceding element
836       */
# Line 844 | Line 847 | public class ConcurrentSkipListSubSetTes
847  
848          Object e4 = q.lower(zero);
849          assertNull(e4);
847
850      }
851  
852      /**
# Line 863 | Line 865 | public class ConcurrentSkipListSubSetTes
865  
866          Object e4 = q.higher(m6);
867          assertNull(e4);
866
868      }
869  
870      /**
# Line 882 | Line 883 | public class ConcurrentSkipListSubSetTes
883  
884          Object e4 = q.floor(zero);
885          assertNull(e4);
885
886      }
887  
888      /**
# Line 901 | Line 901 | public class ConcurrentSkipListSubSetTes
901  
902          Object e4 = q.ceiling(m6);
903          assertNull(e4);
904
904      }
905  
906      /**
# Line 921 | Line 920 | public class ConcurrentSkipListSubSetTes
920      public void testDescendingToArray2() {
921          NavigableSet q = populatedSet(SIZE);
922          Integer[] ints = new Integer[SIZE];
923 <        ints = (Integer[])q.toArray(ints);
923 >        assertSame(ints, q.toArray(ints));
924          Arrays.sort(ints);
925          for (int i = 0; i < ints.length; i++)
926              assertEquals(ints[i], q.pollFirst());
# Line 952 | Line 951 | public class ConcurrentSkipListSubSetTes
951              assertTrue(q.contains(it.next()));
952              ++i;
953          }
954 <        assertEquals(i, 0);
954 >        assertEquals(0, i);
955      }
956  
957      /**
958       * iterator.remove removes current element
959       */
960 <    public void testDescendingIteratorRemove () {
960 >    public void testDescendingIteratorRemove() {
961          final NavigableSet q = dset0();
962          q.add(new Integer(2));
963          q.add(new Integer(1));
# Line 974 | Line 973 | public class ConcurrentSkipListSubSetTes
973          assertFalse(it.hasNext());
974      }
975  
977
976      /**
977       * toString contains toStrings of elements
978       */
# Line 982 | Line 980 | public class ConcurrentSkipListSubSetTes
980          NavigableSet q = populatedSet(SIZE);
981          String s = q.toString();
982          for (int i = 0; i < SIZE; ++i) {
983 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
983 >            assertTrue(s.contains(String.valueOf(i)));
984          }
985      }
986  
# Line 990 | Line 988 | public class ConcurrentSkipListSubSetTes
988       * A deserialized serialized set has same elements
989       */
990      public void testDescendingSerialization() throws Exception {
991 <        NavigableSet q = populatedSet(SIZE);
992 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
993 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
994 <        out.writeObject(q);
995 <        out.close();
996 <
997 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
998 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
999 <        NavigableSet r = (NavigableSet)in.readObject();
1000 <        assertEquals(q.size(), r.size());
1001 <        while (!q.isEmpty())
1002 <            assertEquals(q.pollFirst(), r.pollFirst());
991 >        NavigableSet x = dset5();
992 >        NavigableSet y = serialClone(x);
993 >
994 >        assertNotSame(y, x);
995 >        assertEquals(x.size(), y.size());
996 >        assertEquals(x, y);
997 >        assertEquals(y, x);
998 >        while (!x.isEmpty()) {
999 >            assertFalse(y.isEmpty());
1000 >            assertEquals(x.pollFirst(), y.pollFirst());
1001 >        }
1002 >        assertTrue(y.isEmpty());
1003      }
1004  
1005      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines