ViewVC Help

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

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

Comparing jsr166/src/test/tck/CyclicBarrierTest.java (file contents):
Revision 1.12 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.13 by jsr166, Sat Nov 21 02:33:20 2009 UTC

#	Line 11 | Line 11 | import java.util.*;
11		import java.util.concurrent.*;
12		import java.util.concurrent.locks.*;
13		import java.util.concurrent.atomic.*;
14	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
15
16		public class CyclicBarrierTest extends JSR166TestCase {
17		public static void main(String[] args) {
#	Line 168 | Line 169 | public class CyclicBarrierTest extends J
169		Thread t1 = new Thread(new Runnable() {
170		public void run() {
171		try {
172	<	c.await(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
172	>	c.await(LONG_DELAY_MS, MILLISECONDS);
173		threadShouldThrow();
174		} catch (InterruptedException success) {
175		} catch (Exception b) {
#	Line 179 | Line 180 | public class CyclicBarrierTest extends J
180		Thread t2 = new Thread(new Runnable() {
181		public void run() {
182		try {
183	<	c.await(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
183	>	c.await(LONG_DELAY_MS, MILLISECONDS);
184		threadShouldThrow();
185		} catch (BrokenBarrierException success) {
186		} catch (Exception i) {
#	Line 207 | Line 208 | public class CyclicBarrierTest extends J
208		Thread t = new Thread(new Runnable() {
209		public void run() {
210		try {
211	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
211	>	c.await(SHORT_DELAY_MS, MILLISECONDS);
212		threadShouldThrow();
213		} catch (TimeoutException success) {
214		} catch (Exception b) {
#	Line 233 | Line 234 | public class CyclicBarrierTest extends J
234		Thread t1 = new Thread(new Runnable() {
235		public void run() {
236		try {
237	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
237	>	c.await(SHORT_DELAY_MS, MILLISECONDS);
238		threadShouldThrow();
239		} catch (TimeoutException success) {
240		} catch (Exception b) {
#	Line 244 | Line 245 | public class CyclicBarrierTest extends J
245		Thread t2 = new Thread(new Runnable() {
246		public void run() {
247		try {
248	<	c.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
248	>	c.await(MEDIUM_DELAY_MS, MILLISECONDS);
249		threadShouldThrow();
250		} catch (BrokenBarrierException success) {
251		} catch (Exception i) {
#	Line 271 | Line 272 | public class CyclicBarrierTest extends J
272		Thread t1 = new Thread(new Runnable() {
273		public void run() {
274		try {
275	<	c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
275	>	c.await(SHORT_DELAY_MS, MILLISECONDS);
276		threadShouldThrow();
277		} catch (TimeoutException success) {
278		} catch (Exception b) {
#	Line 529 | Line 530 | public class CyclicBarrierTest extends J
530		catch (Exception ie) {
531		threadFail("start barrier");
532		}
533	<	try { barrier.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); }
533	>	try { barrier.await(MEDIUM_DELAY_MS, MILLISECONDS); }
534		catch (TimeoutException ok) {}
535		catch (Throwable thrown) {
536		unexpectedException();

Diff Legend

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