ViewVC Help

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

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

Comparing jsr166/src/test/tck/TimeUnitTest.java (file contents):
Revision 1.15 by jsr166, Tue Dec 1 09:48:12 2009 UTC vs.
Revision 1.23 by jsr166, Tue Sep 24 16:48:52 2013 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
9		import junit.framework.*;
10	<	import java.util.concurrent.*;
11	<	import java.io.*;
10	>	import java.util.concurrent.CountDownLatch;
11	>	import java.util.concurrent.TimeUnit;
12	>	import static java.util.concurrent.TimeUnit.*;
13
14		public class TimeUnitTest extends JSR166TestCase {
15		public static void main(String[] args) {
#	Line 28 | Line 28 | public class TimeUnitTest extends JSR166
28		public void testConvert() {
29		for (long t = 0; t < 88888; ++t) {
30		assertEquals(t*60*60*24,
31	<	TimeUnit.SECONDS.convert(t,
32	<	TimeUnit.DAYS));
31	>	SECONDS.convert(t, DAYS));
32		assertEquals(t*60*60,
33	<	TimeUnit.SECONDS.convert(t,
35	<	TimeUnit.HOURS));
33	>	SECONDS.convert(t, HOURS));
34		assertEquals(t*60,
35	<	TimeUnit.SECONDS.convert(t,
38	<	TimeUnit.MINUTES));
35	>	SECONDS.convert(t, MINUTES));
36		assertEquals(t,
37	<	TimeUnit.SECONDS.convert(t,
41	<	TimeUnit.SECONDS));
37	>	SECONDS.convert(t, SECONDS));
38		assertEquals(t,
39	<	TimeUnit.SECONDS.convert(1000L*t,
44	<	TimeUnit.MILLISECONDS));
39	>	SECONDS.convert(1000L*t, MILLISECONDS));
40		assertEquals(t,
41	<	TimeUnit.SECONDS.convert(1000000L*t,
47	<	TimeUnit.MICROSECONDS));
41	>	SECONDS.convert(1000000L*t, MICROSECONDS));
42		assertEquals(t,
43	<	TimeUnit.SECONDS.convert(1000000000L*t,
50	<	TimeUnit.NANOSECONDS));
51	<
43	>	SECONDS.convert(1000000000L*t, NANOSECONDS));
44
45		assertEquals(1000L*t*60*60*24,
46	<	TimeUnit.MILLISECONDS.convert(t,
55	<	TimeUnit.DAYS));
46	>	MILLISECONDS.convert(t, DAYS));
47		assertEquals(1000L*t*60*60,
48	<	TimeUnit.MILLISECONDS.convert(t,
58	<	TimeUnit.HOURS));
48	>	MILLISECONDS.convert(t, HOURS));
49		assertEquals(1000L*t*60,
50	<	TimeUnit.MILLISECONDS.convert(t,
61	<	TimeUnit.MINUTES));
50	>	MILLISECONDS.convert(t, MINUTES));
51		assertEquals(1000L*t,
52	<	TimeUnit.MILLISECONDS.convert(t,
64	<	TimeUnit.SECONDS));
52	>	MILLISECONDS.convert(t, SECONDS));
53		assertEquals(t,
54	<	TimeUnit.MILLISECONDS.convert(t,
67	<	TimeUnit.MILLISECONDS));
54	>	MILLISECONDS.convert(t, MILLISECONDS));
55		assertEquals(t,
56	<	TimeUnit.MILLISECONDS.convert(1000L*t,
70	<	TimeUnit.MICROSECONDS));
56	>	MILLISECONDS.convert(1000L*t, MICROSECONDS));
57		assertEquals(t,
58	<	TimeUnit.MILLISECONDS.convert(1000000L*t,
73	<	TimeUnit.NANOSECONDS));
58	>	MILLISECONDS.convert(1000000L*t, NANOSECONDS));
59
60		assertEquals(1000000L*t*60*60*24,
61	<	TimeUnit.MICROSECONDS.convert(t,
77	<	TimeUnit.DAYS));
61	>	MICROSECONDS.convert(t, DAYS));
62		assertEquals(1000000L*t*60*60,
63	<	TimeUnit.MICROSECONDS.convert(t,
80	<	TimeUnit.HOURS));
63	>	MICROSECONDS.convert(t, HOURS));
64		assertEquals(1000000L*t*60,
65	<	TimeUnit.MICROSECONDS.convert(t,
83	<	TimeUnit.MINUTES));
65	>	MICROSECONDS.convert(t, MINUTES));
66		assertEquals(1000000L*t,
67	<	TimeUnit.MICROSECONDS.convert(t,
86	<	TimeUnit.SECONDS));
67	>	MICROSECONDS.convert(t, SECONDS));
68		assertEquals(1000L*t,
69	<	TimeUnit.MICROSECONDS.convert(t,
89	<	TimeUnit.MILLISECONDS));
69	>	MICROSECONDS.convert(t, MILLISECONDS));
70		assertEquals(t,
71	<	TimeUnit.MICROSECONDS.convert(t,
92	<	TimeUnit.MICROSECONDS));
71	>	MICROSECONDS.convert(t, MICROSECONDS));
72		assertEquals(t,
73	<	TimeUnit.MICROSECONDS.convert(1000L*t,
95	<	TimeUnit.NANOSECONDS));
73	>	MICROSECONDS.convert(1000L*t, NANOSECONDS));
74
75		assertEquals(1000000000L*t*60*60*24,
76	<	TimeUnit.NANOSECONDS.convert(t,
99	<	TimeUnit.DAYS));
76	>	NANOSECONDS.convert(t, DAYS));
77		assertEquals(1000000000L*t*60*60,
78	<	TimeUnit.NANOSECONDS.convert(t,
102	<	TimeUnit.HOURS));
78	>	NANOSECONDS.convert(t, HOURS));
79		assertEquals(1000000000L*t*60,
80	<	TimeUnit.NANOSECONDS.convert(t,
105	<	TimeUnit.MINUTES));
80	>	NANOSECONDS.convert(t, MINUTES));
81		assertEquals(1000000000L*t,
82	<	TimeUnit.NANOSECONDS.convert(t,
108	<	TimeUnit.SECONDS));
82	>	NANOSECONDS.convert(t, SECONDS));
83		assertEquals(1000000L*t,
84	<	TimeUnit.NANOSECONDS.convert(t,
111	<	TimeUnit.MILLISECONDS));
84	>	NANOSECONDS.convert(t, MILLISECONDS));
85		assertEquals(1000L*t,
86	<	TimeUnit.NANOSECONDS.convert(t,
114	<	TimeUnit.MICROSECONDS));
86	>	NANOSECONDS.convert(t, MICROSECONDS));
87		assertEquals(t,
88	<	TimeUnit.NANOSECONDS.convert(t,
117	<	TimeUnit.NANOSECONDS));
88	>	NANOSECONDS.convert(t, NANOSECONDS));
89		}
90		}
91
#	Line 125 | Line 96 | public class TimeUnitTest extends JSR166
96		public void testToNanos() {
97		for (long t = 0; t < 88888; ++t) {
98		assertEquals(t*1000000000L*60*60*24,
99	<	TimeUnit.DAYS.toNanos(t));
99	>	DAYS.toNanos(t));
100		assertEquals(t*1000000000L*60*60,
101	<	TimeUnit.HOURS.toNanos(t));
101	>	HOURS.toNanos(t));
102		assertEquals(t*1000000000L*60,
103	<	TimeUnit.MINUTES.toNanos(t));
103	>	MINUTES.toNanos(t));
104		assertEquals(1000000000L*t,
105	<	TimeUnit.SECONDS.toNanos(t));
105	>	SECONDS.toNanos(t));
106		assertEquals(1000000L*t,
107	<	TimeUnit.MILLISECONDS.toNanos(t));
107	>	MILLISECONDS.toNanos(t));
108		assertEquals(1000L*t,
109	<	TimeUnit.MICROSECONDS.toNanos(t));
109	>	MICROSECONDS.toNanos(t));
110		assertEquals(t,
111	<	TimeUnit.NANOSECONDS.toNanos(t));
111	>	NANOSECONDS.toNanos(t));
112		}
113		}
114
#	Line 148 | Line 119 | public class TimeUnitTest extends JSR166
119		public void testToMicros() {
120		for (long t = 0; t < 88888; ++t) {
121		assertEquals(t*1000000L*60*60*24,
122	<	TimeUnit.DAYS.toMicros(t));
122	>	DAYS.toMicros(t));
123		assertEquals(t*1000000L*60*60,
124	<	TimeUnit.HOURS.toMicros(t));
124	>	HOURS.toMicros(t));
125		assertEquals(t*1000000L*60,
126	<	TimeUnit.MINUTES.toMicros(t));
126	>	MINUTES.toMicros(t));
127		assertEquals(1000000L*t,
128	<	TimeUnit.SECONDS.toMicros(t));
128	>	SECONDS.toMicros(t));
129		assertEquals(1000L*t,
130	<	TimeUnit.MILLISECONDS.toMicros(t));
130	>	MILLISECONDS.toMicros(t));
131		assertEquals(t,
132	<	TimeUnit.MICROSECONDS.toMicros(t));
132	>	MICROSECONDS.toMicros(t));
133		assertEquals(t,
134	<	TimeUnit.NANOSECONDS.toMicros(t*1000L));
134	>	NANOSECONDS.toMicros(t*1000L));
135		}
136		}
137
#	Line 171 | Line 142 | public class TimeUnitTest extends JSR166
142		public void testToMillis() {
143		for (long t = 0; t < 88888; ++t) {
144		assertEquals(t*1000L*60*60*24,
145	<	TimeUnit.DAYS.toMillis(t));
145	>	DAYS.toMillis(t));
146		assertEquals(t*1000L*60*60,
147	<	TimeUnit.HOURS.toMillis(t));
147	>	HOURS.toMillis(t));
148		assertEquals(t*1000L*60,
149	<	TimeUnit.MINUTES.toMillis(t));
149	>	MINUTES.toMillis(t));
150		assertEquals(1000L*t,
151	<	TimeUnit.SECONDS.toMillis(t));
151	>	SECONDS.toMillis(t));
152		assertEquals(t,
153	<	TimeUnit.MILLISECONDS.toMillis(t));
153	>	MILLISECONDS.toMillis(t));
154		assertEquals(t,
155	<	TimeUnit.MICROSECONDS.toMillis(t*1000L));
155	>	MICROSECONDS.toMillis(t*1000L));
156		assertEquals(t,
157	<	TimeUnit.NANOSECONDS.toMillis(t*1000000L));
157	>	NANOSECONDS.toMillis(t*1000000L));
158		}
159		}
160
#	Line 194 | Line 165 | public class TimeUnitTest extends JSR166
165		public void testToSeconds() {
166		for (long t = 0; t < 88888; ++t) {
167		assertEquals(t*60*60*24,
168	<	TimeUnit.DAYS.toSeconds(t));
168	>	DAYS.toSeconds(t));
169		assertEquals(t*60*60,
170	<	TimeUnit.HOURS.toSeconds(t));
170	>	HOURS.toSeconds(t));
171		assertEquals(t*60,
172	<	TimeUnit.MINUTES.toSeconds(t));
172	>	MINUTES.toSeconds(t));
173		assertEquals(t,
174	<	TimeUnit.SECONDS.toSeconds(t));
174	>	SECONDS.toSeconds(t));
175		assertEquals(t,
176	<	TimeUnit.MILLISECONDS.toSeconds(t*1000L));
176	>	MILLISECONDS.toSeconds(t*1000L));
177		assertEquals(t,
178	<	TimeUnit.MICROSECONDS.toSeconds(t*1000000L));
178	>	MICROSECONDS.toSeconds(t*1000000L));
179		assertEquals(t,
180	<	TimeUnit.NANOSECONDS.toSeconds(t*1000000000L));
180	>	NANOSECONDS.toSeconds(t*1000000000L));
181		}
182		}
183
#	Line 217 | Line 188 | public class TimeUnitTest extends JSR166
188		public void testToMinutes() {
189		for (long t = 0; t < 88888; ++t) {
190		assertEquals(t*60*24,
191	<	TimeUnit.DAYS.toMinutes(t));
191	>	DAYS.toMinutes(t));
192		assertEquals(t*60,
193	<	TimeUnit.HOURS.toMinutes(t));
193	>	HOURS.toMinutes(t));
194		assertEquals(t,
195	<	TimeUnit.MINUTES.toMinutes(t));
195	>	MINUTES.toMinutes(t));
196		assertEquals(t,
197	<	TimeUnit.SECONDS.toMinutes(t*60));
197	>	SECONDS.toMinutes(t*60));
198		assertEquals(t,
199	<	TimeUnit.MILLISECONDS.toMinutes(t*1000L*60));
199	>	MILLISECONDS.toMinutes(t*1000L*60));
200		assertEquals(t,
201	<	TimeUnit.MICROSECONDS.toMinutes(t*1000000L*60));
201	>	MICROSECONDS.toMinutes(t*1000000L*60));
202		assertEquals(t,
203	<	TimeUnit.NANOSECONDS.toMinutes(t*1000000000L*60));
203	>	NANOSECONDS.toMinutes(t*1000000000L*60));
204		}
205		}
206
#	Line 240 | Line 211 | public class TimeUnitTest extends JSR166
211		public void testToHours() {
212		for (long t = 0; t < 88888; ++t) {
213		assertEquals(t*24,
214	<	TimeUnit.DAYS.toHours(t));
214	>	DAYS.toHours(t));
215		assertEquals(t,
216	<	TimeUnit.HOURS.toHours(t));
216	>	HOURS.toHours(t));
217		assertEquals(t,
218	<	TimeUnit.MINUTES.toHours(t*60));
218	>	MINUTES.toHours(t*60));
219		assertEquals(t,
220	<	TimeUnit.SECONDS.toHours(t*60*60));
220	>	SECONDS.toHours(t*60*60));
221		assertEquals(t,
222	<	TimeUnit.MILLISECONDS.toHours(t*1000L*60*60));
222	>	MILLISECONDS.toHours(t*1000L*60*60));
223		assertEquals(t,
224	<	TimeUnit.MICROSECONDS.toHours(t*1000000L*60*60));
224	>	MICROSECONDS.toHours(t*1000000L*60*60));
225		assertEquals(t,
226	<	TimeUnit.NANOSECONDS.toHours(t*1000000000L*60*60));
226	>	NANOSECONDS.toHours(t*1000000000L*60*60));
227		}
228		}
229
#	Line 263 | Line 234 | public class TimeUnitTest extends JSR166
234		public void testToDays() {
235		for (long t = 0; t < 88888; ++t) {
236		assertEquals(t,
237	<	TimeUnit.DAYS.toDays(t));
237	>	DAYS.toDays(t));
238		assertEquals(t,
239	<	TimeUnit.HOURS.toDays(t*24));
239	>	HOURS.toDays(t*24));
240		assertEquals(t,
241	<	TimeUnit.MINUTES.toDays(t*60*24));
241	>	MINUTES.toDays(t*60*24));
242		assertEquals(t,
243	<	TimeUnit.SECONDS.toDays(t*60*60*24));
243	>	SECONDS.toDays(t*60*60*24));
244		assertEquals(t,
245	<	TimeUnit.MILLISECONDS.toDays(t*1000L*60*60*24));
245	>	MILLISECONDS.toDays(t*1000L*60*60*24));
246		assertEquals(t,
247	<	TimeUnit.MICROSECONDS.toDays(t*1000000L*60*60*24));
247	>	MICROSECONDS.toDays(t*1000000L*60*60*24));
248		assertEquals(t,
249	<	TimeUnit.NANOSECONDS.toDays(t*1000000000L*60*60*24));
249	>	NANOSECONDS.toDays(t*1000000000L*60*60*24));
250		}
251		}
252
282	–
253		/**
254		* convert saturates positive too-large values to Long.MAX_VALUE
255		* and negative to LONG.MIN_VALUE
256		*/
257		public void testConvertSaturate() {
258		assertEquals(Long.MAX_VALUE,
259	<	TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
290	<	TimeUnit.SECONDS));
259	>	NANOSECONDS.convert(Long.MAX_VALUE / 2, SECONDS));
260		assertEquals(Long.MIN_VALUE,
261	<	TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
293	<	TimeUnit.SECONDS));
261	>	NANOSECONDS.convert(-Long.MAX_VALUE / 4, SECONDS));
262		assertEquals(Long.MAX_VALUE,
263	<	TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
296	<	TimeUnit.MINUTES));
263	>	NANOSECONDS.convert(Long.MAX_VALUE / 2, MINUTES));
264		assertEquals(Long.MIN_VALUE,
265	<	TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
299	<	TimeUnit.MINUTES));
265	>	NANOSECONDS.convert(-Long.MAX_VALUE / 4, MINUTES));
266		assertEquals(Long.MAX_VALUE,
267	<	TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
302	<	TimeUnit.HOURS));
267	>	NANOSECONDS.convert(Long.MAX_VALUE / 2, HOURS));
268		assertEquals(Long.MIN_VALUE,
269	<	TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
305	<	TimeUnit.HOURS));
269	>	NANOSECONDS.convert(-Long.MAX_VALUE / 4, HOURS));
270		assertEquals(Long.MAX_VALUE,
271	<	TimeUnit.NANOSECONDS.convert(Long.MAX_VALUE / 2,
308	<	TimeUnit.DAYS));
271	>	NANOSECONDS.convert(Long.MAX_VALUE / 2, DAYS));
272		assertEquals(Long.MIN_VALUE,
273	<	TimeUnit.NANOSECONDS.convert(-Long.MAX_VALUE / 4,
311	<	TimeUnit.DAYS));
273	>	NANOSECONDS.convert(-Long.MAX_VALUE / 4, DAYS));
274		}
275
276		/**
#	Line 317 | Line 279 | public class TimeUnitTest extends JSR166
279		*/
280		public void testToNanosSaturate() {
281		assertEquals(Long.MAX_VALUE,
282	<	TimeUnit.MILLISECONDS.toNanos(Long.MAX_VALUE / 2));
282	>	MILLISECONDS.toNanos(Long.MAX_VALUE / 2));
283		assertEquals(Long.MIN_VALUE,
284	<	TimeUnit.MILLISECONDS.toNanos(-Long.MAX_VALUE / 3));
284	>	MILLISECONDS.toNanos(-Long.MAX_VALUE / 3));
285		}
286
325	–
287		/**
288	<	* toString returns string containing common name of unit
288	>	* toString returns name of unit
289		*/
290		public void testToString() {
291	<	String s = TimeUnit.SECONDS.toString();
331	<	assertTrue(s.indexOf("ECOND") >= 0);
291	>	assertEquals("SECONDS", SECONDS.toString());
292		}
293
294	+	/**
295	+	* name returns name of unit
296	+	*/
297	+	public void testName() {
298	+	assertEquals("SECONDS", SECONDS.name());
299	+	}
300
301		/**
302	<	*  Timed wait without holding lock throws
303	<	*  IllegalMonitorStateException
302	>	* Timed wait without holding lock throws
303	>	* IllegalMonitorStateException
304		*/
305	<	public void testTimedWait_IllegalMonitorException() throws Exception {
306	<	Thread t = new Thread(new CheckedRunnable() {
305	>	public void testTimedWait_IllegalMonitorException() {
306	>	Thread t = newStartedThread(new CheckedRunnable() {
307		public void realRun() throws InterruptedException {
308		Object o = new Object();
309	<	TimeUnit tu = TimeUnit.MILLISECONDS;
309	>	TimeUnit tu = MILLISECONDS;
310	>
311		try {
312	<	tu.timedWait(o,LONG_DELAY_MS);
312	>	tu.timedWait(o, LONG_DELAY_MS);
313		threadShouldThrow();
314	<	} catch (IllegalMonitorStateException success) {}}});
314	>	} catch (IllegalMonitorStateException success) {}
315	>	}});
316
317	<	t.start();
350	<	Thread.sleep(SHORT_DELAY_MS);
351	<	t.interrupt();
352	<	t.join();
317	>	awaitTermination(t);
318		}
319
320		/**
321		* timedWait throws InterruptedException when interrupted
322		*/
323	<	public void testTimedWait() throws InterruptedException {
324	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
323	>	public void testTimedWait_Interruptible() {
324	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
325	>	Thread t = newStartedThread(new CheckedRunnable() {
326		public void realRun() throws InterruptedException {
327		Object o = new Object();
328	+	TimeUnit tu = MILLISECONDS;
329	+
330	+	Thread.currentThread().interrupt();
331	+	try {
332	+	synchronized (o) {
333	+	tu.timedWait(o, LONG_DELAY_MS);
334	+	}
335	+	shouldThrow();
336	+	} catch (InterruptedException success) {}
337	+	assertFalse(Thread.interrupted());
338
339	<	TimeUnit tu = TimeUnit.MILLISECONDS;
340	<	synchronized(o) {
341	<	tu.timedWait(o,MEDIUM_DELAY_MS);
342	<	}
339	>	pleaseInterrupt.countDown();
340	>	try {
341	>	synchronized (o) {
342	>	tu.timedWait(o, LONG_DELAY_MS);
343	>	}
344	>	shouldThrow();
345	>	} catch (InterruptedException success) {}
346	>	assertFalse(Thread.interrupted());
347		}});
348	<	t.start();
349	<	Thread.sleep(SHORT_DELAY_MS);
348	>
349	>	await(pleaseInterrupt);
350	>	assertThreadStaysAlive(t);
351		t.interrupt();
352	<	t.join();
352	>	awaitTermination(t);
353		}
354
374	–
355		/**
356		* timedJoin throws InterruptedException when interrupted
357		*/
358	<	public void testTimedJoin() throws InterruptedException {
359	<	final Thread s = new Thread(new CheckedInterruptedRunnable() {
358	>	public void testTimedJoin_Interruptible() {
359	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
360	>	final Thread s = newStartedThread(new CheckedInterruptedRunnable() {
361		public void realRun() throws InterruptedException {
362	<	Thread.sleep(MEDIUM_DELAY_MS);
362	>	Thread.sleep(LONG_DELAY_MS);
363		}});
364	<	final Thread t = new Thread(new CheckedInterruptedRunnable() {
364	>	final Thread t = newStartedThread(new CheckedRunnable() {
365		public void realRun() throws InterruptedException {
366	<	TimeUnit tu = TimeUnit.MILLISECONDS;
367	<	tu.timedJoin(s, MEDIUM_DELAY_MS);
368	<	}});;
369	<	s.start();
370	<	t.start();
371	<	Thread.sleep(SHORT_DELAY_MS);
366	>	TimeUnit tu = MILLISECONDS;
367	>	Thread.currentThread().interrupt();
368	>	try {
369	>	tu.timedJoin(s, LONG_DELAY_MS);
370	>	shouldThrow();
371	>	} catch (InterruptedException success) {}
372	>	assertFalse(Thread.interrupted());
373	>
374	>	pleaseInterrupt.countDown();
375	>	try {
376	>	tu.timedJoin(s, LONG_DELAY_MS);
377	>	shouldThrow();
378	>	} catch (InterruptedException success) {}
379	>	assertFalse(Thread.interrupted());
380	>	}});
381	>
382	>	await(pleaseInterrupt);
383	>	assertThreadStaysAlive(t);
384		t.interrupt();
385	<	t.join();
385	>	awaitTermination(t);
386		s.interrupt();
387	<	s.join();
387	>	awaitTermination(s);
388		}
389
390		/**
391	<	*  timedSleep throws InterruptedException when interrupted
391	>	* timedSleep throws InterruptedException when interrupted
392		*/
393	<	public void testTimedSleep() throws InterruptedException {
394	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
393	>	public void testTimedSleep_Interruptible() {
394	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
395	>	Thread t = newStartedThread(new CheckedRunnable() {
396		public void realRun() throws InterruptedException {
397	<	TimeUnit tu = TimeUnit.MILLISECONDS;
398	<	tu.sleep(MEDIUM_DELAY_MS);
397	>	TimeUnit tu = MILLISECONDS;
398	>	Thread.currentThread().interrupt();
399	>	try {
400	>	tu.sleep(LONG_DELAY_MS);
401	>	shouldThrow();
402	>	} catch (InterruptedException success) {}
403	>	assertFalse(Thread.interrupted());
404	>
405	>	pleaseInterrupt.countDown();
406	>	try {
407	>	tu.sleep(LONG_DELAY_MS);
408	>	shouldThrow();
409	>	} catch (InterruptedException success) {}
410	>	assertFalse(Thread.interrupted());
411		}});
412
413	<	t.start();
414	<	Thread.sleep(SHORT_DELAY_MS);
413	>	await(pleaseInterrupt);
414	>	assertThreadStaysAlive(t);
415		t.interrupt();
416	<	t.join();
416	>	awaitTermination(t);
417		}
418
419		/**
420		* a deserialized serialized unit is the same instance
421		*/
422		public void testSerialization() throws Exception {
423	<	TimeUnit q = TimeUnit.MILLISECONDS;
424	<
419	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
420	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
421	<	out.writeObject(q);
422	<	out.close();
423	<
424	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
425	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
426	<	TimeUnit r = (TimeUnit)in.readObject();
427	<	assertSame(q, r);
423	>	TimeUnit x = MILLISECONDS;
424	>	assertSame(x, serialClone(x));
425		}
426
427		}

Diff Legend

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