--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java 2009/11/16 05:30:07 1.8 +++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java 2009/11/21 17:38:05 1.11 @@ -11,25 +11,25 @@ import java.io.*; public class ConcurrentSkipListSubMapTest 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(ConcurrentSkipListSubMapTest.class); + return new TestSuite(ConcurrentSkipListSubMapTest.class); } /** * Create a map from Integers 1-5 to Strings "A"-"E". */ private static ConcurrentNavigableMap map5() { - ConcurrentSkipListMap map = new ConcurrentSkipListMap(); + ConcurrentSkipListMap map = new ConcurrentSkipListMap(); assertTrue(map.isEmpty()); - map.put(zero, "Z"); - map.put(one, "A"); - map.put(five, "E"); - map.put(three, "C"); - map.put(two, "B"); - map.put(four, "D"); - map.put(seven, "F"); + map.put(zero, "Z"); + map.put(one, "A"); + map.put(five, "E"); + map.put(three, "C"); + map.put(two, "B"); + map.put(four, "D"); + map.put(seven, "F"); assertFalse(map.isEmpty()); assertEquals(7, map.size()); return map.subMap(one, true, seven, false); @@ -39,26 +39,26 @@ public class ConcurrentSkipListSubMapTes * Create a map from Integers -5 to -1 to Strings "A"-"E". */ private static ConcurrentNavigableMap dmap5() { - ConcurrentSkipListMap map = new ConcurrentSkipListMap(); + ConcurrentSkipListMap map = new ConcurrentSkipListMap(); assertTrue(map.isEmpty()); - map.put(m1, "A"); - map.put(m5, "E"); - map.put(m3, "C"); - map.put(m2, "B"); - map.put(m4, "D"); + map.put(m1, "A"); + map.put(m5, "E"); + map.put(m3, "C"); + map.put(m2, "B"); + map.put(m4, "D"); assertFalse(map.isEmpty()); assertEquals(5, map.size()); - return map.descendingMap(); + return map.descendingMap(); } private static ConcurrentNavigableMap map0() { - ConcurrentSkipListMap map = new ConcurrentSkipListMap(); + ConcurrentSkipListMap map = new ConcurrentSkipListMap(); assertTrue(map.isEmpty()); return map.tailMap(one, true); } private static ConcurrentNavigableMap dmap0() { - ConcurrentSkipListMap map = new ConcurrentSkipListMap(); + ConcurrentSkipListMap map = new ConcurrentSkipListMap(); assertTrue(map.isEmpty()); return map; } @@ -68,8 +68,8 @@ public class ConcurrentSkipListSubMapTes */ public void testClear() { ConcurrentNavigableMap map = map5(); - map.clear(); - assertEquals(map.size(), 0); + map.clear(); + assertEquals(map.size(), 0); } @@ -81,7 +81,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap map2 = map5(); assertEquals(map1, map2); assertEquals(map2, map1); - map1.clear(); + map1.clear(); assertFalse(map1.equals(map2)); assertFalse(map2.equals(map1)); } @@ -91,7 +91,7 @@ public class ConcurrentSkipListSubMapTes */ public void testContainsKey() { ConcurrentNavigableMap map = map5(); - assertTrue(map.containsKey(one)); + assertTrue(map.containsKey(one)); assertFalse(map.containsKey(zero)); } @@ -100,7 +100,7 @@ public class ConcurrentSkipListSubMapTes */ public void testContainsValue() { ConcurrentNavigableMap map = map5(); - assertTrue(map.containsValue("A")); + assertTrue(map.containsValue("A")); assertFalse(map.containsValue("Z")); } @@ -110,7 +110,7 @@ public class ConcurrentSkipListSubMapTes */ public void testGet() { ConcurrentNavigableMap map = map5(); - assertEquals("A", (String)map.get(one)); + assertEquals("A", (String)map.get(one)); ConcurrentNavigableMap empty = map0(); assertNull(empty.get(one)); } @@ -121,7 +121,7 @@ public class ConcurrentSkipListSubMapTes public void testIsEmpty() { ConcurrentNavigableMap empty = map0(); ConcurrentNavigableMap map = map5(); - assertTrue(empty.isEmpty()); + assertTrue(empty.isEmpty()); assertFalse(map.isEmpty()); } @@ -130,7 +130,7 @@ public class ConcurrentSkipListSubMapTes */ public void testFirstKey() { ConcurrentNavigableMap map = map5(); - assertEquals(one, map.firstKey()); + assertEquals(one, map.firstKey()); } /** @@ -138,7 +138,7 @@ public class ConcurrentSkipListSubMapTes */ public void testLastKey() { ConcurrentNavigableMap map = map5(); - assertEquals(five, map.lastKey()); + assertEquals(five, map.lastKey()); } @@ -147,13 +147,13 @@ public class ConcurrentSkipListSubMapTes */ public void testKeySet() { ConcurrentNavigableMap 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)); } /** @@ -161,7 +161,7 @@ public class ConcurrentSkipListSubMapTes */ public void testKeySetOrder() { ConcurrentNavigableMap map = map5(); - Set s = map.keySet(); + Set s = map.keySet(); Iterator i = s.iterator(); Integer last = (Integer)i.next(); assertEquals(last, one); @@ -177,13 +177,13 @@ public class ConcurrentSkipListSubMapTes */ public void testValues() { ConcurrentNavigableMap 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")); } /** @@ -191,10 +191,10 @@ public class ConcurrentSkipListSubMapTes */ public void testKeySetToArray() { ConcurrentNavigableMap 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))); } @@ -204,9 +204,9 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingKeySetToArray() { ConcurrentNavigableMap 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))); @@ -217,15 +217,15 @@ public class ConcurrentSkipListSubMapTes */ public void testValuesToArray() { ConcurrentNavigableMap map = map5(); - Collection v = map.values(); + Collection v = map.values(); Object[] ar = v.toArray(); ArrayList s = new ArrayList(Arrays.asList(ar)); - assertEquals(5, ar.length); - assertTrue(s.contains("A")); - assertTrue(s.contains("B")); - assertTrue(s.contains("C")); - assertTrue(s.contains("D")); - assertTrue(s.contains("E")); + assertEquals(5, ar.length); + assertTrue(s.contains("A")); + assertTrue(s.contains("B")); + assertTrue(s.contains("C")); + assertTrue(s.contains("D")); + assertTrue(s.contains("E")); } @@ -234,8 +234,8 @@ public class ConcurrentSkipListSubMapTes */ public void testEntrySet() { ConcurrentNavigableMap 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(); @@ -254,13 +254,13 @@ public class ConcurrentSkipListSubMapTes public void testPutAll() { ConcurrentNavigableMap empty = map0(); ConcurrentNavigableMap 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)); } /** @@ -268,7 +268,7 @@ public class ConcurrentSkipListSubMapTes */ public void testPutIfAbsent() { ConcurrentNavigableMap map = map5(); - map.putIfAbsent(six, "Z"); + map.putIfAbsent(six, "Z"); assertTrue(map.containsKey(six)); } @@ -285,7 +285,7 @@ public class ConcurrentSkipListSubMapTes */ public void testReplace() { ConcurrentNavigableMap map = map5(); - assertNull(map.replace(six, "Z")); + assertNull(map.replace(six, "Z")); assertFalse(map.containsKey(six)); } @@ -305,7 +305,7 @@ public class ConcurrentSkipListSubMapTes public void testReplaceValue() { ConcurrentNavigableMap map = map5(); assertEquals("A", map.get(one)); - assertFalse(map.replace(one, "Z", "Z")); + assertFalse(map.replace(one, "Z", "Z")); assertEquals("A", map.get(one)); } @@ -315,7 +315,7 @@ public class ConcurrentSkipListSubMapTes public void testReplaceValue2() { ConcurrentNavigableMap map = map5(); assertEquals("A", map.get(one)); - assertTrue(map.replace(one, "A", "Z")); + assertTrue(map.replace(one, "A", "Z")); assertEquals("Z", map.get(one)); } @@ -325,9 +325,9 @@ public class ConcurrentSkipListSubMapTes */ public void testRemove() { ConcurrentNavigableMap map = map5(); - map.remove(five); - assertEquals(4, map.size()); - assertFalse(map.containsKey(five)); + map.remove(five); + assertEquals(4, map.size()); + assertFalse(map.containsKey(five)); } /** @@ -335,14 +335,14 @@ public class ConcurrentSkipListSubMapTes */ public void testRemove2() { ConcurrentNavigableMap map = map5(); - assertTrue(map.containsKey(five)); + assertTrue(map.containsKey(five)); assertEquals("E", map.get(five)); - map.remove(five, "E"); - assertEquals(4, map.size()); - assertFalse(map.containsKey(five)); - map.remove(four, "A"); - assertEquals(4, map.size()); - assertTrue(map.containsKey(four)); + map.remove(five, "E"); + assertEquals(4, map.size()); + assertFalse(map.containsKey(five)); + map.remove(four, "A"); + assertEquals(4, map.size()); + assertTrue(map.containsKey(four)); } @@ -444,8 +444,7 @@ public class ConcurrentSkipListSubMapTes try { e.setValue("A"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollFirstEntry(); assertNull(e); } @@ -472,8 +471,7 @@ public class ConcurrentSkipListSubMapTes try { e.setValue("E"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollLastEntry(); assertNull(e); } @@ -484,8 +482,8 @@ public class ConcurrentSkipListSubMapTes public void testSize() { ConcurrentNavigableMap map = map5(); ConcurrentNavigableMap empty = map0(); - assertEquals(0, empty.size()); - assertEquals(5, map.size()); + assertEquals(0, empty.size()); + assertEquals(5, map.size()); } /** @@ -509,7 +507,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.get(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -520,7 +518,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.containsKey(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -531,7 +529,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map0(); c.containsValue(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } @@ -543,7 +541,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.put(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -554,7 +552,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.putIfAbsent(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -565,7 +563,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.replace(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -576,7 +574,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.replace(null, one, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -587,7 +585,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.remove(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -598,31 +596,26 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = map5(); c.remove(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** * A deserialized map equals original */ - public void testSerialization() { + public void testSerialization() throws Exception { ConcurrentNavigableMap 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)); - ConcurrentNavigableMap r = (ConcurrentNavigableMap)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)); + ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject(); + assertEquals(q.size(), r.size()); + assertTrue(q.equals(r)); + assertTrue(r.equals(q)); } @@ -767,8 +760,8 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingClear() { ConcurrentNavigableMap map = dmap5(); - map.clear(); - assertEquals(map.size(), 0); + map.clear(); + assertEquals(map.size(), 0); } @@ -780,7 +773,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap map2 = dmap5(); assertEquals(map1, map2); assertEquals(map2, map1); - map1.clear(); + map1.clear(); assertFalse(map1.equals(map2)); assertFalse(map2.equals(map1)); } @@ -790,7 +783,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingContainsKey() { ConcurrentNavigableMap map = dmap5(); - assertTrue(map.containsKey(m1)); + assertTrue(map.containsKey(m1)); assertFalse(map.containsKey(zero)); } @@ -799,7 +792,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingContainsValue() { ConcurrentNavigableMap map = dmap5(); - assertTrue(map.containsValue("A")); + assertTrue(map.containsValue("A")); assertFalse(map.containsValue("Z")); } @@ -809,7 +802,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingGet() { ConcurrentNavigableMap map = dmap5(); - assertEquals("A", (String)map.get(m1)); + assertEquals("A", (String)map.get(m1)); ConcurrentNavigableMap empty = dmap0(); assertNull(empty.get(m1)); } @@ -820,7 +813,7 @@ public class ConcurrentSkipListSubMapTes public void testDescendingIsEmpty() { ConcurrentNavigableMap empty = dmap0(); ConcurrentNavigableMap map = dmap5(); - assertTrue(empty.isEmpty()); + assertTrue(empty.isEmpty()); assertFalse(map.isEmpty()); } @@ -829,7 +822,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingFirstKey() { ConcurrentNavigableMap map = dmap5(); - assertEquals(m1, map.firstKey()); + assertEquals(m1, map.firstKey()); } /** @@ -837,7 +830,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingLastKey() { ConcurrentNavigableMap map = dmap5(); - assertEquals(m5, map.lastKey()); + assertEquals(m5, map.lastKey()); } @@ -846,13 +839,13 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingKeySet() { ConcurrentNavigableMap map = dmap5(); - Set s = map.keySet(); - assertEquals(5, s.size()); - assertTrue(s.contains(m1)); - assertTrue(s.contains(m2)); - assertTrue(s.contains(m3)); - assertTrue(s.contains(m4)); - assertTrue(s.contains(m5)); + Set s = map.keySet(); + assertEquals(5, s.size()); + assertTrue(s.contains(m1)); + assertTrue(s.contains(m2)); + assertTrue(s.contains(m3)); + assertTrue(s.contains(m4)); + assertTrue(s.contains(m5)); } /** @@ -860,7 +853,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingKeySetOrder() { ConcurrentNavigableMap map = dmap5(); - Set s = map.keySet(); + Set s = map.keySet(); Iterator i = s.iterator(); Integer last = (Integer)i.next(); assertEquals(last, m1); @@ -876,13 +869,13 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingValues() { ConcurrentNavigableMap map = dmap5(); - 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")); } /** @@ -890,10 +883,10 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingAscendingKeySetToArray() { ConcurrentNavigableMap map = dmap5(); - 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))); } @@ -903,9 +896,9 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingDescendingKeySetToArray() { ConcurrentNavigableMap map = dmap5(); - 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))); @@ -916,15 +909,15 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingValuesToArray() { ConcurrentNavigableMap map = dmap5(); - Collection v = map.values(); + Collection v = map.values(); Object[] ar = v.toArray(); ArrayList s = new ArrayList(Arrays.asList(ar)); - assertEquals(5, ar.length); - assertTrue(s.contains("A")); - assertTrue(s.contains("B")); - assertTrue(s.contains("C")); - assertTrue(s.contains("D")); - assertTrue(s.contains("E")); + assertEquals(5, ar.length); + assertTrue(s.contains("A")); + assertTrue(s.contains("B")); + assertTrue(s.contains("C")); + assertTrue(s.contains("D")); + assertTrue(s.contains("E")); } @@ -933,8 +926,8 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingEntrySet() { ConcurrentNavigableMap map = dmap5(); - 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(); @@ -953,13 +946,13 @@ public class ConcurrentSkipListSubMapTes public void testDescendingPutAll() { ConcurrentNavigableMap empty = dmap0(); ConcurrentNavigableMap map = dmap5(); - empty.putAll(map); - assertEquals(5, empty.size()); - assertTrue(empty.containsKey(m1)); - assertTrue(empty.containsKey(m2)); - assertTrue(empty.containsKey(m3)); - assertTrue(empty.containsKey(m4)); - assertTrue(empty.containsKey(m5)); + empty.putAll(map); + assertEquals(5, empty.size()); + assertTrue(empty.containsKey(m1)); + assertTrue(empty.containsKey(m2)); + assertTrue(empty.containsKey(m3)); + assertTrue(empty.containsKey(m4)); + assertTrue(empty.containsKey(m5)); } /** @@ -967,7 +960,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingPutIfAbsent() { ConcurrentNavigableMap map = dmap5(); - map.putIfAbsent(six, "Z"); + map.putIfAbsent(six, "Z"); assertTrue(map.containsKey(six)); } @@ -984,7 +977,7 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingReplace() { ConcurrentNavigableMap map = dmap5(); - assertNull(map.replace(six, "Z")); + assertNull(map.replace(six, "Z")); assertFalse(map.containsKey(six)); } @@ -1004,7 +997,7 @@ public class ConcurrentSkipListSubMapTes public void testDescendingReplaceValue() { ConcurrentNavigableMap map = dmap5(); assertEquals("A", map.get(m1)); - assertFalse(map.replace(m1, "Z", "Z")); + assertFalse(map.replace(m1, "Z", "Z")); assertEquals("A", map.get(m1)); } @@ -1014,7 +1007,7 @@ public class ConcurrentSkipListSubMapTes public void testDescendingReplaceValue2() { ConcurrentNavigableMap map = dmap5(); assertEquals("A", map.get(m1)); - assertTrue(map.replace(m1, "A", "Z")); + assertTrue(map.replace(m1, "A", "Z")); assertEquals("Z", map.get(m1)); } @@ -1024,9 +1017,9 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingRemove() { ConcurrentNavigableMap map = dmap5(); - map.remove(m5); - assertEquals(4, map.size()); - assertFalse(map.containsKey(m5)); + map.remove(m5); + assertEquals(4, map.size()); + assertFalse(map.containsKey(m5)); } /** @@ -1034,14 +1027,14 @@ public class ConcurrentSkipListSubMapTes */ public void testDescendingRemove2() { ConcurrentNavigableMap map = dmap5(); - assertTrue(map.containsKey(m5)); + assertTrue(map.containsKey(m5)); assertEquals("E", map.get(m5)); - map.remove(m5, "E"); - assertEquals(4, map.size()); - assertFalse(map.containsKey(m5)); - map.remove(m4, "A"); - assertEquals(4, map.size()); - assertTrue(map.containsKey(m4)); + map.remove(m5, "E"); + assertEquals(4, map.size()); + assertFalse(map.containsKey(m5)); + map.remove(m4, "A"); + assertEquals(4, map.size()); + assertTrue(map.containsKey(m4)); } @@ -1143,8 +1136,7 @@ public class ConcurrentSkipListSubMapTes try { e.setValue("A"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollFirstEntry(); assertNull(e); } @@ -1171,8 +1163,7 @@ public class ConcurrentSkipListSubMapTes try { e.setValue("E"); shouldThrow(); - } catch (Exception ok) { - } + } catch (UnsupportedOperationException success) {} e = map.pollLastEntry(); assertNull(e); } @@ -1183,8 +1174,8 @@ public class ConcurrentSkipListSubMapTes public void testDescendingSize() { ConcurrentNavigableMap map = dmap5(); ConcurrentNavigableMap empty = dmap0(); - assertEquals(0, empty.size()); - assertEquals(5, map.size()); + assertEquals(0, empty.size()); + assertEquals(5, map.size()); } /** @@ -1208,7 +1199,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.get(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1219,7 +1210,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.containsKey(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1230,7 +1221,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap0(); c.containsValue(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } @@ -1242,7 +1233,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.put(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1253,7 +1244,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.putIfAbsent(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1264,7 +1255,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.replace(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1275,7 +1266,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.replace(null, m1, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1286,7 +1277,7 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.remove(null); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** @@ -1297,35 +1288,29 @@ public class ConcurrentSkipListSubMapTes ConcurrentNavigableMap c = dmap5(); c.remove(null, "whatever"); shouldThrow(); - } catch (NullPointerException e) {} + } catch (NullPointerException success) {} } /** * A deserialized map equals original */ - public void testDescendingSerialization() { + public void testDescendingSerialization() throws Exception { ConcurrentNavigableMap q = dmap5(); - 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)); - ConcurrentNavigableMap r = (ConcurrentNavigableMap)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)); + ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject(); + assertEquals(q.size(), r.size()); + assertTrue(q.equals(r)); + assertTrue(r.equals(q)); } - /** * subMap returns map with keys in requested range */