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.41 by jsr166, Fri Nov 20 06:27:39 2009 UTC vs.
Revision 1.44 by jsr166, Sat Nov 21 17:38:05 2009 UTC

#	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 328 | 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 398 | 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		/**
#	Line 417 | Line 417 | public class JSR166TestCase extends Test
417		void sleepTillInterrupted(long timeoutMillis) {
418		try {
419		Thread.sleep(timeoutMillis);
420	<	} catch (InterruptedException wakeup) {
421	<	}
420	>	} catch (InterruptedException wakeup) {}
421		}
422
423		/**
#	Line 573 | Line 572 | public class JSR166TestCase extends Test
572		void realRun() {
573		try {
574		Thread.sleep(SMALL_DELAY_MS);
575	<	}
577	<	catch (InterruptedException ok) {
578	<	}
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 608 | Line 605 | public class JSR166TestCase extends Test
605		void realRun() {
606		try {
607		Thread.sleep(MEDIUM_DELAY_MS);
608	<	}
612	<	catch (InterruptedException ok) {
613	<	}
608	>	} catch (InterruptedException ok) {}
609		}
610		}
611
#	Line 618 | Line 613 | public class JSR166TestCase extends Test
613		void realRun() {
614		try {
615		Thread.sleep(LONG_DELAY_MS);
616	<	}
622	<	catch (InterruptedException ok) {
623	<	}
616	>	} catch (InterruptedException ok) {}
617		}
618		}
619
#	Line 639 | Line 632 | public class JSR166TestCase extends Test
632		try {
633		Thread.sleep(SMALL_DELAY_MS);
634		done = true;
635	<	} catch (InterruptedException ok) {
643	<	}
635	>	} catch (InterruptedException ok) {}
636		}
637		}
638
#	Line 650 | Line 642 | public class JSR166TestCase extends Test
642		try {
643		Thread.sleep(MEDIUM_DELAY_MS);
644		done = true;
645	<	} catch (InterruptedException ok) {
654	<	}
645	>	} catch (InterruptedException ok) {}
646		}
647		}
648
#	Line 661 | Line 652 | public class JSR166TestCase extends Test
652		try {
653		Thread.sleep(LONG_DELAY_MS);
654		done = true;
655	<	} catch (InterruptedException ok) {
665	<	}
655	>	} catch (InterruptedException ok) {}
656		}
657		}
658
#	Line 679 | Line 669 | public class JSR166TestCase extends Test
669		try {
670		Thread.sleep(SMALL_DELAY_MS);
671		done = true;
672	<	} catch (InterruptedException ok) {
683	<	}
672	>	} catch (InterruptedException ok) {}
673		return Boolean.TRUE;
674		}
675		}

Diff Legend

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