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.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.16 by jsr166, Wed Dec 31 20:29:13 2014 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) {
#	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 90 | Line 90 | public class ThreadLocalTest extends JSR
90		*/
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		progenitor.start();
96		progenitor.join();

Diff Legend

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