246 |
|
|
247 |
|
Map.Entry e4 = map.lowerEntry(zero); |
248 |
|
assertNull(e4); |
249 |
– |
|
249 |
|
} |
250 |
|
|
251 |
|
/** |
264 |
|
|
265 |
|
Map.Entry e4 = map.higherEntry(six); |
266 |
|
assertNull(e4); |
268 |
– |
|
267 |
|
} |
268 |
|
|
269 |
|
/** |
282 |
|
|
283 |
|
Map.Entry e4 = map.floorEntry(zero); |
284 |
|
assertNull(e4); |
287 |
– |
|
285 |
|
} |
286 |
|
|
287 |
|
/** |
300 |
|
|
301 |
|
Map.Entry e4 = map.ceilingEntry(six); |
302 |
|
assertNull(e4); |
306 |
– |
|
303 |
|
} |
304 |
|
|
305 |
|
/** |
324 |
|
try { |
325 |
|
e.setValue("A"); |
326 |
|
shouldThrow(); |
327 |
< |
} catch (Exception ok) { |
332 |
< |
} |
327 |
> |
} catch (UnsupportedOperationException success) {} |
328 |
|
assertTrue(map.isEmpty()); |
329 |
|
Map.Entry f = map.firstEntry(); |
330 |
|
assertNull(f); |
354 |
|
try { |
355 |
|
e.setValue("E"); |
356 |
|
shouldThrow(); |
357 |
< |
} catch (Exception ok) { |
363 |
< |
} |
357 |
> |
} catch (UnsupportedOperationException success) {} |
358 |
|
e = map.pollLastEntry(); |
359 |
|
assertNull(e); |
360 |
|
} |
390 |
|
NavigableMap c = map5(); |
391 |
|
c.get(null); |
392 |
|
shouldThrow(); |
393 |
< |
} catch (NullPointerException e) {} |
393 |
> |
} catch (NullPointerException success) {} |
394 |
|
} |
395 |
|
|
396 |
|
/** |
401 |
|
NavigableMap c = map5(); |
402 |
|
c.containsKey(null); |
403 |
|
shouldThrow(); |
404 |
< |
} catch (NullPointerException e) {} |
404 |
> |
} catch (NullPointerException success) {} |
405 |
|
} |
406 |
|
|
407 |
|
/** |
412 |
|
NavigableMap c = map5(); |
413 |
|
c.put(null, "whatever"); |
414 |
|
shouldThrow(); |
415 |
< |
} catch (NullPointerException e) {} |
415 |
> |
} catch (NullPointerException success) {} |
416 |
|
} |
417 |
|
|
418 |
|
/** |
423 |
|
NavigableMap c = map5(); |
424 |
|
c.remove(null); |
425 |
|
shouldThrow(); |
426 |
< |
} catch (NullPointerException e) {} |
426 |
> |
} catch (NullPointerException success) {} |
427 |
|
} |
428 |
|
|
429 |
|
/** |
477 |
|
assertEquals(1, sm.size()); |
478 |
|
assertEquals(three, sm.firstKey()); |
479 |
|
assertEquals(three, sm.lastKey()); |
480 |
< |
assertTrue(sm.remove(three) != null); |
480 |
> |
assertEquals("C", sm.remove(three)); |
481 |
|
assertTrue(sm.isEmpty()); |
482 |
|
assertEquals(3, map.size()); |
483 |
|
} |
505 |
|
assertEquals(4, map.size()); |
506 |
|
assertEquals(0, sm.size()); |
507 |
|
assertTrue(sm.isEmpty()); |
508 |
< |
assertTrue(sm.remove(three) == null); |
508 |
> |
assertSame(sm.remove(three), null); |
509 |
|
assertEquals(4, map.size()); |
510 |
|
} |
511 |
|
|
577 |
|
SortedMap ssm = sm.tailMap(four); |
578 |
|
assertEquals(four, ssm.firstKey()); |
579 |
|
assertEquals(five, ssm.lastKey()); |
580 |
< |
assertTrue(ssm.remove(four) != null); |
580 |
> |
assertEquals("D", ssm.remove(four)); |
581 |
|
assertEquals(1, ssm.size()); |
582 |
|
assertEquals(3, sm.size()); |
583 |
|
assertEquals(4, map.size()); |
810 |
|
|
811 |
|
Map.Entry e4 = map.lowerEntry(zero); |
812 |
|
assertNull(e4); |
819 |
– |
|
813 |
|
} |
814 |
|
|
815 |
|
/** |
828 |
|
|
829 |
|
Map.Entry e4 = map.higherEntry(m6); |
830 |
|
assertNull(e4); |
838 |
– |
|
831 |
|
} |
832 |
|
|
833 |
|
/** |
846 |
|
|
847 |
|
Map.Entry e4 = map.floorEntry(zero); |
848 |
|
assertNull(e4); |
857 |
– |
|
849 |
|
} |
850 |
|
|
851 |
|
/** |
864 |
|
|
865 |
|
Map.Entry e4 = map.ceilingEntry(m6); |
866 |
|
assertNull(e4); |
876 |
– |
|
867 |
|
} |
868 |
|
|
869 |
|
/** |
888 |
|
try { |
889 |
|
e.setValue("A"); |
890 |
|
shouldThrow(); |
891 |
< |
} catch (Exception ok) { |
902 |
< |
} |
891 |
> |
} catch (UnsupportedOperationException success) {} |
892 |
|
e = map.pollFirstEntry(); |
893 |
|
assertNull(e); |
894 |
|
} |
915 |
|
try { |
916 |
|
e.setValue("E"); |
917 |
|
shouldThrow(); |
918 |
< |
} catch (Exception ok) { |
930 |
< |
} |
918 |
> |
} catch (UnsupportedOperationException success) {} |
919 |
|
e = map.pollLastEntry(); |
920 |
|
assertNull(e); |
921 |
|
} |
951 |
|
NavigableMap c = dmap5(); |
952 |
|
c.get(null); |
953 |
|
shouldThrow(); |
954 |
< |
} catch (NullPointerException e) {} |
954 |
> |
} catch (NullPointerException success) {} |
955 |
|
} |
956 |
|
|
957 |
|
/** |
962 |
|
NavigableMap c = dmap5(); |
963 |
|
c.put(null, "whatever"); |
964 |
|
shouldThrow(); |
965 |
< |
} catch (NullPointerException e) {} |
965 |
> |
} catch (NullPointerException success) {} |
966 |
|
} |
967 |
|
|
968 |
|
/** |
1014 |
|
assertEquals(1, sm.size()); |
1015 |
|
assertEquals(m3, sm.firstKey()); |
1016 |
|
assertEquals(m3, sm.lastKey()); |
1017 |
< |
assertTrue(sm.remove(m3) != null); |
1017 |
> |
assertEquals("C", sm.remove(m3)); |
1018 |
|
assertTrue(sm.isEmpty()); |
1019 |
|
assertEquals(3, map.size()); |
1020 |
|
} |
1042 |
|
assertEquals(4, map.size()); |
1043 |
|
assertEquals(0, sm.size()); |
1044 |
|
assertTrue(sm.isEmpty()); |
1045 |
< |
assertTrue(sm.remove(m3) == null); |
1045 |
> |
assertSame(sm.remove(m3), null); |
1046 |
|
assertEquals(4, map.size()); |
1047 |
|
} |
1048 |
|
|
1114 |
|
SortedMap ssm = sm.tailMap(m4); |
1115 |
|
assertEquals(m4, ssm.firstKey()); |
1116 |
|
assertEquals(m5, ssm.lastKey()); |
1117 |
< |
assertTrue(ssm.remove(m4) != null); |
1117 |
> |
assertEquals("D", ssm.remove(m4)); |
1118 |
|
assertEquals(1, ssm.size()); |
1119 |
|
assertEquals(3, sm.size()); |
1120 |
|
assertEquals(4, map.size()); |