--- jsr166/src/test/tck/TreeMapTest.java 2008/04/19 18:45:18 1.5 +++ jsr166/src/test/tck/TreeMapTest.java 2009/12/01 06:03:49 1.12 @@ -11,26 +11,26 @@ import java.io.*; public class TreeMapTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { - return new TestSuite(TreeMapTest.class); + return new TestSuite(TreeMapTest.class); } /** * Create a map from Integers 1-5 to Strings "A"-"E". */ - private static TreeMap map5() { - TreeMap map = new TreeMap(); + private static TreeMap map5() { + TreeMap map = new TreeMap(); assertTrue(map.isEmpty()); - map.put(one, "A"); - map.put(five, "E"); - map.put(three, "C"); - map.put(two, "B"); - map.put(four, "D"); + map.put(one, "A"); + map.put(five, "E"); + map.put(three, "C"); + map.put(two, "B"); + map.put(four, "D"); assertFalse(map.isEmpty()); assertEquals(5, map.size()); - return map; + return map; } /** @@ -38,12 +38,12 @@ public class TreeMapTest extends JSR166T */ public void testClear() { TreeMap map = map5(); - map.clear(); - assertEquals(map.size(), 0); + map.clear(); + assertEquals(map.size(), 0); } /** - * + * */ public void testConstructFromSorted() { TreeMap map = map5(); @@ -59,7 +59,7 @@ public class TreeMapTest extends JSR166T TreeMap map2 = map5(); assertEquals(map1, map2); assertEquals(map2, map1); - map1.clear(); + map1.clear(); assertFalse(map1.equals(map2)); assertFalse(map2.equals(map1)); } @@ -69,7 +69,7 @@ public class TreeMapTest extends JSR166T */ public void testContainsKey() { TreeMap map = map5(); - assertTrue(map.containsKey(one)); + assertTrue(map.containsKey(one)); assertFalse(map.containsKey(zero)); } @@ -78,7 +78,7 @@ public class TreeMapTest extends JSR166T */ public void testContainsValue() { TreeMap map = map5(); - assertTrue(map.containsValue("A")); + assertTrue(map.containsValue("A")); assertFalse(map.containsValue("Z")); } @@ -88,7 +88,7 @@ public class TreeMapTest extends JSR166T */ public void testGet() { TreeMap map = map5(); - assertEquals("A", (String)map.get(one)); + assertEquals("A", (String)map.get(one)); TreeMap empty = new TreeMap(); assertNull(empty.get(one)); } @@ -99,7 +99,7 @@ public class TreeMapTest extends JSR166T public void testIsEmpty() { TreeMap empty = new TreeMap(); TreeMap map = map5(); - assertTrue(empty.isEmpty()); + assertTrue(empty.isEmpty()); assertFalse(map.isEmpty()); } @@ -108,7 +108,7 @@ public class TreeMapTest extends JSR166T */ public void testFirstKey() { TreeMap map = map5(); - assertEquals(one, map.firstKey()); + assertEquals(one, map.firstKey()); } /** @@ -116,7 +116,7 @@ public class TreeMapTest extends JSR166T */ public void testLastKey() { TreeMap map = map5(); - assertEquals(five, map.lastKey()); + assertEquals(five, map.lastKey()); } @@ -125,10 +125,10 @@ public class TreeMapTest extends JSR166T */ public void testKeySetToArray() { TreeMap map = map5(); - Set s = map.keySet(); + Set s = map.keySet(); Object[] ar = s.toArray(); assertTrue(s.containsAll(Arrays.asList(ar))); - assertEquals(5, ar.length); + assertEquals(5, ar.length); ar[0] = m10; assertFalse(s.containsAll(Arrays.asList(ar))); } @@ -138,9 +138,9 @@ public class TreeMapTest extends JSR166T */ public void testDescendingKeySetToArray() { TreeMap map = map5(); - Set s = map.descendingKeySet(); + Set s = map.descendingKeySet(); Object[] ar = s.toArray(); - assertEquals(5, ar.length); + assertEquals(5, ar.length); assertTrue(s.containsAll(Arrays.asList(ar))); ar[0] = m10; assertFalse(s.containsAll(Arrays.asList(ar))); @@ -151,13 +151,13 @@ public class TreeMapTest extends JSR166T */ public void testKeySet() { TreeMap map = map5(); - Set s = map.keySet(); - assertEquals(5, s.size()); - assertTrue(s.contains(one)); - assertTrue(s.contains(two)); - assertTrue(s.contains(three)); - assertTrue(s.contains(four)); - assertTrue(s.contains(five)); + Set s = map.keySet(); + assertEquals(5, s.size()); + assertTrue(s.contains(one)); + assertTrue(s.contains(two)); + assertTrue(s.contains(three)); + assertTrue(s.contains(four)); + assertTrue(s.contains(five)); } /** @@ -165,7 +165,7 @@ public class TreeMapTest extends JSR166T */ public void testKeySetOrder() { TreeMap map = map5(); - Set s = map.keySet(); + Set s = map.keySet(); Iterator i = s.iterator(); Integer last = (Integer)i.next(); assertEquals(last, one); @@ -184,7 +184,7 @@ public class TreeMapTest extends JSR166T */ public void testKeySetDescendingIteratorOrder() { TreeMap map = map5(); - NavigableSet s = map.navigableKeySet(); + NavigableSet s = map.navigableKeySet(); Iterator i = s.descendingIterator(); Integer last = (Integer)i.next(); assertEquals(last, five); @@ -203,7 +203,7 @@ public class TreeMapTest extends JSR166T */ public void testDescendingKeySetOrder() { TreeMap map = map5(); - Set s = map.descendingKeySet(); + Set s = map.descendingKeySet(); Iterator i = s.iterator(); Integer last = (Integer)i.next(); assertEquals(last, five); @@ -222,7 +222,7 @@ public class TreeMapTest extends JSR166T */ public void testDescendingKeySetDescendingIteratorOrder() { TreeMap map = map5(); - NavigableSet s = map.descendingKeySet(); + NavigableSet s = map.descendingKeySet(); Iterator i = s.descendingIterator(); Integer last = (Integer)i.next(); assertEquals(last, one); @@ -241,13 +241,13 @@ public class TreeMapTest extends JSR166T */ public void testValues() { TreeMap map = map5(); - Collection s = map.values(); - assertEquals(5, s.size()); - assertTrue(s.contains("A")); - assertTrue(s.contains("B")); - assertTrue(s.contains("C")); - assertTrue(s.contains("D")); - assertTrue(s.contains("E")); + Collection s = map.values(); + assertEquals(5, s.size()); + assertTrue(s.contains("A")); + assertTrue(s.contains("B")); + assertTrue(s.contains("C")); + assertTrue(s.contains("D")); + assertTrue(s.contains("E")); } /** @@ -255,12 +255,12 @@ public class TreeMapTest extends JSR166T */ public void testEntrySet() { TreeMap map = map5(); - Set s = map.entrySet(); - assertEquals(5, s.size()); + Set s = map.entrySet(); + assertEquals(5, s.size()); Iterator it = s.iterator(); while (it.hasNext()) { Map.Entry e = (Map.Entry) it.next(); - assertTrue( + assertTrue( (e.getKey().equals(one) && e.getValue().equals("A")) || (e.getKey().equals(two) && e.getValue().equals("B")) || (e.getKey().equals(three) && e.getValue().equals("C")) || @@ -274,12 +274,12 @@ public class TreeMapTest extends JSR166T */ public void testDescendingEntrySet() { TreeMap map = map5(); - Set s = map.descendingMap().entrySet(); - assertEquals(5, s.size()); + Set s = map.descendingMap().entrySet(); + assertEquals(5, s.size()); Iterator it = s.iterator(); while (it.hasNext()) { Map.Entry e = (Map.Entry) it.next(); - assertTrue( + assertTrue( (e.getKey().equals(one) && e.getValue().equals("A")) || (e.getKey().equals(two) && e.getValue().equals("B")) || (e.getKey().equals(three) && e.getValue().equals("C")) || @@ -293,7 +293,7 @@ public class TreeMapTest extends JSR166T */ public void testEntrySetToArray() { TreeMap map = map5(); - Set s = map.entrySet(); + Set s = map.entrySet(); Object[] ar = s.toArray(); assertEquals(5, ar.length); for (int i = 0; i < 5; ++i) { @@ -307,7 +307,7 @@ public class TreeMapTest extends JSR166T */ public void testDescendingEntrySetToArray() { TreeMap map = map5(); - Set s = map.descendingMap().entrySet(); + Set s = map.descendingMap().entrySet(); Object[] ar = s.toArray(); assertEquals(5, ar.length); for (int i = 0; i < 5; ++i) { @@ -322,13 +322,13 @@ public class TreeMapTest extends JSR166T public void testPutAll() { TreeMap empty = new TreeMap(); TreeMap map = map5(); - empty.putAll(map); - assertEquals(5, empty.size()); - assertTrue(empty.containsKey(one)); - assertTrue(empty.containsKey(two)); - assertTrue(empty.containsKey(three)); - assertTrue(empty.containsKey(four)); - assertTrue(empty.containsKey(five)); + empty.putAll(map); + assertEquals(5, empty.size()); + assertTrue(empty.containsKey(one)); + assertTrue(empty.containsKey(two)); + assertTrue(empty.containsKey(three)); + assertTrue(empty.containsKey(four)); + assertTrue(empty.containsKey(five)); } /** @@ -336,9 +336,9 @@ public class TreeMapTest extends JSR166T */ public void testRemove() { TreeMap map = map5(); - map.remove(five); - assertEquals(4, map.size()); - assertFalse(map.containsKey(five)); + map.remove(five); + assertEquals(4, map.size()); + assertFalse(map.containsKey(five)); } /** @@ -516,8 +516,7 @@ public class TreeMapTest extends JSR166T try { e.setValue("A"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollFirstEntry(); assertNull(e); } @@ -544,8 +543,7 @@ public class TreeMapTest extends JSR166T try { e.setValue("E"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollLastEntry(); assertNull(e); } @@ -556,8 +554,8 @@ public class TreeMapTest extends JSR166T public void testSize() { TreeMap map = map5(); TreeMap empty = new TreeMap(); - assertEquals(0, empty.size()); - assertEquals(5, map.size()); + assertEquals(0, empty.size()); + assertEquals(5, map.size()); } /** @@ -569,7 +567,7 @@ public class TreeMapTest extends JSR166T for (int i = 1; i <= 5; ++i) { assertTrue(s.indexOf(String.valueOf(i)) >= 0); } - } + } // Exception tests @@ -581,7 +579,7 @@ public class TreeMapTest extends JSR166T TreeMap c = map5(); c.get(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException success) {} } /** @@ -592,7 +590,7 @@ public class TreeMapTest extends JSR166T TreeMap c = map5(); c.containsKey(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException success) {} } /** @@ -604,31 +602,26 @@ public class TreeMapTest extends JSR166T c.put("sadsdf", "asdads"); c.remove(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException success) {} } /** * A deserialized map equals original */ - public void testSerialization() { + public void testSerialization() throws Exception { TreeMap q = map5(); - try { - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(q); - out.close(); - - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); - TreeMap r = (TreeMap)in.readObject(); - assertEquals(q.size(), r.size()); - assertTrue(q.equals(r)); - assertTrue(r.equals(q)); - } catch(Exception e){ - e.printStackTrace(); - unexpectedException(); - } + ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); + ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); + out.writeObject(q); + out.close(); + + ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); + ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); + TreeMap r = (TreeMap)in.readObject(); + assertEquals(q.size(), r.size()); + assertTrue(q.equals(r)); + assertTrue(r.equals(q)); } /** @@ -658,7 +651,7 @@ public class TreeMapTest extends JSR166T k = (Integer)(r.next()); assertEquals(two, k); assertFalse(r.hasNext()); - + Iterator j = sm.keySet().iterator(); j.next(); j.remove(); @@ -667,7 +660,7 @@ public class TreeMapTest extends JSR166T assertEquals(1, sm.size()); assertEquals(three, sm.firstKey()); assertEquals(three, sm.lastKey()); - assertTrue(sm.remove(three) != null); + assertEquals("C", sm.remove(three)); assertTrue(sm.isEmpty()); assertEquals(3, map.size()); } @@ -692,7 +685,7 @@ public class TreeMapTest extends JSR166T k = (Integer)(r.next()); assertEquals(two, k); assertFalse(r.hasNext()); - + Iterator j = sm.keySet().iterator(); j.next(); j.remove(); @@ -700,7 +693,7 @@ public class TreeMapTest extends JSR166T assertEquals(4, map.size()); assertEquals(0, sm.size()); assertTrue(sm.isEmpty()); - assertTrue(sm.remove(three) == null); + assertSame(sm.remove(three), null); assertEquals(4, map.size()); } @@ -782,7 +775,7 @@ public class TreeMapTest extends JSR166T NavigableMap ssm = sm.tailMap(four, true); assertEquals(four, ssm.firstKey()); assertEquals(five, ssm.lastKey()); - assertTrue(ssm.remove(four) != null); + assertEquals("D", ssm.remove(four)); assertEquals(1, ssm.size()); assertEquals(3, sm.size()); assertEquals(4, map.size()); @@ -794,9 +787,9 @@ public class TreeMapTest extends JSR166T /** * Submaps of submaps subdivide correctly */ - public void testRecursiveSubMaps() { - int mapSize = 1000; - Class cl = TreeMap.class; + public void testRecursiveSubMaps() throws Exception { + int mapSize = 1000; + Class cl = TreeMap.class; NavigableMap map = newMap(cl); bs = new BitSet(mapSize); @@ -812,13 +805,9 @@ public class TreeMapTest extends JSR166T 0, mapSize - 1, true); } - static NavigableMap newMap(Class cl) { - NavigableMap result = null; - try { - result = (NavigableMap) cl.newInstance(); - } catch(Exception e) { - fail(); - } + static NavigableMap newMap(Class cl) throws Exception { + NavigableMap result + = (NavigableMap) cl.newInstance(); assertEquals(result.size(), 0); assertFalse(result.keySet().iterator().hasNext()); return result; @@ -841,7 +830,7 @@ public class TreeMapTest extends JSR166T } // Remove a bunch of entries with iterator - for(Iterator it = map.keySet().iterator(); it.hasNext(); ) { + for (Iterator it = map.keySet().iterator(); it.hasNext(); ) { if (rnd.nextBoolean()) { bs.clear(it.next()); it.remove(); @@ -866,7 +855,7 @@ public class TreeMapTest extends JSR166T } // Remove a bunch of entries with iterator - for(Iterator it = map.keySet().iterator(); it.hasNext(); ) { + for (Iterator it = map.keySet().iterator(); it.hasNext(); ) { if (rnd.nextBoolean()) { bs.clear(it.next()); it.remove(); @@ -881,10 +870,8 @@ public class TreeMapTest extends JSR166T } else { try { map.put(key, 2 * key); - fail(); - } catch(IllegalArgumentException e) { - // expected - } + shouldThrow(); + } catch (IllegalArgumentException success) {} } } } @@ -1079,16 +1066,12 @@ public class TreeMapTest extends JSR166T assertEq(rs.last(), -1); try { map.firstKey(); - fail(); - } catch(NoSuchElementException e) { - // expected - } + shouldThrow(); + } catch (NoSuchElementException success) {} try { map.lastKey(); - fail(); - } catch(NoSuchElementException e) { - // expected - } + shouldThrow(); + } catch (NoSuchElementException success) {} } } @@ -1102,5 +1085,5 @@ public class TreeMapTest extends JSR166T static boolean eq(Integer i, int j) { return i == null ? j == -1 : i == j; } - + }