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

Comparing jsr166/src/test/tck/TreeMapTest.java (file contents):
Revision 1.15 by jsr166, Wed Sep 1 20:12:39 2010 UTC vs.
Revision 1.30 by jsr166, Sat Feb 28 18:33:42 2015 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.BitSet;
9 > import java.util.Collection;
10 > import java.util.Iterator;
11 > import java.util.Map;
12 > import java.util.NavigableMap;
13 > import java.util.NavigableSet;
14 > import java.util.NoSuchElementException;
15 > import java.util.Random;
16 > import java.util.Set;
17 > import java.util.TreeMap;
18 >
19 > import junit.framework.Test;
20 > import junit.framework.TestSuite;
21  
22   public class TreeMapTest extends JSR166TestCase {
23      public static void main(String[] args) {
# Line 18 | Line 28 | public class TreeMapTest extends JSR166T
28      }
29  
30      /**
31 <     * Create a map from Integers 1-5 to Strings "A"-"E".
31 >     * Returns a new map from Integers 1-5 to Strings "A"-"E".
32       */
33      private static TreeMap map5() {
34          TreeMap map = new TreeMap();
# Line 34 | Line 44 | public class TreeMapTest extends JSR166T
44      }
45  
46      /**
47 <     *  clear removes all pairs
47 >     * clear removes all pairs
48       */
49      public void testClear() {
50          TreeMap map = map5();
51          map.clear();
52 <        assertEquals(map.size(), 0);
52 >        assertEquals(0, map.size());
53      }
54  
55      /**
56 <     *
56 >     * copy constructor creates map equal to source map
57       */
58      public void testConstructFromSorted() {
59          TreeMap map = map5();
# Line 52 | Line 62 | public class TreeMapTest extends JSR166T
62      }
63  
64      /**
65 <     *  Maps with same contents are equal
65 >     * Maps with same contents are equal
66       */
67      public void testEquals() {
68          TreeMap map1 = map5();
# Line 65 | Line 75 | public class TreeMapTest extends JSR166T
75      }
76  
77      /**
78 <     *  containsKey returns true for contained key
78 >     * containsKey returns true for contained key
79       */
80      public void testContainsKey() {
81          TreeMap map = map5();
# Line 74 | Line 84 | public class TreeMapTest extends JSR166T
84      }
85  
86      /**
87 <     *  containsValue returns true for held values
87 >     * containsValue returns true for held values
88       */
89      public void testContainsValue() {
90          TreeMap map = map5();
# Line 83 | Line 93 | public class TreeMapTest extends JSR166T
93      }
94  
95      /**
96 <     *  get returns the correct element at the given key,
97 <     *  or null if not present
96 >     * get returns the correct element at the given key,
97 >     * or null if not present
98       */
99      public void testGet() {
100          TreeMap map = map5();
# Line 94 | Line 104 | public class TreeMapTest extends JSR166T
104      }
105  
106      /**
107 <     *  isEmpty is true of empty map and false for non-empty
107 >     * isEmpty is true of empty map and false for non-empty
108       */
109      public void testIsEmpty() {
110          TreeMap empty = new TreeMap();
# Line 104 | Line 114 | public class TreeMapTest extends JSR166T
114      }
115  
116      /**
117 <     *   firstKey returns first key
117 >     * firstKey returns first key
118       */
119      public void testFirstKey() {
120          TreeMap map = map5();
# Line 112 | Line 122 | public class TreeMapTest extends JSR166T
122      }
123  
124      /**
125 <     *   lastKey returns last key
125 >     * lastKey returns last key
126       */
127      public void testLastKey() {
128          TreeMap map = map5();
129          assertEquals(five, map.lastKey());
130      }
131  
122
132      /**
133 <     *  keySet.toArray returns contains all keys
133 >     * keySet.toArray returns contains all keys
134       */
135      public void testKeySetToArray() {
136          TreeMap map = map5();
# Line 134 | Line 143 | public class TreeMapTest extends JSR166T
143      }
144  
145      /**
146 <     *  descendingkeySet.toArray returns contains all keys
146 >     * descendingkeySet.toArray returns contains all keys
147       */
148      public void testDescendingKeySetToArray() {
149          TreeMap map = map5();
# Line 147 | Line 156 | public class TreeMapTest extends JSR166T
156      }
157  
158      /**
159 <     *   keySet returns a Set containing all the keys
159 >     * keySet returns a Set containing all the keys
160       */
161      public void testKeySet() {
162          TreeMap map = map5();
# Line 161 | Line 170 | public class TreeMapTest extends JSR166T
170      }
171  
172      /**
173 <     *   keySet is ordered
173 >     * keySet is ordered
174       */
175      public void testKeySetOrder() {
176          TreeMap map = map5();
# Line 176 | Line 185 | public class TreeMapTest extends JSR166T
185              last = k;
186              ++count;
187          }
188 <        assertEquals(count ,5);
188 >        assertEquals(5, count);
189      }
190  
191      /**
# Line 195 | Line 204 | public class TreeMapTest extends JSR166T
204              last = k;
205              ++count;
206          }
207 <        assertEquals(count ,5);
207 >        assertEquals(5, count);
208      }
209  
210      /**
211 <     *   descendingKeySet is ordered
211 >     * descendingKeySet is ordered
212       */
213      public void testDescendingKeySetOrder() {
214          TreeMap map = map5();
# Line 214 | Line 223 | public class TreeMapTest extends JSR166T
223              last = k;
224              ++count;
225          }
226 <        assertEquals(count, 5);
226 >        assertEquals(5, count);
227      }
228  
229      /**
230 <     *  descending iterator of descendingKeySet is ordered
230 >     * descending iterator of descendingKeySet is ordered
231       */
232      public void testDescendingKeySetDescendingIteratorOrder() {
233          TreeMap map = map5();
# Line 233 | Line 242 | public class TreeMapTest extends JSR166T
242              last = k;
243              ++count;
244          }
245 <        assertEquals(count, 5);
245 >        assertEquals(5, count);
246      }
247  
248      /**
# Line 289 | Line 298 | public class TreeMapTest extends JSR166T
298      }
299  
300      /**
301 <     *  entrySet.toArray contains all entries
301 >     * entrySet.toArray contains all entries
302       */
303      public void testEntrySetToArray() {
304          TreeMap map = map5();
# Line 303 | Line 312 | public class TreeMapTest extends JSR166T
312      }
313  
314      /**
315 <     *  descendingEntrySet.toArray contains all entries
315 >     * descendingEntrySet.toArray contains all entries
316       */
317      public void testDescendingEntrySetToArray() {
318          TreeMap map = map5();
# Line 317 | Line 326 | public class TreeMapTest extends JSR166T
326      }
327  
328      /**
329 <     *   putAll  adds all key-value pairs from the given map
329 >     * putAll adds all key-value pairs from the given map
330       */
331      public void testPutAll() {
332          TreeMap empty = new TreeMap();
# Line 332 | Line 341 | public class TreeMapTest extends JSR166T
341      }
342  
343      /**
344 <     *   remove removes the correct key-value pair from the map
344 >     * remove removes the correct key-value pair from the map
345       */
346      public void testRemove() {
347          TreeMap map = map5();
# Line 413 | Line 422 | public class TreeMapTest extends JSR166T
422          assertNull(e4);
423      }
424  
416
425      /**
426       * lowerKey returns preceding element
427       */
# Line 541 | Line 549 | public class TreeMapTest extends JSR166T
549      }
550  
551      /**
552 <     *   size returns the correct values
552 >     * size returns the correct values
553       */
554      public void testSize() {
555          TreeMap map = map5();
# Line 557 | Line 565 | public class TreeMapTest extends JSR166T
565          TreeMap map = map5();
566          String s = map.toString();
567          for (int i = 1; i <= 5; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 567 | Line 575 | public class TreeMapTest extends JSR166T
575       * get(null) of nonempty map throws NPE
576       */
577      public void testGet_NullPointerException() {
578 +        TreeMap c = map5();
579          try {
571            TreeMap c = map5();
580              c.get(null);
581              shouldThrow();
582          } catch (NullPointerException success) {}
# Line 578 | Line 586 | public class TreeMapTest extends JSR166T
586       * containsKey(null) of nonempty map throws NPE
587       */
588      public void testContainsKey_NullPointerException() {
589 +        TreeMap c = map5();
590          try {
582            TreeMap c = map5();
591              c.containsKey(null);
592              shouldThrow();
593          } catch (NullPointerException success) {}
# Line 589 | Line 597 | public class TreeMapTest extends JSR166T
597       * remove(null) throws NPE for nonempty map
598       */
599      public void testRemove1_NullPointerException() {
600 +        TreeMap c = new TreeMap();
601 +        c.put("sadsdf", "asdads");
602          try {
593            TreeMap c = new TreeMap();
594            c.put("sadsdf", "asdads");
603              c.remove(null);
604              shouldThrow();
605          } catch (NullPointerException success) {}
# Line 601 | Line 609 | public class TreeMapTest extends JSR166T
609       * A deserialized map equals original
610       */
611      public void testSerialization() throws Exception {
612 <        TreeMap q = map5();
612 >        NavigableMap x = map5();
613 >        NavigableMap y = serialClone(x);
614  
615 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
616 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
617 <        out.writeObject(q);
618 <        out.close();
619 <
611 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
612 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
613 <        TreeMap r = (TreeMap)in.readObject();
614 <        assertEquals(q.size(), r.size());
615 <        assertTrue(q.equals(r));
616 <        assertTrue(r.equals(q));
615 >        assertNotSame(x, y);
616 >        assertEquals(x.size(), y.size());
617 >        assertEquals(x.toString(), y.toString());
618 >        assertEquals(x, y);
619 >        assertEquals(y, x);
620      }
621  
622      /**
# Line 780 | Line 783 | public class TreeMapTest extends JSR166T
783       * Submaps of submaps subdivide correctly
784       */
785      public void testRecursiveSubMaps() throws Exception {
786 <        int mapSize = 1000;
786 >        int mapSize = expensiveTests ? 1000 : 100;
787          Class cl = TreeMap.class;
788          NavigableMap<Integer, Integer> map = newMap(cl);
789          bs = new BitSet(mapSize);
# Line 800 | Line 803 | public class TreeMapTest extends JSR166T
803      static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
804          NavigableMap<Integer, Integer> result
805              = (NavigableMap<Integer, Integer>) cl.newInstance();
806 <        assertEquals(result.size(), 0);
806 >        assertEquals(0, result.size());
807          assertFalse(result.keySet().iterator().hasNext());
808          return result;
809      }
# Line 832 | Line 835 | public class TreeMapTest extends JSR166T
835          // Add entries till we're back to original size
836          while (map.size() < size) {
837              int key = min + rnd.nextInt(rangeSize);
838 <            assertTrue(key >= min && key<= max);
838 >            assertTrue(key >= min && key <= max);
839              put(map, key);
840          }
841      }
# Line 857 | Line 860 | public class TreeMapTest extends JSR166T
860          // Add entries till we're back to original size
861          while (map.size() < size) {
862              int key = min - 5 + rnd.nextInt(rangeSize + 10);
863 <            if (key >= min && key<= max) {
863 >            if (key >= min && key <= max) {
864                  put(map, key);
865              } else {
866                  try {
# Line 961 | Line 964 | public class TreeMapTest extends JSR166T
964       */
965      void check(NavigableMap<Integer, Integer> map,
966                        final int min, final int max, final boolean ascending) {
967 <       class ReferenceSet {
967 >        class ReferenceSet {
968              int lower(int key) {
969                  return ascending ? lowerAscending(key) : higherAscending(key);
970              }
# Line 1027 | Line 1030 | public class TreeMapTest extends JSR166T
1030              if (bsContainsI)
1031                  size++;
1032          }
1033 <        assertEquals(map.size(), size);
1033 >        assertEquals(size, map.size());
1034  
1035          // Test contents using contains keySet iterator
1036          int size2 = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines