ViewVC Help

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

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

Comparing jsr166/src/test/tck/BlockingQueueTest.java (file contents):
Revision 1.11 by jsr166, Tue Jun 14 04:30:06 2011 UTC vs.
Revision 1.19 by jsr166, Sat May 13 22:38:09 2017 UTC

#	Line 7 | Line 7
7		* Pat Fisher, Mike Judd.
8		*/
9
10	<	import junit.framework.*;
10	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
11	>
12		import java.util.ArrayList;
13		import java.util.Arrays;
14		import java.util.Collection;
15		import java.util.Queue;
16		import java.util.concurrent.BlockingQueue;
17		import java.util.concurrent.CountDownLatch;
18	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
18	>
19	>	import junit.framework.Test;
20	>	import junit.framework.TestSuite;
21
22		/**
23		* Contains "contract" tests applicable to all BlockingQueue implementations.
#	Line 232 | Line 235 | public abstract class BlockingQueueTest
235		shouldThrow();
236		} catch (InterruptedException success) {}
237		assertFalse(Thread.interrupted());
238	+
239	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
240		}});
241
242		barrier.await();
#	Line 240 | Line 245 | public abstract class BlockingQueueTest
245		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
246
247		barrier.await();
248	<	assertThreadStaysAlive(t);
248	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
249		t.interrupt();
250		awaitTermination(t);
251		}
#	Line 262 | Line 267 | public abstract class BlockingQueueTest
267		}});
268
269		await(threadStarted);
270	<	assertThreadStaysAlive(t);
270	>	assertThreadBlocks(t, Thread.State.WAITING);
271		t.interrupt();
272		awaitTermination(t);
273		}
#	Line 303 | Line 308 | public abstract class BlockingQueueTest
308		}});
309
310		await(threadStarted);
311	<	assertThreadStaysAlive(t);
311	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
312		t.interrupt();
313		awaitTermination(t);
314		}
#	Line 327 | Line 332 | public abstract class BlockingQueueTest
332		awaitTermination(t);
333		}
334
335	+	/**
336	+	* remove(x) removes x and returns true if present
337	+	* TODO: move to superclass CollectionTest.java
338	+	*/
339	+	public void testRemoveElement() {
340	+	final BlockingQueue q = emptyCollection();
341	+	final int size = Math.min(q.remainingCapacity(), SIZE);
342	+	final Object[] elts = new Object[size];
343	+	assertFalse(q.contains(makeElement(99)));
344	+	assertFalse(q.remove(makeElement(99)));
345	+	checkEmpty(q);
346	+	for (int i = 0; i < size; i++)
347	+	q.add(elts[i] = makeElement(i));
348	+	for (int i = 1; i < size; i += 2) {
349	+	for (int pass = 0; pass < 2; pass++) {
350	+	assertEquals((pass == 0), q.contains(elts[i]));
351	+	assertEquals((pass == 0), q.remove(elts[i]));
352	+	assertFalse(q.contains(elts[i]));
353	+	assertTrue(q.contains(elts[i - 1]));
354	+	if (i < size - 1)
355	+	assertTrue(q.contains(elts[i + 1]));
356	+	}
357	+	}
358	+	if (size > 0)
359	+	assertTrue(q.contains(elts[0]));
360	+	for (int i = size - 2; i >= 0; i -= 2) {
361	+	assertTrue(q.contains(elts[i]));
362	+	assertFalse(q.contains(elts[i + 1]));
363	+	assertTrue(q.remove(elts[i]));
364	+	assertFalse(q.contains(elts[i]));
365	+	assertFalse(q.remove(elts[i + 1]));
366	+	assertFalse(q.contains(elts[i + 1]));
367	+	}
368	+	checkEmpty(q);
369	+	}
370	+
371		/** For debugging. */
372		public void XXXXtestFails() {
373		fail(emptyCollection().getClass().toString());

Diff Legend

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