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.11 by jsr166, Tue Dec 1 09:43:19 2009 UTC vs.
Revision 1.15 by jsr166, Thu Nov 4 01:04:54 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 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 392 | Line 394 | public class TreeSubSetTest extends JSR1
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();
400	–	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);
411		Integer[] ints = new Integer[SIZE];
412	<	ints = (Integer[])q.toArray(ints);
412	<	Arrays.sort(ints);
412	>	assertSame(ints, q.toArray(ints));
413		for (int i = 0; i < ints.length; i++)
414	<	assertEquals(ints[i], q.pollFirst());
414	>	assertSame(ints[i], q.pollFirst());
415		}
416
417		/**
#	Line 445 | Line 445 | public class TreeSubSetTest extends JSR1
445		/**
446		* iterator.remove removes current element
447		*/
448	<	public void testIteratorRemove () {
448	>	public void testIteratorRemove() {
449		final NavigableSet q = set0();
450		q.add(new Integer(2));
451		q.add(new Integer(1));
#	Line 666 | Line 666 | public class TreeSubSetTest extends JSR1
666		shouldThrow();
667		} catch (NullPointerException success) {}
668		}
669	+
670		/**
671		* addAll of a collection with null elements throws NPE
672		*/
#	Line 677 | Line 678 | public class TreeSubSetTest extends JSR1
678		shouldThrow();
679		} catch (NullPointerException success) {}
680		}
681	+
682		/**
683		* addAll of a collection with any null elements throws NPE after
684		* possibly adding some elements
#	Line 899 | Line 901 | public class TreeSubSetTest extends JSR1
901		public void testDescendingToArray2() {
902		NavigableSet q = populatedSet(SIZE);
903		Integer[] ints = new Integer[SIZE];
904	<	ints = (Integer[])q.toArray(ints);
904	>	assertSame(ints, q.toArray(ints));
905		Arrays.sort(ints);
906		for (int i = 0; i < ints.length; i++)
907		assertEquals(ints[i], q.pollFirst());
#	Line 936 | Line 938 | public class TreeSubSetTest extends JSR1
938		/**
939		* iterator.remove removes current element
940		*/
941	<	public void testDescendingIteratorRemove () {
941	>	public void testDescendingIteratorRemove() {
942		final NavigableSet q = dset0();
943		q.add(new Integer(2));
944		q.add(new Integer(1));

Diff Legend

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