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

Comparing jsr166/src/test/tck/TreeMapTest.java (file contents):
Revision 1.11 by jsr166, Sat Nov 21 17:38:06 2009 UTC vs.
Revision 1.14 by jsr166, Wed Aug 25 00:07:03 2010 UTC

# Line 11 | Line 11 | import java.io.*;
11  
12   public class TreeMapTest extends JSR166TestCase {
13      public static void main(String[] args) {
14 <        junit.textui.TestRunner.run (suite());
14 >        junit.textui.TestRunner.run(suite());
15      }
16      public static Test suite() {
17          return new TestSuite(TreeMapTest.class);
# Line 357 | Line 357 | public class TreeMapTest extends JSR166T
357  
358          Map.Entry e4 = map.lowerEntry(zero);
359          assertNull(e4);
360
360      }
361  
362      /**
# Line 376 | Line 375 | public class TreeMapTest extends JSR166T
375  
376          Map.Entry e4 = map.higherEntry(six);
377          assertNull(e4);
379
378      }
379  
380      /**
# Line 395 | Line 393 | public class TreeMapTest extends JSR166T
393  
394          Map.Entry e4 = map.floorEntry(zero);
395          assertNull(e4);
398
396      }
397  
398      /**
# Line 414 | Line 411 | public class TreeMapTest extends JSR166T
411  
412          Map.Entry e4 = map.ceilingEntry(six);
413          assertNull(e4);
417
414      }
415  
416  
# Line 434 | Line 430 | public class TreeMapTest extends JSR166T
430  
431          Object e4 = q.lowerKey(zero);
432          assertNull(e4);
437
433      }
434  
435      /**
# Line 453 | Line 448 | public class TreeMapTest extends JSR166T
448  
449          Object e4 = q.higherKey(six);
450          assertNull(e4);
456
451      }
452  
453      /**
# Line 472 | Line 466 | public class TreeMapTest extends JSR166T
466  
467          Object e4 = q.floorKey(zero);
468          assertNull(e4);
475
469      }
470  
471      /**
# Line 491 | Line 484 | public class TreeMapTest extends JSR166T
484  
485          Object e4 = q.ceilingKey(six);
486          assertNull(e4);
494
487      }
488  
489      /**
# Line 660 | Line 652 | public class TreeMapTest extends JSR166T
652          assertEquals(1, sm.size());
653          assertEquals(three, sm.firstKey());
654          assertEquals(three, sm.lastKey());
655 <        assertTrue(sm.remove(three) != null);
655 >        assertEquals("C", sm.remove(three));
656          assertTrue(sm.isEmpty());
657          assertEquals(3, map.size());
658      }
# Line 693 | Line 685 | public class TreeMapTest extends JSR166T
685          assertEquals(4, map.size());
686          assertEquals(0, sm.size());
687          assertTrue(sm.isEmpty());
688 <        assertTrue(sm.remove(three) == null);
688 >        assertSame(sm.remove(three), null);
689          assertEquals(4, map.size());
690      }
691  
# Line 775 | Line 767 | public class TreeMapTest extends JSR166T
767          NavigableMap ssm = sm.tailMap(four, true);
768          assertEquals(four, ssm.firstKey());
769          assertEquals(five, ssm.lastKey());
770 <        assertTrue(ssm.remove(four) != null);
770 >        assertEquals("D", ssm.remove(four));
771          assertEquals(1, ssm.size());
772          assertEquals(3, sm.size());
773          assertEquals(4, map.size());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines