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.19 by jsr166, Fri May 27 19:21:27 2011 UTC vs.
Revision 1.26 by jsr166, Wed Dec 31 19:05:42 2014 UTC

# Line 4 | Line 4
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 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 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      /**
# Line 483 | 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 946 | 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 983 | 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