ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadLocalTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadLocalTest.java (file contents):
Revision 1.5 by dl, Sat Jan 10 20:37:20 2004 UTC vs.
Revision 1.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC

# Line 2 | Line 2
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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 11 | Line 11 | import java.util.concurrent.Semaphore;
11  
12   public class ThreadLocalTest extends JSR166TestCase {
13      public static void main(String[] args) {
14 <        junit.textui.TestRunner.run(suite());  
14 >        junit.textui.TestRunner.run(suite());
15      }
16 <    
16 >
17      public static Test suite() {
18 <        return new TestSuite(ThreadLocalTest.class);
18 >        return new TestSuite(ThreadLocalTest.class);
19      }
20  
21      static ThreadLocal<Integer> tl = new ThreadLocal<Integer>() {
# Line 29 | Line 29 | public class ThreadLocalTest extends JSR
29              protected Integer initialValue() {
30                  return zero;
31              }
32 <            
32 >
33              protected Integer childValue(Integer parentValue) {
34                  return new Integer(parentValue.intValue() + 1);
35              }
# Line 68 | Line 68 | public class ThreadLocalTest extends JSR
68                  child.start();
69              }
70              Thread.currentThread().yield();
71 <            
71 >
72              int threadId = itl.get().intValue();
73              for (int j = 0; j < threadId; j++) {
74                  x[threadId]++;
75                  Thread.currentThread().yield();
76              }
77 <            
77 >
78              if (child != null) { // Wait for child (if any)
79                  try {
80                      child.join();
81 <                } catch(InterruptedException e) {
82 <                    threadUnexpectedException();
81 >                } catch (InterruptedException e) {
82 >                    threadUnexpectedException(e);
83                  }
84              }
85          }
# 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];
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();
95 >        progenitor.start();
96 >        progenitor.join();
97 >        for (int i = 0; i < threadCount; i++) {
98 >            assertEquals(i, x[i]);
99          }
100      }
101   }
106 –

Diff Legend

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