ViewVC Help

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

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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.79 by jsr166, Mon May 9 20:00:19 2011 UTC vs.
Revision 1.88 by jsr166, Tue May 31 15:01:24 2011 UTC

#	Line 12 | Line 12 | import java.io.ByteArrayOutputStream;
12		import java.io.ObjectInputStream;
13		import java.io.ObjectOutputStream;
14		import java.util.Arrays;
15	+	import java.util.Date;
16		import java.util.NoSuchElementException;
17		import java.util.PropertyPermission;
18		import java.util.concurrent.*;
19	+	import java.util.concurrent.atomic.AtomicBoolean;
20		import java.util.concurrent.atomic.AtomicReference;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
22		import static java.util.concurrent.TimeUnit.NANOSECONDS;
#	Line 258 | Line 260 | public class JSR166TestCase extends Test
260		return 50;
261		}
262
261	–
263		/**
264		* Sets delays as multiples of SHORT_DELAY.
265		*/
#	Line 270 | Line 271 | public class JSR166TestCase extends Test
271		}
272
273		/**
274	+	* Returns a timeout in milliseconds to be used in tests that
275	+	* verify that operations block or time out.
276	+	*/
277	+	long timeoutMillis() {
278	+	return SHORT_DELAY_MS / 4;
279	+	}
280	+
281	+	/**
282	+	* Returns a new Date instance representing a time delayMillis
283	+	* milliseconds in the future.
284	+	*/
285	+	Date delayedDate(long delayMillis) {
286	+	return new Date(System.currentTimeMillis() + delayMillis);
287	+	}
288	+
289	+	/**
290		* The first exception encountered if any threadAssertXXX method fails.
291		*/
292		private final AtomicReference<Throwable> threadFailure
#	Line 290 | Line 307 | public class JSR166TestCase extends Test
307		}
308
309		/**
310	+	* Extra checks that get done for all test cases.
311	+	*
312		* Triggers test case failure if any thread assertions have failed,
313		* by rethrowing, in the test harness thread, any exception recorded
314		* earlier by threadRecordFailure.
315	+	*
316	+	* Triggers test case failure if interrupt status is set in the main thread.
317		*/
318		public void tearDown() throws Exception {
319		Throwable t = threadFailure.getAndSet(null);
#	Line 310 | Line 331 | public class JSR166TestCase extends Test
331		throw afe;
332		}
333		}
334	+
335	+	if (Thread.interrupted())
336	+	throw new AssertionFailedError("interrupt status set in main thread");
337		}
338
339		/**
#	Line 441 | Line 465 | public class JSR166TestCase extends Test
465		else {
466		AssertionFailedError afe =
467		new AssertionFailedError("unexpected exception: " + t);
468	<	t.initCause(t);
468	>	afe.initCause(t);
469		throw afe;
470		}
471		}
472
473		/**
474	<	* Delays, via Thread.sleep for the given millisecond delay, but
474	>	* Delays, via Thread.sleep, for the given millisecond delay, but
475		* if the sleep is shorter than specified, may re-sleep or yield
476		* until time elapses.
477		*/
478	<	public static void delay(long ms) throws InterruptedException {
478	>	static void delay(long millis) throws InterruptedException {
479		long startTime = System.nanoTime();
480	<	long ns = ms * 1000 * 1000;
480	>	long ns = millis * 1000 * 1000;
481		for (;;) {
482	<	if (ms > 0L)
483	<	Thread.sleep(ms);
482	>	if (millis > 0L)
483	>	Thread.sleep(millis);
484		else // too short to sleep
485		Thread.yield();
486		long d = ns - (System.nanoTime() - startTime);
487		if (d > 0L)
488	<	ms = d / (1000 * 1000);
488	>	millis = d / (1000 * 1000);
489		else
490		break;
491		}
#	Line 470 | Line 494 | public class JSR166TestCase extends Test
494		/**
495		* Waits out termination of a thread pool or fails doing so.
496		*/
497	<	public void joinPool(ExecutorService exec) {
497	>	void joinPool(ExecutorService exec) {
498		try {
499		exec.shutdown();
500		assertTrue("ExecutorService did not terminate in a timely manner",
#	Line 483 | Line 507 | public class JSR166TestCase extends Test
507		}
508
509		/**
510	<	* Checks that thread does not terminate within timeoutMillis
511	<	* milliseconds (that is, Thread.join times out).
510	>	* Checks that thread does not terminate within the default
511	>	* millisecond delay of {@code timeoutMillis()}.
512	>	*/
513	>	void assertThreadStaysAlive(Thread thread) {
514	>	assertThreadStaysAlive(thread, timeoutMillis());
515	>	}
516	>
517	>	/**
518	>	* Checks that thread does not terminate within the given millisecond delay.
519		*/
520	<	public void assertThreadJoinTimesOut(Thread thread, long timeoutMillis) {
520	>	void assertThreadStaysAlive(Thread thread, long millis) {
521		try {
522	<	long startTime = System.nanoTime();
523	<	thread.join(timeoutMillis);
522	>	// No need to optimize the failing case via Thread.join.
523	>	delay(millis);
524		assertTrue(thread.isAlive());
494	–	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
525		} catch (InterruptedException ie) {
526		fail("Unexpected InterruptedException");
527		}
528		}
529
530		/**
531	+	* Checks that future.get times out, with the default timeout of
532	+	* {@code timeoutMillis()}.
533	+	*/
534	+	void assertFutureTimesOut(Future future) {
535	+	assertFutureTimesOut(future, timeoutMillis());
536	+	}
537	+
538	+	/**
539	+	* Checks that future.get times out, with the given millisecond timeout.
540	+	*/
541	+	void assertFutureTimesOut(Future future, long timeoutMillis) {
542	+	long startTime = System.nanoTime();
543	+	try {
544	+	future.get(timeoutMillis, MILLISECONDS);
545	+	shouldThrow();
546	+	} catch (TimeoutException success) {
547	+	} catch (Exception e) {
548	+	threadUnexpectedException(e);
549	+	} finally { future.cancel(true); }
550	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
551	+	}
552	+
553	+	/**
554		* Fails with message "should throw exception".
555		*/
556		public void shouldThrow() {
#	Line 637 | Line 690 | public class JSR166TestCase extends Test
690		}
691
692		/**
693	<	* Sleeps until the timeout has elapsed, or interrupted.
641	<	* Does <em>NOT</em> throw InterruptedException.
642	<	*/
643	<	void sleepTillInterrupted(long timeoutMillis) {
644	<	try {
645	<	Thread.sleep(timeoutMillis);
646	<	} catch (InterruptedException wakeup) {}
647	<	}
648	<
649	<	/**
650	<	* Waits up to the specified number of milliseconds for the given
693	>	* Spin-waits up to the specified number of milliseconds for the given
694		* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
695		*/
696		void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
697	<	long timeoutNanos = timeoutMillis * 1000L * 1000L;
655	<	long t0 = System.nanoTime();
697	>	long startTime = System.nanoTime();
698		for (;;) {
699		Thread.State s = thread.getState();
700		if (s == Thread.State.BLOCKED ||
#	Line 661 | Line 703 | public class JSR166TestCase extends Test
703		return;
704		else if (s == Thread.State.TERMINATED)
705		fail("Unexpected thread termination");
706	<	else if (System.nanoTime() - t0 > timeoutNanos) {
706	>	else if (millisElapsedSince(startTime) > timeoutMillis) {
707		threadAssertTrue(thread.isAlive());
708		return;
709		}
#	Line 707 | Line 749 | public class JSR166TestCase extends Test
749		} catch (InterruptedException ie) {
750		threadUnexpectedException(ie);
751		} finally {
752	<	if (t.isAlive()) {
752	>	if (t.getState() != Thread.State.TERMINATED) {
753		t.interrupt();
754		fail("Test timed out");
755		}
#	Line 785 | Line 827 | public class JSR166TestCase extends Test
827		realRun();
828		threadShouldThrow("InterruptedException");
829		} catch (InterruptedException success) {
830	+	threadAssertFalse(Thread.interrupted());
831		} catch (Throwable t) {
832		threadUnexpectedException(t);
833		}
#	Line 814 | Line 857 | public class JSR166TestCase extends Test
857		threadShouldThrow("InterruptedException");
858		return result;
859		} catch (InterruptedException success) {
860	+	threadAssertFalse(Thread.interrupted());
861		} catch (Throwable t) {
862		threadUnexpectedException(t);
863		}
#	Line 860 | Line 904 | public class JSR166TestCase extends Test
904		}
905		}
906
907	+	//     /**
908	+	//      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
909	+	//      */
910	+	//     public void await(AtomicBoolean flag) {
911	+	//         await(flag, LONG_DELAY_MS);
912	+	//     }
913	+
914	+	//     /**
915	+	//      * Spin-waits up to the specified timeout until flag becomes true.
916	+	//      */
917	+	//     public void await(AtomicBoolean flag, long timeoutMillis) {
918	+	//         long startTime = System.nanoTime();
919	+	//         while (!flag.get()) {
920	+	//             if (millisElapsedSince(startTime) > timeoutMillis)
921	+	//                 throw new AssertionFailedError("timed out");
922	+	//             Thread.yield();
923	+	//         }
924	+	//     }
925	+
926		public static class NPETask implements Callable<String> {
927		public String call() { throw new NullPointerException(); }
928		}
#	Line 1062 | Line 1125 | public class JSR166TestCase extends Test
1125		}
1126
1127		/**
1128	<	* A CyclicBarrier that fails with AssertionFailedErrors instead
1129	<	* of throwing checked exceptions.
1128	>	* A CyclicBarrier that uses timed await and fails with
1129	>	* AssertionFailedErrors instead of throwing checked exceptions.
1130		*/
1131		public class CheckedBarrier extends CyclicBarrier {
1132		public CheckedBarrier(int parties) { super(parties); }
1133
1134		public int await() {
1135		try {
1136	<	return super.await();
1136	>	return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1137	>	} catch (TimeoutException e) {
1138	>	throw new AssertionFailedError("timed out");
1139		} catch (Exception e) {
1140		AssertionFailedError afe =
1141		new AssertionFailedError("Unexpected exception: " + e);
#	Line 1080 | Line 1145 | public class JSR166TestCase extends Test
1145		}
1146		}
1147
1148	<	public void checkEmpty(BlockingQueue q) {
1148	>	void checkEmpty(BlockingQueue q) {
1149		try {
1150		assertTrue(q.isEmpty());
1151		assertEquals(0, q.size());
#	Line 1108 | Line 1173 | public class JSR166TestCase extends Test
1173		}
1174
1175		@SuppressWarnings("unchecked")
1176	<	public <T> T serialClone(T o) {
1176	>	<T> T serialClone(T o) {
1177		try {
1178		ByteArrayOutputStream bos = new ByteArrayOutputStream();
1179		ObjectOutputStream oos = new ObjectOutputStream(bos);
1180		oos.writeObject(o);
1181		oos.flush();
1182		oos.close();
1183	<	ByteArrayInputStream bin =
1184	<	new ByteArrayInputStream(bos.toByteArray());
1185	<	ObjectInputStream ois = new ObjectInputStream(bin);
1186	<	return (T) ois.readObject();
1183	>	ObjectInputStream ois = new ObjectInputStream
1184	>	(new ByteArrayInputStream(bos.toByteArray()));
1185	>	T clone = (T) ois.readObject();
1186	>	assertSame(o.getClass(), clone.getClass());
1187	>	return clone;
1188		} catch (Throwable t) {
1189		threadUnexpectedException(t);
1190		return null;

Diff Legend

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