--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2009/11/02 20:28:31 1.9 +++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2009/11/16 04:57:10 1.10 @@ -517,25 +517,25 @@ public class ConcurrentSkipListMapTest e try { e.setValue("X"); fail(); - } catch(UnsupportedOperationException success) {} + } catch (UnsupportedOperationException success) {} e = map.higherEntry(zero); assertEquals(one, e.getKey()); try { e.setValue("X"); fail(); - } catch(UnsupportedOperationException success) {} + } catch (UnsupportedOperationException success) {} e = map.floorEntry(one); assertEquals(one, e.getKey()); try { e.setValue("X"); fail(); - } catch(UnsupportedOperationException success) {} + } catch (UnsupportedOperationException success) {} e = map.ceilingEntry(five); assertEquals(five, e.getKey()); try { e.setValue("X"); fail(); - } catch(UnsupportedOperationException success) {} + } catch (UnsupportedOperationException success) {} } @@ -703,7 +703,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.get(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -714,7 +714,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.containsKey(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -725,7 +725,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = new ConcurrentSkipListMap(); c.containsValue(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } @@ -737,7 +737,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.put(null, "whatever"); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -748,7 +748,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.putIfAbsent(null, "whatever"); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -759,7 +759,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.replace(null, "whatever"); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -770,7 +770,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = map5(); c.replace(null, one, "whatever"); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -782,7 +782,7 @@ public class ConcurrentSkipListMapTest e c.put("sadsdf", "asdads"); c.remove(null); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -794,7 +794,7 @@ public class ConcurrentSkipListMapTest e c.put("sadsdf", "asdads"); c.remove(null, "whatever"); shouldThrow(); - } catch(NullPointerException e){} + } catch (NullPointerException e){} } /** @@ -805,7 +805,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap c = new ConcurrentSkipListMap(); c.put("sadsdf", "asdads"); assertFalse(c.remove("sadsdf", null)); - } catch(NullPointerException e){ + } catch (NullPointerException e){ fail(); } } @@ -828,7 +828,7 @@ public class ConcurrentSkipListMapTest e assertEquals(q.size(), r.size()); assertTrue(q.equals(r)); assertTrue(r.equals(q)); - } catch(Exception e){ + } catch (Exception e){ e.printStackTrace(); unexpectedException(); } @@ -1021,7 +1021,7 @@ public class ConcurrentSkipListMapTest e NavigableMap result = null; try { result = (NavigableMap) cl.newInstance(); - } catch(Exception e) { + } catch (Exception e) { fail(); } assertEquals(result.size(), 0); @@ -1046,7 +1046,7 @@ public class ConcurrentSkipListMapTest e } // 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(); @@ -1071,7 +1071,7 @@ public class ConcurrentSkipListMapTest e } // 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(); @@ -1087,7 +1087,7 @@ public class ConcurrentSkipListMapTest e try { map.put(key, 2 * key); fail(); - } catch(IllegalArgumentException e) { + } catch (IllegalArgumentException e) { // expected } } @@ -1285,13 +1285,13 @@ public class ConcurrentSkipListMapTest e try { map.firstKey(); fail(); - } catch(NoSuchElementException e) { + } catch (NoSuchElementException e) { // expected } try { map.lastKey(); fail(); - } catch(NoSuchElementException e) { + } catch (NoSuchElementException e) { // expected } }