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.21 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.28 by jsr166, Wed Dec 31 19:05:43 2014 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
8 < import java.util.*;
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 16 | 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 37 | Line 49 | public class TreeMapTest extends JSR166T
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 173 | 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 192 | Line 204 | public class TreeMapTest extends JSR166T
204              last = k;
205              ++count;
206          }
207 <        assertEquals(count ,5);
207 >        assertEquals(5, count);
208      }
209  
210      /**
# Line 211 | Line 223 | public class TreeMapTest extends JSR166T
223              last = k;
224              ++count;
225          }
226 <        assertEquals(count, 5);
226 >        assertEquals(5, count);
227      }
228  
229      /**
# Line 230 | 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 600 | Line 612 | public class TreeMapTest extends JSR166T
612          NavigableMap x = map5();
613          NavigableMap y = serialClone(x);
614  
615 <        assertTrue(x != y);
615 >        assertNotSame(x, y);
616          assertEquals(x.size(), y.size());
617          assertEquals(x.toString(), y.toString());
618          assertEquals(x, y);
# Line 791 | 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 1018 | 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