ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ConcurrentSkipListMapTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.24 by jsr166, Fri May 27 19:21:27 2011 UTC vs.
Revision 1.40 by jsr166, Fri Aug 4 03:00:20 2017 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.ArrayList;
8 > import java.util.Arrays;
9 > import java.util.BitSet;
10 > import java.util.Collection;
11 > import java.util.Iterator;
12 > import java.util.Map;
13 > import java.util.NavigableMap;
14 > import java.util.NavigableSet;
15 > import java.util.NoSuchElementException;
16 > import java.util.Random;
17 > import java.util.Set;
18 > import java.util.concurrent.ConcurrentSkipListMap;
19 >
20 > import junit.framework.Test;
21 > import junit.framework.TestSuite;
22  
23   public class ConcurrentSkipListMapTest extends JSR166TestCase {
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run(suite());
25 >        main(suite(), args);
26      }
27      public static Test suite() {
28          return new TestSuite(ConcurrentSkipListMapTest.class);
29      }
30  
31      /**
32 <     * Create a map from Integers 1-5 to Strings "A"-"E".
32 >     * Returns a new map from Integers 1-5 to Strings "A"-"E".
33       */
34      private static ConcurrentSkipListMap map5() {
35          ConcurrentSkipListMap map = new ConcurrentSkipListMap();
# Line 39 | Line 50 | public class ConcurrentSkipListMapTest e
50      public void testClear() {
51          ConcurrentSkipListMap map = map5();
52          map.clear();
53 <        assertEquals(map.size(), 0);
53 >        assertEquals(0, map.size());
54      }
55  
56      /**
57 <     *
57 >     * copy constructor creates map equal to source map
58       */
59      public void testConstructFromSorted() {
60          ConcurrentSkipListMap map = map5();
# Line 175 | Line 186 | public class ConcurrentSkipListMapTest e
186              last = k;
187              ++count;
188          }
189 <        assertEquals(count ,5);
189 >        assertEquals(5, count);
190      }
191  
192      /**
# Line 194 | Line 205 | public class ConcurrentSkipListMapTest e
205              last = k;
206              ++count;
207          }
208 <        assertEquals(count ,5);
208 >        assertEquals(5, count);
209      }
210  
211      /**
# Line 213 | Line 224 | public class ConcurrentSkipListMapTest e
224              last = k;
225              ++count;
226          }
227 <        assertEquals(count, 5);
227 >        assertEquals(5, count);
228      }
229  
230      /**
# Line 232 | Line 243 | public class ConcurrentSkipListMapTest e
243              last = k;
244              ++count;
245          }
246 <        assertEquals(count, 5);
246 >        assertEquals(5, count);
247      }
248  
249      /**
# Line 502 | Line 513 | public class ConcurrentSkipListMapTest e
513       * lowerEntry, higherEntry, ceilingEntry, and floorEntry return
514       * immutable entries
515       */
516 <    public void testEntryImmutablity() {
516 >    public void testEntryImmutability() {
517          ConcurrentSkipListMap map = map5();
518          Map.Entry e = map.lowerEntry(three);
519          assertEquals(two, e.getKey());
# Line 530 | Line 541 | public class ConcurrentSkipListMapTest e
541          } catch (UnsupportedOperationException success) {}
542      }
543  
533 –
544      /**
545       * lowerKey returns preceding element
546       */
# Line 684 | Line 694 | public class ConcurrentSkipListMapTest e
694       * get(null) of nonempty map throws NPE
695       */
696      public void testGet_NullPointerException() {
697 +        ConcurrentSkipListMap c = map5();
698          try {
688 –            ConcurrentSkipListMap c = map5();
699              c.get(null);
700              shouldThrow();
701          } catch (NullPointerException success) {}
# Line 695 | Line 705 | public class ConcurrentSkipListMapTest e
705       * containsKey(null) of nonempty map throws NPE
706       */
707      public void testContainsKey_NullPointerException() {
708 +        ConcurrentSkipListMap c = map5();
709          try {
699 –            ConcurrentSkipListMap c = map5();
710              c.containsKey(null);
711              shouldThrow();
712          } catch (NullPointerException success) {}
# Line 706 | Line 716 | public class ConcurrentSkipListMapTest e
716       * containsValue(null) throws NPE
717       */
718      public void testContainsValue_NullPointerException() {
719 +        ConcurrentSkipListMap c = new ConcurrentSkipListMap();
720          try {
710 –            ConcurrentSkipListMap c = new ConcurrentSkipListMap();
721              c.containsValue(null);
722              shouldThrow();
723          } catch (NullPointerException success) {}
# Line 717 | Line 727 | public class ConcurrentSkipListMapTest e
727       * put(null,x) throws NPE
728       */
729      public void testPut1_NullPointerException() {
730 +        ConcurrentSkipListMap c = map5();
731          try {
721 –            ConcurrentSkipListMap c = map5();
732              c.put(null, "whatever");
733              shouldThrow();
734          } catch (NullPointerException success) {}
# Line 728 | Line 738 | public class ConcurrentSkipListMapTest e
738       * putIfAbsent(null, x) throws NPE
739       */
740      public void testPutIfAbsent1_NullPointerException() {
741 +        ConcurrentSkipListMap c = map5();
742          try {
732 –            ConcurrentSkipListMap c = map5();
743              c.putIfAbsent(null, "whatever");
744              shouldThrow();
745          } catch (NullPointerException success) {}
# Line 739 | Line 749 | public class ConcurrentSkipListMapTest e
749       * replace(null, x) throws NPE
750       */
751      public void testReplace_NullPointerException() {
752 +        ConcurrentSkipListMap c = map5();
753          try {
743 –            ConcurrentSkipListMap c = map5();
754              c.replace(null, "whatever");
755              shouldThrow();
756          } catch (NullPointerException success) {}
# Line 750 | Line 760 | public class ConcurrentSkipListMapTest e
760       * replace(null, x, y) throws NPE
761       */
762      public void testReplaceValue_NullPointerException() {
763 +        ConcurrentSkipListMap c = map5();
764          try {
754 –            ConcurrentSkipListMap c = map5();
765              c.replace(null, one, "whatever");
766              shouldThrow();
767          } catch (NullPointerException success) {}
# Line 761 | Line 771 | public class ConcurrentSkipListMapTest e
771       * remove(null) throws NPE
772       */
773      public void testRemove1_NullPointerException() {
774 +        ConcurrentSkipListMap c = new ConcurrentSkipListMap();
775 +        c.put("sadsdf", "asdads");
776          try {
765 –            ConcurrentSkipListMap c = new ConcurrentSkipListMap();
766 –            c.put("sadsdf", "asdads");
777              c.remove(null);
778              shouldThrow();
779          } catch (NullPointerException success) {}
# Line 773 | Line 783 | public class ConcurrentSkipListMapTest e
783       * remove(null, x) throws NPE
784       */
785      public void testRemove2_NullPointerException() {
786 +        ConcurrentSkipListMap c = new ConcurrentSkipListMap();
787 +        c.put("sadsdf", "asdads");
788          try {
777 –            ConcurrentSkipListMap c = new ConcurrentSkipListMap();
778 –            c.put("sadsdf", "asdads");
789              c.remove(null, "whatever");
790              shouldThrow();
791          } catch (NullPointerException success) {}
# Line 791 | Line 801 | public class ConcurrentSkipListMapTest e
801      }
802  
803      /**
804 <     * A deserialized map equals original
804 >     * A cloned map equals original
805 >     */
806 >    public void testClone() {
807 >        ConcurrentSkipListMap x = map5();
808 >        ConcurrentSkipListMap y = x.clone();
809 >
810 >        assertNotSame(x, y);
811 >        assertEquals(x.size(), y.size());
812 >        assertEquals(x.toString(), y.toString());
813 >        assertEquals(x, y);
814 >        assertEquals(y, x);
815 >        y.clear();
816 >        assertTrue(y.isEmpty());
817 >        assertFalse(x.equals(y));
818 >    }
819 >
820 >    /**
821 >     * A deserialized/reserialized map equals original
822       */
823      public void testSerialization() throws Exception {
824 <        ConcurrentSkipListMap q = map5();
824 >        NavigableMap x = map5();
825 >        NavigableMap y = serialClone(x);
826  
827 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
828 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
829 <        out.writeObject(q);
830 <        out.close();
831 <
832 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
833 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
834 <        ConcurrentSkipListMap r = (ConcurrentSkipListMap)in.readObject();
807 <        assertEquals(q.size(), r.size());
808 <        assertTrue(q.equals(r));
809 <        assertTrue(r.equals(q));
827 >        assertNotSame(x, y);
828 >        assertEquals(x.size(), y.size());
829 >        assertEquals(x.toString(), y.toString());
830 >        assertEquals(x, y);
831 >        assertEquals(y, x);
832 >        y.clear();
833 >        assertTrue(y.isEmpty());
834 >        assertFalse(x.equals(y));
835      }
836  
837      /**
# Line 992 | Line 1017 | public class ConcurrentSkipListMapTest e
1017  
1018      static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
1019          NavigableMap<Integer, Integer> result =
1020 <            (NavigableMap<Integer, Integer>) cl.newInstance();
1021 <        assertEquals(result.size(), 0);
1020 >            (NavigableMap<Integer, Integer>) cl.getConstructor().newInstance();
1021 >        assertEquals(0, result.size());
1022          assertFalse(result.keySet().iterator().hasNext());
1023          return result;
1024      }
# Line 1025 | Line 1050 | public class ConcurrentSkipListMapTest e
1050          // Add entries till we're back to original size
1051          while (map.size() < size) {
1052              int key = min + rnd.nextInt(rangeSize);
1053 <            assertTrue(key >= min && key<= max);
1053 >            assertTrue(key >= min && key <= max);
1054              put(map, key);
1055          }
1056      }
# Line 1050 | Line 1075 | public class ConcurrentSkipListMapTest e
1075          // Add entries till we're back to original size
1076          while (map.size() < size) {
1077              int key = min - 5 + rnd.nextInt(rangeSize + 10);
1078 <            if (key >= min && key<= max) {
1078 >            if (key >= min && key <= max) {
1079                  put(map, key);
1080              } else {
1081                  try {
# Line 1220 | Line 1245 | public class ConcurrentSkipListMapTest e
1245              if (bsContainsI)
1246                  size++;
1247          }
1248 <        assertEquals(map.size(), size);
1248 >        assertEquals(size, map.size());
1249  
1250          // Test contents using contains keySet iterator
1251          int size2 = 0;
# Line 1268 | Line 1293 | public class ConcurrentSkipListMapTest e
1293      }
1294  
1295      static boolean eq(Integer i, int j) {
1296 <        return i == null ? j == -1 : i == j;
1296 >        return (i == null) ? j == -1 : i == j;
1297      }
1298  
1299   }

Diff Legend

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