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.4 by dl, Sat Sep 20 18:20:08 2003 UTC vs.
Revision 1.20 by jsr166, Fri May 27 19:12:09 2011 UTC

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

Diff Legend

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