ViewVC Help

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

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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.56 by jsr166, Fri Jul 15 18:49:31 2011 UTC vs.
Revision 1.61 by jsr166, Fri Apr 5 19:27:23 2013 UTC

#	Line 62 | Line 62 | public class DelayQueueTest extends JSR1
62		return (other instanceof PDelay) &&
63		this.pseudodelay == ((PDelay)other).pseudodelay;
64		}
65	+	// suppress [overrides] javac warning
66	+	public int hashCode() { return pseudodelay; }
67		public long getDelay(TimeUnit ignore) {
68		return Integer.MIN_VALUE + pseudodelay;
69		}
#	Line 97 | Line 99 | public class DelayQueueTest extends JSR1
99		return other.trigger == trigger;
100		}
101
102	+	// suppress [overrides] javac warning
103	+	public int hashCode() { return (int) trigger; }
104	+
105		public long getDelay(TimeUnit unit) {
106		long n = trigger - System.nanoTime();
107		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118
119		/**
120	<	* Create a queue of given size containing consecutive
120	>	* Returns a new queue of given size containing consecutive
121		* PDelays 0 ... n.
122		*/
123		private DelayQueue<PDelay> populatedQueue(int n) {
#	Line 620 | Line 625 | public class DelayQueueTest extends JSR1
625		it.next();
626		it.remove();
627		it = q.iterator();
628	<	assertEquals(it.next(), new PDelay(2));
629	<	assertEquals(it.next(), new PDelay(3));
628	>	assertEquals(new PDelay(2), it.next());
629	>	assertEquals(new PDelay(3), it.next());
630		assertFalse(it.hasNext());
631		}
632
#	Line 718 | Line 723 | public class DelayQueueTest extends JSR1
723		}
724		ArrayList l = new ArrayList();
725		q.drainTo(l);
726	<	assertEquals(q.size(), 0);
726	>	assertEquals(0, q.size());
727		for (int i = 0; i < SIZE; ++i)
728	<	assertEquals(l.get(i), elems[i]);
728	>	assertEquals(elems[i], l.get(i));
729		q.add(elems[0]);
730		q.add(elems[1]);
731		assertFalse(q.isEmpty());
#	Line 728 | Line 733 | public class DelayQueueTest extends JSR1
733		assertTrue(q.contains(elems[1]));
734		l.clear();
735		q.drainTo(l);
736	<	assertEquals(q.size(), 0);
737	<	assertEquals(l.size(), 2);
736	>	assertEquals(0, q.size());
737	>	assertEquals(2, l.size());
738		for (int i = 0; i < 2; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		}
741
742		/**
#	Line 761 | Line 766 | public class DelayQueueTest extends JSR1
766		ArrayList l = new ArrayList();
767		q.drainTo(l, i);
768		int k = (i < SIZE) ? i : SIZE;
769	<	assertEquals(q.size(), SIZE-k);
770	<	assertEquals(l.size(), k);
769	>	assertEquals(SIZE-k, q.size());
770	>	assertEquals(k, l.size());
771		}
772		}
773

Diff Legend

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