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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java (file contents):
Revision 1.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.11 by jsr166, Sat Nov 21 17:38:05 2009 UTC

# Line 444 | Line 444 | public class ConcurrentSkipListSubMapTes
444          try {
445              e.setValue("A");
446              shouldThrow();
447 <        } catch (Exception ok) {
448 <        }
447 >        } catch (UnsupportedOperationException success) {}
448          e = map.pollFirstEntry();
449          assertNull(e);
450      }
# Line 472 | Line 471 | public class ConcurrentSkipListSubMapTes
471          try {
472              e.setValue("E");
473              shouldThrow();
474 <        } catch (Exception ok) {
476 <        }
474 >        } catch (UnsupportedOperationException success) {}
475          e = map.pollLastEntry();
476          assertNull(e);
477      }
# Line 509 | Line 507 | public class ConcurrentSkipListSubMapTes
507              ConcurrentNavigableMap c = map5();
508              c.get(null);
509              shouldThrow();
510 <        } catch (NullPointerException e) {}
510 >        } catch (NullPointerException success) {}
511      }
512  
513      /**
# Line 520 | Line 518 | public class ConcurrentSkipListSubMapTes
518              ConcurrentNavigableMap c = map5();
519              c.containsKey(null);
520              shouldThrow();
521 <        } catch (NullPointerException e) {}
521 >        } catch (NullPointerException success) {}
522      }
523  
524      /**
# Line 531 | Line 529 | public class ConcurrentSkipListSubMapTes
529              ConcurrentNavigableMap c = map0();
530              c.containsValue(null);
531              shouldThrow();
532 <        } catch (NullPointerException e) {}
532 >        } catch (NullPointerException success) {}
533      }
534  
535  
# Line 543 | Line 541 | public class ConcurrentSkipListSubMapTes
541              ConcurrentNavigableMap c = map5();
542              c.put(null, "whatever");
543              shouldThrow();
544 <        } catch (NullPointerException e) {}
544 >        } catch (NullPointerException success) {}
545      }
546  
547      /**
# Line 554 | Line 552 | public class ConcurrentSkipListSubMapTes
552              ConcurrentNavigableMap c = map5();
553              c.putIfAbsent(null, "whatever");
554              shouldThrow();
555 <        } catch (NullPointerException e) {}
555 >        } catch (NullPointerException success) {}
556      }
557  
558      /**
# Line 565 | Line 563 | public class ConcurrentSkipListSubMapTes
563              ConcurrentNavigableMap c = map5();
564              c.replace(null, "whatever");
565              shouldThrow();
566 <        } catch (NullPointerException e) {}
566 >        } catch (NullPointerException success) {}
567      }
568  
569      /**
# Line 576 | Line 574 | public class ConcurrentSkipListSubMapTes
574              ConcurrentNavigableMap c = map5();
575              c.replace(null, one, "whatever");
576              shouldThrow();
577 <        } catch (NullPointerException e) {}
577 >        } catch (NullPointerException success) {}
578      }
579  
580      /**
# Line 587 | Line 585 | public class ConcurrentSkipListSubMapTes
585              ConcurrentNavigableMap c = map5();
586              c.remove(null);
587              shouldThrow();
588 <        } catch (NullPointerException e) {}
588 >        } catch (NullPointerException success) {}
589      }
590  
591      /**
# Line 598 | Line 596 | public class ConcurrentSkipListSubMapTes
596              ConcurrentNavigableMap c = map5();
597              c.remove(null, "whatever");
598              shouldThrow();
599 <        } catch (NullPointerException e) {}
599 >        } catch (NullPointerException success) {}
600      }
601  
602      /**
# Line 1138 | Line 1136 | public class ConcurrentSkipListSubMapTes
1136          try {
1137              e.setValue("A");
1138              shouldThrow();
1139 <        } catch (Exception ok) {
1142 <        }
1139 >        } catch (UnsupportedOperationException success) {}
1140          e = map.pollFirstEntry();
1141          assertNull(e);
1142      }
# Line 1166 | Line 1163 | public class ConcurrentSkipListSubMapTes
1163          try {
1164              e.setValue("E");
1165              shouldThrow();
1166 <        } catch (Exception ok) {
1170 <        }
1166 >        } catch (UnsupportedOperationException success) {}
1167          e = map.pollLastEntry();
1168          assertNull(e);
1169      }
# Line 1203 | Line 1199 | public class ConcurrentSkipListSubMapTes
1199              ConcurrentNavigableMap c = dmap5();
1200              c.get(null);
1201              shouldThrow();
1202 <        } catch (NullPointerException e) {}
1202 >        } catch (NullPointerException success) {}
1203      }
1204  
1205      /**
# Line 1214 | Line 1210 | public class ConcurrentSkipListSubMapTes
1210              ConcurrentNavigableMap c = dmap5();
1211              c.containsKey(null);
1212              shouldThrow();
1213 <        } catch (NullPointerException e) {}
1213 >        } catch (NullPointerException success) {}
1214      }
1215  
1216      /**
# Line 1225 | Line 1221 | public class ConcurrentSkipListSubMapTes
1221              ConcurrentNavigableMap c = dmap0();
1222              c.containsValue(null);
1223              shouldThrow();
1224 <        } catch (NullPointerException e) {}
1224 >        } catch (NullPointerException success) {}
1225      }
1226  
1227  
# Line 1237 | Line 1233 | public class ConcurrentSkipListSubMapTes
1233              ConcurrentNavigableMap c = dmap5();
1234              c.put(null, "whatever");
1235              shouldThrow();
1236 <        } catch (NullPointerException e) {}
1236 >        } catch (NullPointerException success) {}
1237      }
1238  
1239      /**
# Line 1248 | Line 1244 | public class ConcurrentSkipListSubMapTes
1244              ConcurrentNavigableMap c = dmap5();
1245              c.putIfAbsent(null, "whatever");
1246              shouldThrow();
1247 <        } catch (NullPointerException e) {}
1247 >        } catch (NullPointerException success) {}
1248      }
1249  
1250      /**
# Line 1259 | Line 1255 | public class ConcurrentSkipListSubMapTes
1255              ConcurrentNavigableMap c = dmap5();
1256              c.replace(null, "whatever");
1257              shouldThrow();
1258 <        } catch (NullPointerException e) {}
1258 >        } catch (NullPointerException success) {}
1259      }
1260  
1261      /**
# Line 1270 | Line 1266 | public class ConcurrentSkipListSubMapTes
1266              ConcurrentNavigableMap c = dmap5();
1267              c.replace(null, m1, "whatever");
1268              shouldThrow();
1269 <        } catch (NullPointerException e) {}
1269 >        } catch (NullPointerException success) {}
1270      }
1271  
1272      /**
# Line 1281 | Line 1277 | public class ConcurrentSkipListSubMapTes
1277              ConcurrentNavigableMap c = dmap5();
1278              c.remove(null);
1279              shouldThrow();
1280 <        } catch (NullPointerException e) {}
1280 >        } catch (NullPointerException success) {}
1281      }
1282  
1283      /**
# Line 1292 | Line 1288 | public class ConcurrentSkipListSubMapTes
1288              ConcurrentNavigableMap c = dmap5();
1289              c.remove(null, "whatever");
1290              shouldThrow();
1291 <        } catch (NullPointerException e) {}
1291 >        } catch (NullPointerException success) {}
1292      }
1293  
1294      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines