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.17 by jsr166, Thu Nov 18 20:21:53 2010 UTC vs.
Revision 1.27 by jsr166, Wed Dec 31 20:09:08 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) {
# 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<Integer> populatedSet(int n) {
# Line 32 | 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 45 | 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 63 | 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 97 | Line 102 | public class ConcurrentSkipListSubSetTes
102          assertEquals(0, set0().size());
103      }
104  
100
105      /**
106       * isEmpty is true before add, false after
107       */
# Line 168 | Line 172 | public class ConcurrentSkipListSubSetTes
172          } catch (ClassCastException success) {}
173      }
174  
171
175      /**
176       * addAll(null) throws NPE
177       */
# Line 238 | 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 329 | Line 332 | public class ConcurrentSkipListSubSetTes
332          }
333      }
334  
332
333
335      /**
336       * lower returns preceding element
337       */
# Line 450 | 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      /**
# Line 472 | Line 473 | public class ConcurrentSkipListSubSetTes
473          assertFalse(it.hasNext());
474      }
475  
475
476      /**
477       * toString contains toStrings of elements
478       */
# Line 480 | 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 488 | 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 677 | Line 677 | public class ConcurrentSkipListSubSetTes
677          } catch (ClassCastException success) {}
678      }
679  
680
680      /**
681       * addAll(null) throws NPE
682       */
# Line 747 | 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 832 | Line 831 | public class ConcurrentSkipListSubSetTes
831          }
832      }
833  
835
836
834      /**
835       * lower returns preceding element
836       */
# Line 954 | 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      /**
# Line 976 | Line 973 | public class ConcurrentSkipListSubSetTes
973          assertFalse(it.hasNext());
974      }
975  
979
976      /**
977       * toString contains toStrings of elements
978       */
# Line 984 | 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 992 | 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