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.36 by jsr166, Mon Aug 3 22:08:45 2009 UTC vs.
Revision 1.44 by jsr166, Sat Nov 21 17:38:05 2009 UTC

#	Line 90 | Line 90 | public class JSR166TestCase extends Test
90		/**
91		* Runs all JSR166 unit tests using junit.textui.TestRunner
92		*/
93	<	public static void main (String[] args) {
93	>	public static void main(String[] args) {
94		int iters = 1;
95		if (args.length > 0)
96		iters = Integer.parseInt(args[0]);
97		Test s = suite();
98		for (int i = 0; i < iters; ++i) {
99	<	junit.textui.TestRunner.run (s);
99	>	junit.textui.TestRunner.run(s);
100		System.gc();
101		System.runFinalization();
102		}
#	Line 106 | Line 106 | public class JSR166TestCase extends Test
106		/**
107		* Collects all JSR166 unit tests as one suite
108		*/
109	<	public static Test suite ( ) {
109	>	public static Test suite() {
110		TestSuite suite = new TestSuite("JSR166 Unit Tests");
111
112		suite.addTest(new TestSuite(ForkJoinPoolTest.class));
#	Line 195 | Line 195 | public class JSR166TestCase extends Test
195		/**
196		* Sets delays as multiples of SHORT_DELAY.
197		*/
198	<	protected  void setDelays() {
198	>	protected void setDelays() {
199		SHORT_DELAY_MS = getShortDelay();
200		SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
201		MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
#	Line 289 | Line 289 | public class JSR166TestCase extends Test
289		* threadFail with message "should throw exception"
290		*/
291		public void threadShouldThrow() {
292	<	try {
293	<	threadFailed = true;
294	<	fail("should throw exception");
295	<	} catch (AssertionFailedError e) {
296	<	e.printStackTrace();
297	<	throw e;
298	<	}
292	>	threadFailed = true;
293	>	fail("should throw exception");
294	>	}
295	>
296	>	/**
297	>	* threadFail with message "should throw" + exceptionName
298	>	*/
299	>	public void threadShouldThrow(String exceptionName) {
300	>	threadFailed = true;
301	>	fail("should throw " + exceptionName);
302		}
303
304		/**
#	Line 325 | Line 328 | public class JSR166TestCase extends Test
328		} catch (SecurityException ok) {
329		// Allowed in case test doesn't have privs
330		} catch (InterruptedException ie) {
331	<	fail("Unexpected exception");
331	>	fail("Unexpected InterruptedException");
332		}
333		}
334
#	Line 338 | Line 341 | public class JSR166TestCase extends Test
341		}
342
343		/**
344	+	* fail with message "should throw " + exceptionName
345	+	*/
346	+	public void shouldThrow(String exceptionName) {
347	+	fail("Should throw " + exceptionName);
348	+	}
349	+
350	+	/**
351		* fail with message "Unexpected exception"
352		*/
353		public void unexpectedException() {
#	Line 388 | Line 398 | public class JSR166TestCase extends Test
398		AdjustablePolicy() { }
399		void addPermission(Permission perm) { perms.add(perm); }
400		void clearPermissions() { perms = new Permissions(); }
401	<	public PermissionCollection getPermissions(CodeSource cs) {
402	<	return perms;
403	<	}
404	<	public PermissionCollection getPermissions(ProtectionDomain pd) {
405	<	return perms;
406	<	}
407	<	public boolean implies(ProtectionDomain pd, Permission p) {
408	<	return perms.implies(p);
409	<	}
410	<	public void refresh() {}
401	>	public PermissionCollection getPermissions(CodeSource cs) {
402	>	return perms;
403	>	}
404	>	public PermissionCollection getPermissions(ProtectionDomain pd) {
405	>	return perms;
406	>	}
407	>	public boolean implies(ProtectionDomain pd, Permission p) {
408	>	return perms.implies(p);
409	>	}
410	>	public void refresh() {}
411		}
412
413	+	/**
414	+	* Sleep until the timeout has elapsed, or interrupted.
415	+	* Does <em>NOT</em> throw InterruptedException.
416	+	*/
417	+	void sleepTillInterrupted(long timeoutMillis) {
418	+	try {
419	+	Thread.sleep(timeoutMillis);
420	+	} catch (InterruptedException wakeup) {}
421	+	}
422	+
423	+	/**
424	+	* Returns a new started Thread running the given runnable.
425	+	*/
426	+	Thread newStartedThread(Runnable runnable) {
427	+	Thread t = new Thread(runnable);
428	+	t.start();
429	+	return t;
430	+	}
431
432		// Some convenient Runnable classes
433
#	Line 415 | Line 443 | public class JSR166TestCase extends Test
443		}
444		}
445
446	+	abstract class RunnableShouldThrow implements Runnable {
447	+	abstract void realRun() throws Throwable;
448	+
449	+	final Class<?> exceptionClass;
450	+
451	+	<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
452	+	this.exceptionClass = exceptionClass;
453	+	}
454	+
455	+	public final void run() {
456	+	try {
457	+	realRun();
458	+	threadShouldThrow(exceptionClass.getSimpleName());
459	+	} catch (InterruptedException success) {
460	+	} catch (Throwable t) {
461	+	if (! exceptionClass.isInstance(t))
462	+	threadUnexpectedException(t);
463	+	}
464	+	}
465	+	}
466	+
467	+	abstract class ThreadShouldThrow extends Thread {
468	+	abstract void realRun() throws Throwable;
469	+
470	+	final Class<?> exceptionClass;
471	+
472	+	<T extends Throwable> ThreadShouldThrow(Class<T> exceptionClass) {
473	+	this.exceptionClass = exceptionClass;
474	+	}
475	+
476	+	public final void run() {
477	+	try {
478	+	realRun();
479	+	threadShouldThrow(exceptionClass.getSimpleName());
480	+	} catch (InterruptedException success) {
481	+	} catch (Throwable t) {
482	+	if (! exceptionClass.isInstance(t))
483	+	threadUnexpectedException(t);
484	+	}
485	+	}
486	+	}
487	+
488		abstract class CheckedInterruptedRunnable implements Runnable {
489		abstract void realRun() throws Throwable;
490
491		public final void run() {
492		try {
493		realRun();
494	<	threadShouldThrow();
494	>	threadShouldThrow("InterruptedException");
495		} catch (InterruptedException success) {
496		} catch (Throwable t) {
497		threadUnexpectedException(t);
#	Line 437 | Line 507 | public class JSR166TestCase extends Test
507		return realCall();
508		} catch (Throwable t) {
509		threadUnexpectedException(t);
440	–	return null;
510		}
511	+	return null;
512	+	}
513	+	}
514	+
515	+	abstract class CheckedInterruptedCallable<T> implements Callable<T> {
516	+	abstract T realCall() throws Throwable;
517	+
518	+	public final T call() {
519	+	try {
520	+	T result = realCall();
521	+	threadShouldThrow("InterruptedException");
522	+	return result;
523	+	} catch (InterruptedException success) {
524	+	} catch (Throwable t) {
525	+	threadUnexpectedException(t);
526	+	}
527	+	return null;
528		}
529		}
530
#	Line 486 | Line 572 | public class JSR166TestCase extends Test
572		void realRun() {
573		try {
574		Thread.sleep(SMALL_DELAY_MS);
575	<	}
490	<	catch (InterruptedException ok) {
491	<	}
575	>	} catch (InterruptedException ok) {}
576		}
577		}
578
579		class SmallCallable extends CheckedCallable {
580	<	Object realCall() throws Throwable {
580	>	Object realCall() throws InterruptedException {
581		Thread.sleep(SMALL_DELAY_MS);
582		return Boolean.TRUE;
583		}
#	Line 521 | Line 605 | public class JSR166TestCase extends Test
605		void realRun() {
606		try {
607		Thread.sleep(MEDIUM_DELAY_MS);
608	<	}
525	<	catch (InterruptedException ok) {
526	<	}
608	>	} catch (InterruptedException ok) {}
609		}
610		}
611
#	Line 531 | Line 613 | public class JSR166TestCase extends Test
613		void realRun() {
614		try {
615		Thread.sleep(LONG_DELAY_MS);
616	<	}
535	<	catch (InterruptedException ok) {
536	<	}
616	>	} catch (InterruptedException ok) {}
617		}
618		}
619
#	Line 552 | Line 632 | public class JSR166TestCase extends Test
632		try {
633		Thread.sleep(SMALL_DELAY_MS);
634		done = true;
635	<	} catch (Exception e) {
556	<	}
635	>	} catch (InterruptedException ok) {}
636		}
637		}
638
#	Line 563 | Line 642 | public class JSR166TestCase extends Test
642		try {
643		Thread.sleep(MEDIUM_DELAY_MS);
644		done = true;
645	<	} catch (Exception e) {
567	<	}
645	>	} catch (InterruptedException ok) {}
646		}
647		}
648
#	Line 574 | Line 652 | public class JSR166TestCase extends Test
652		try {
653		Thread.sleep(LONG_DELAY_MS);
654		done = true;
655	<	} catch (Exception e) {
578	<	}
655	>	} catch (InterruptedException ok) {}
656		}
657		}
658
#	Line 592 | Line 669 | public class JSR166TestCase extends Test
669		try {
670		Thread.sleep(SMALL_DELAY_MS);
671		done = true;
672	<	} catch (Exception e) {
596	<	}
672	>	} catch (InterruptedException ok) {}
673		return Boolean.TRUE;
674		}
675		}

Diff Legend

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