ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/TreeMapTest.java

Comparing jsr166/src/test/tck/TreeMapTest.java (file contents):
Revision 1.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.15 by jsr166, Wed Sep 1 20:12:39 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 516 | Line 508 | public class TreeMapTest extends JSR166T
508		try {
509		e.setValue("A");
510		shouldThrow();
511	<	} catch (Exception ok) {
520	<	}
511	>	} catch (UnsupportedOperationException success) {}
512		e = map.pollFirstEntry();
513		assertNull(e);
514		}
#	Line 544 | Line 535 | public class TreeMapTest extends JSR166T
535		try {
536		e.setValue("E");
537		shouldThrow();
538	<	} catch (Exception ok) {
548	<	}
538	>	} catch (UnsupportedOperationException success) {}
539		e = map.pollLastEntry();
540		assertNull(e);
541		}
#	Line 581 | Line 571 | public class TreeMapTest extends JSR166T
571		TreeMap c = map5();
572		c.get(null);
573		shouldThrow();
574	<	} catch (NullPointerException e) {}
574	>	} catch (NullPointerException success) {}
575		}
576
577		/**
#	Line 592 | Line 582 | public class TreeMapTest extends JSR166T
582		TreeMap c = map5();
583		c.containsKey(null);
584		shouldThrow();
585	<	} catch (NullPointerException e) {}
585	>	} catch (NullPointerException success) {}
586		}
587
588		/**
#	Line 604 | Line 594 | public class TreeMapTest extends JSR166T
594		c.put("sadsdf", "asdads");
595		c.remove(null);
596		shouldThrow();
597	<	} catch (NullPointerException e) {}
597	>	} catch (NullPointerException success) {}
598		}
599
600		/**
#	Line 662 | 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 695 | 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 777 | 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());
#	Line 789 | Line 779 | public class TreeMapTest extends JSR166T
779		/**
780		* Submaps of submaps subdivide correctly
781		*/
782	<	public void testRecursiveSubMaps() {
782	>	public void testRecursiveSubMaps() throws Exception {
783		int mapSize = 1000;
784		Class cl = TreeMap.class;
785		NavigableMap<Integer, Integer> map = newMap(cl);
#	Line 807 | Line 797 | public class TreeMapTest extends JSR166T
797		0, mapSize - 1, true);
798		}
799
800	<	static NavigableMap<Integer, Integer> newMap(Class cl) {
801	<	NavigableMap<Integer, Integer> result = null;
802	<	try {
813	<	result = (NavigableMap<Integer, Integer>) cl.newInstance();
814	<	} catch (Exception e) {
815	<	fail();
816	<	}
800	>	static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
801	>	NavigableMap<Integer, Integer> result
802	>	= (NavigableMap<Integer, Integer>) cl.newInstance();
803		assertEquals(result.size(), 0);
804		assertFalse(result.keySet().iterator().hasNext());
805		return result;
#	Line 876 | Line 862 | public class TreeMapTest extends JSR166T
862		} else {
863		try {
864		map.put(key, 2 * key);
865	<	fail();
866	<	} catch (IllegalArgumentException e) {
881	<	// expected
882	<	}
865	>	shouldThrow();
866	>	} catch (IllegalArgumentException success) {}
867		}
868		}
869		}
#	Line 1008 | Line 992 | public class TreeMapTest extends JSR166T
992		// BitSet should support this! Test would run much faster
993		while (key >= min) {
994		if (bs.get(key))
995	<	return(key);
995	>	return key;
996		key--;
997		}
998		return -1;
#	Line 1074 | Line 1058 | public class TreeMapTest extends JSR166T
1058		assertEq(rs.last(),  -1);
1059		try {
1060		map.firstKey();
1061	<	fail();
1062	<	} catch (NoSuchElementException e) {
1079	<	// expected
1080	<	}
1061	>	shouldThrow();
1062	>	} catch (NoSuchElementException success) {}
1063		try {
1064		map.lastKey();
1065	<	fail();
1066	<	} catch (NoSuchElementException e) {
1085	<	// expected
1086	<	}
1065	>	shouldThrow();
1066	>	} catch (NoSuchElementException success) {}
1067		}
1068		}
1069

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines