ViewVC Help

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

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

Comparing jsr166/src/test/tck/TreeSubSetTest.java (file contents):
Revision 1.10 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.16 by jsr166, Fri Nov 5 00:17:22 2010 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class TreeSubSetTest 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(TreeSubSetTest.class);
#	Line 27 | Line 27 | public class TreeSubSetTest extends JSR1
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private NavigableSet populatedSet(int n) {
31	<	TreeSet q = new TreeSet();
30	>	private NavigableSet<Integer> populatedSet(int n) {
31	>	TreeSet<Integer> q = new TreeSet<Integer>();
32		assertTrue(q.isEmpty());
33
34		for (int i = n-1; i >= 0; i-=2)
#	Line 175 | Line 175 | public class TreeSubSetTest extends JSR1
175		shouldThrow();
176		} catch (NullPointerException success) {}
177		}
178	+
179		/**
180		* addAll of a collection with null elements throws NPE
181		*/
#	Line 186 | Line 187 | public class TreeSubSetTest extends JSR1
187		shouldThrow();
188		} catch (NullPointerException success) {}
189		}
190	+
191		/**
192		* addAll of a collection with any null elements throws NPE after
193		* possibly adding some elements
#	Line 335 | Line 337 | public class TreeSubSetTest extends JSR1
337
338		Object e4 = q.lower(zero);
339		assertNull(e4);
338	–
340		}
341
342		/**
#	Line 354 | Line 355 | public class TreeSubSetTest extends JSR1
355
356		Object e4 = q.higher(six);
357		assertNull(e4);
357	–
358		}
359
360		/**
#	Line 373 | Line 373 | public class TreeSubSetTest extends JSR1
373
374		Object e4 = q.floor(zero);
375		assertNull(e4);
376	–
376		}
377
378		/**
#	Line 392 | Line 391 | public class TreeSubSetTest extends JSR1
391
392		Object e4 = q.ceiling(six);
393		assertNull(e4);
395	–
394		}
395
396		/**
397	<	* toArray contains all elements
397	>	* toArray contains all elements in sorted order
398		*/
399		public void testToArray() {
400		NavigableSet q = populatedSet(SIZE);
401		Object[] o = q.toArray();
404	–	Arrays.sort(o);
402		for (int i = 0; i < o.length; i++)
403	<	assertEquals(o[i], q.pollFirst());
403	>	assertSame(o[i], q.pollFirst());
404		}
405
406		/**
407	<	* toArray(a) contains all elements
407	>	* toArray(a) contains all elements in sorted order
408		*/
409		public void testToArray2() {
410	<	NavigableSet q = populatedSet(SIZE);
410	>	NavigableSet<Integer> q = populatedSet(SIZE);
411		Integer[] ints = new Integer[SIZE];
412	<	ints = (Integer[])q.toArray(ints);
413	<	Arrays.sort(ints);
412	>	Integer[] array = q.toArray(ints);
413	>	assertSame(ints, array);
414		for (int i = 0; i < ints.length; i++)
415	<	assertEquals(ints[i], q.pollFirst());
415	>	assertSame(ints[i], q.pollFirst());
416		}
417
418		/**
#	Line 449 | Line 446 | public class TreeSubSetTest extends JSR1
446		/**
447		* iterator.remove removes current element
448		*/
449	<	public void testIteratorRemove () {
449	>	public void testIteratorRemove() {
450		final NavigableSet q = set0();
451		q.add(new Integer(2));
452		q.add(new Integer(1));
#	Line 670 | Line 667 | public class TreeSubSetTest extends JSR1
667		shouldThrow();
668		} catch (NullPointerException success) {}
669		}
670	+
671		/**
672		* addAll of a collection with null elements throws NPE
673		*/
#	Line 681 | Line 679 | public class TreeSubSetTest extends JSR1
679		shouldThrow();
680		} catch (NullPointerException success) {}
681		}
682	+
683		/**
684		* addAll of a collection with any null elements throws NPE after
685		* possibly adding some elements
#	Line 830 | Line 829 | public class TreeSubSetTest extends JSR1
829
830		Object e4 = q.lower(zero);
831		assertNull(e4);
833	–
832		}
833
834		/**
#	Line 849 | Line 847 | public class TreeSubSetTest extends JSR1
847
848		Object e4 = q.higher(m6);
849		assertNull(e4);
852	–
850		}
851
852		/**
#	Line 868 | Line 865 | public class TreeSubSetTest extends JSR1
865
866		Object e4 = q.floor(zero);
867		assertNull(e4);
871	–
868		}
869
870		/**
#	Line 887 | Line 883 | public class TreeSubSetTest extends JSR1
883
884		Object e4 = q.ceiling(m6);
885		assertNull(e4);
890	–
886		}
887
888		/**
#	Line 907 | Line 902 | public class TreeSubSetTest extends JSR1
902		public void testDescendingToArray2() {
903		NavigableSet q = populatedSet(SIZE);
904		Integer[] ints = new Integer[SIZE];
905	<	ints = (Integer[])q.toArray(ints);
905	>	assertSame(ints, q.toArray(ints));
906		Arrays.sort(ints);
907		for (int i = 0; i < ints.length; i++)
908		assertEquals(ints[i], q.pollFirst());
#	Line 944 | Line 939 | public class TreeSubSetTest extends JSR1
939		/**
940		* iterator.remove removes current element
941		*/
942	<	public void testDescendingIteratorRemove () {
942	>	public void testDescendingIteratorRemove() {
943		final NavigableSet q = dset0();
944		q.add(new Integer(2));
945		q.add(new Integer(1));

Diff Legend

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