ViewVC Help

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

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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.31 by jsr166, Thu Oct 28 22:42:05 2010 UTC vs.
Revision 1.34 by jsr166, Fri Oct 29 07:01:51 2010 UTC

#	Line 739 | Line 739 | public class LinkedTransferQueueTest ext
739		LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
740
741		assertEquals(q.size(), r.size());
742	+	assertEquals(q.toString(), r.toString());
743	+	assertTrue(Arrays.equals(q.toArray(), r.toArray()));
744		while (!q.isEmpty()) {
745		assertEquals(q.remove(), r.remove());
746		}
#	Line 908 | Line 910 | public class LinkedTransferQueueTest ext
910		Thread t = newStartedThread(new CheckedRunnable() {
911		public void realRun() throws InterruptedException {
912		threadStarted.countDown();
913	<	q.transfer(SIZE);
913	>	q.transfer(five);
914		checkEmpty(q);
915		}});
916
917		threadStarted.await();
918		waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
917	–	assertTrue(t.isAlive());
919		assertEquals(1, q.size());
920	<	assertEquals(SIZE, (int) q.poll());
920	>	assertSame(five, q.poll());
921		checkEmpty(q);
922		awaitTermination(t, MEDIUM_DELAY_MS);
923		}
#	Line 930 | Line 931 | public class LinkedTransferQueueTest ext
931
932		Thread first = newStartedThread(new CheckedRunnable() {
933		public void realRun() throws InterruptedException {
934	<	Integer i = SIZE + 1;
935	<	q.transfer(i);
935	<	assertTrue(!q.contains(i));
934	>	q.transfer(four);
935	>	assertTrue(!q.contains(four));
936		assertEquals(1, q.size());
937		}});
938
939		Thread interruptedThread = newStartedThread(
940		new CheckedInterruptedRunnable() {
941		public void realRun() throws InterruptedException {
942	<	while (q.size() == 0)
942	>	while (q.isEmpty())
943		Thread.yield();
944	<	q.transfer(SIZE);
944	>	q.transfer(five);
945		}});
946
947		while (q.size() < 2)
948		Thread.yield();
949		assertEquals(2, q.size());
950	<	assertEquals(SIZE + 1, (int) q.poll());
950	>	assertSame(four, q.poll());
951		first.join();
952		assertEquals(1, q.size());
953		interruptedThread.interrupt();
#	Line 1094 | Line 1094 | public class LinkedTransferQueueTest ext
1094		}
1095
1096		/**
1097	<	* tryTransfer gives up after the timeout and return false
1097	>	* tryTransfer gives up after the timeout and returns false
1098		*/
1099		public void testTryTransfer6() throws InterruptedException {
1100		final LinkedTransferQueue q = new LinkedTransferQueue();
#	Line 1105 | Line 1105 | public class LinkedTransferQueueTest ext
1105		assertFalse(q.tryTransfer(new Object(),
1106		SHORT_DELAY_MS, MILLISECONDS));
1107		assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1108	+	checkEmpty(q);
1109		}});
1110
1110	–	checkEmpty(q);
1111		awaitTermination(t, MEDIUM_DELAY_MS);
1112		checkEmpty(q);
1113		}
#	Line 1126 | Line 1126 | public class LinkedTransferQueueTest ext
1126		checkEmpty(q);
1127		}});
1128
1129	<	Thread.sleep(SHORT_DELAY_MS);
1129	>	while (q.size() != 2)
1130	>	Thread.yield();
1131		assertEquals(2, q.size());
1132		assertSame(four, q.poll());
1133		assertSame(five, q.poll());
#	Line 1142 | Line 1143 | public class LinkedTransferQueueTest ext
1143		final LinkedTransferQueue q = new LinkedTransferQueue();
1144		assertTrue(q.offer(four));
1145		assertEquals(1, q.size());
1146	+	long t0 = System.nanoTime();
1147		assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1148	+	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1149		assertEquals(1, q.size());
1150		assertSame(four, q.poll());
1151		assertNull(q.poll());

Diff Legend

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