ViewVC Help

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

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

Comparing jsr166/src/test/tck/ThreadLocalTest.java (file contents):
Revision 1.9 by jsr166, Sat Nov 21 02:07:27 2009 UTC vs.
Revision 1.18 by dl, Tue Jan 26 13:33:06 2021 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	<	import junit.framework.*;
10	<	import java.util.concurrent.Semaphore;
9	>	import junit.framework.Test;
10	>	import junit.framework.TestSuite;
11
12		public class ThreadLocalTest extends JSR166TestCase {
13		public static void main(String[] args) {
14	<	junit.textui.TestRunner.run(suite());
14	>	main(suite(), args);
15		}
16
17		public static Test suite() {
18		return new TestSuite(ThreadLocalTest.class);
19		}
20
21	<	static ThreadLocal<Integer> tl = new ThreadLocal<Integer>() {
22	<	public Integer initialValue() {
21	>	static ThreadLocal<Item> tl = new ThreadLocal<Item>() {
22	>	public Item initialValue() {
23		return one;
24		}
25		};
26
27	<	static InheritableThreadLocal<Integer> itl =
28	<	new InheritableThreadLocal<Integer>() {
29	<	protected Integer initialValue() {
27	>	static InheritableThreadLocal<Item> itl =
28	>	new InheritableThreadLocal<Item>() {
29	>	protected Item initialValue() {
30		return zero;
31		}
32
33	<	protected Integer childValue(Integer parentValue) {
34	<	return new Integer(parentValue.intValue() + 1);
33	>	protected Item childValue(Item parentValue) {
34	>	return new Item(parentValue.intValue() + 1);
35		}
36		};
37
#	Line 39 | Line 39 | public class ThreadLocalTest extends JSR
39		* remove causes next access to return initial value
40		*/
41		public void testRemove() {
42	<	assertEquals(tl.get(), one);
42	>	assertSame(tl.get(), one);
43		tl.set(two);
44	<	assertEquals(tl.get(), two);
44	>	assertSame(tl.get(), two);
45		tl.remove();
46	<	assertEquals(tl.get(), one);
46	>	assertSame(tl.get(), one);
47		}
48
49		/**
#	Line 51 | Line 51 | public class ThreadLocalTest extends JSR
51		* initial value
52		*/
53		public void testRemoveITL() {
54	<	assertEquals(itl.get(), zero);
54	>	assertSame(itl.get(), zero);
55		itl.set(two);
56	<	assertEquals(itl.get(), two);
56	>	assertSame(itl.get(), two);
57		itl.remove();
58	<	assertEquals(itl.get(), zero);
58	>	assertSame(itl.get(), zero);
59		}
60
61		private class ITLThread extends Thread {
#	Line 67 | Line 67 | public class ThreadLocalTest extends JSR
67		child = new ITLThread(x);
68		child.start();
69		}
70	<	Thread.currentThread().yield();
70	>	Thread.yield();
71
72		int threadId = itl.get().intValue();
73		for (int j = 0; j < threadId; j++) {
74		x[threadId]++;
75	<	Thread.currentThread().yield();
75	>	Thread.yield();
76		}
77
78		if (child != null) { // Wait for child (if any)
#	Line 88 | Line 88 | public class ThreadLocalTest extends JSR
88		/**
89		* InheritableThreadLocal propagates generic values.
90		*/
91	<	public void testGenericITL() {
91	>	public void testGenericITL() throws InterruptedException {
92		final int threadCount = 10;
93	<	final int x[] = new int[threadCount];
93	>	final int[] x = new int[threadCount];
94		Thread progenitor = new ITLThread(x);
95	<	try {
96	<	progenitor.start();
97	<	progenitor.join();
98	<	for (int i = 0; i < threadCount; i++) {
99	<	assertEquals(i, x[i]);
100	<	}
101	<	} catch (InterruptedException e) {
102	<	unexpectedException(e);
95	>	progenitor.start();
96	>	progenitor.join();
97	>	for (int i = 0; i < threadCount; i++) {
98	>	assertEquals(i, x[i]);
99		}
100		}
101		}

Diff Legend

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