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.9 by jsr166, Sat Nov 21 10:29:50 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 19 | Line 19 | public class TreeSubSetTest extends JSR1
19
20		static class MyReverseComparator implements Comparator {
21		public int compare(Object x, Object y) {
22	<	int i = ((Integer)x).intValue();
23	<	int j = ((Integer)y).intValue();
24	<	if (i < j) return 1;
25	<	if (i > j) return -1;
26	<	return 0;
22	>	return ((Comparable)y).compareTo(x);
23		}
24		}
25
#	Line 104 | Line 100 | public class TreeSubSetTest extends JSR1
100		public void testEmpty() {
101		NavigableSet q = set0();
102		assertTrue(q.isEmpty());
103	<	q.add(new Integer(1));
103	>	assertTrue(q.add(new Integer(1)));
104		assertFalse(q.isEmpty());
105	<	q.add(new Integer(2));
105	>	assertTrue(q.add(new Integer(2)));
106		q.pollFirst();
107		q.pollFirst();
108		assertTrue(q.isEmpty());
#	Line 179 | 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 190 | 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 226 | Line 224 | public class TreeSubSetTest extends JSR1
224		public void testPoll() {
225		NavigableSet q = populatedSet(SIZE);
226		for (int i = 0; i < SIZE; ++i) {
227	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
227	>	assertEquals(i, q.pollFirst());
228		}
229		assertNull(q.pollFirst());
230		}
#	Line 266 | Line 264 | public class TreeSubSetTest extends JSR1
264		q.clear();
265		assertTrue(q.isEmpty());
266		assertEquals(0, q.size());
267	<	q.add(new Integer(1));
267	>	assertTrue(q.add(new Integer(1)));
268		assertFalse(q.isEmpty());
269		q.clear();
270		assertTrue(q.isEmpty());
#	Line 339 | Line 337 | public class TreeSubSetTest extends JSR1
337
338		Object e4 = q.lower(zero);
339		assertNull(e4);
342	–
340		}
341
342		/**
#	Line 358 | Line 355 | public class TreeSubSetTest extends JSR1
355
356		Object e4 = q.higher(six);
357		assertNull(e4);
361	–
358		}
359
360		/**
#	Line 377 | Line 373 | public class TreeSubSetTest extends JSR1
373
374		Object e4 = q.floor(zero);
375		assertNull(e4);
380	–
376		}
377
378		/**
#	Line 396 | Line 391 | public class TreeSubSetTest extends JSR1
391
392		Object e4 = q.ceiling(six);
393		assertNull(e4);
399	–
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();
408	–	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);
420	<	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 453 | 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 464 | Line 456 | public class TreeSubSetTest extends JSR1
456		it.remove();
457
458		it = q.iterator();
459	<	assertEquals(it.next(), new Integer(2));
460	<	assertEquals(it.next(), new Integer(3));
459	>	assertEquals(it.next(), 2);
460	>	assertEquals(it.next(), 3);
461		assertFalse(it.hasNext());
462		}
463
#	Line 674 | 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 685 | 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 721 | Line 715 | public class TreeSubSetTest extends JSR1
715		public void testDescendingPoll() {
716		NavigableSet q = populatedSet(SIZE);
717		for (int i = 0; i < SIZE; ++i) {
718	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
718	>	assertEquals(i, q.pollFirst());
719		}
720		assertNull(q.pollFirst());
721		}
#	Line 761 | Line 755 | public class TreeSubSetTest extends JSR1
755		q.clear();
756		assertTrue(q.isEmpty());
757		assertEquals(0, q.size());
758	<	q.add(new Integer(1));
758	>	assertTrue(q.add(new Integer(1)));
759		assertFalse(q.isEmpty());
760		q.clear();
761		assertTrue(q.isEmpty());
#	Line 834 | Line 828 | public class TreeSubSetTest extends JSR1
828
829		Object e4 = q.lower(zero);
830		assertNull(e4);
837	–
831		}
832
833		/**
#	Line 853 | Line 846 | public class TreeSubSetTest extends JSR1
846
847		Object e4 = q.higher(m6);
848		assertNull(e4);
856	–
849		}
850
851		/**
#	Line 872 | Line 864 | public class TreeSubSetTest extends JSR1
864
865		Object e4 = q.floor(zero);
866		assertNull(e4);
875	–
867		}
868
869		/**
#	Line 891 | Line 882 | public class TreeSubSetTest extends JSR1
882
883		Object e4 = q.ceiling(m6);
884		assertNull(e4);
894	–
885		}
886
887		/**
#	Line 911 | 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 948 | 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));
#	Line 959 | Line 949 | public class TreeSubSetTest extends JSR1
949		it.remove();
950
951		it = q.iterator();
952	<	assertEquals(it.next(), new Integer(2));
953	<	assertEquals(it.next(), new Integer(3));
952	>	assertEquals(it.next(), 2);
953	>	assertEquals(it.next(), 3);
954		assertFalse(it.hasNext());
955		}
956

Diff Legend

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