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

Comparing jsr166/src/test/tck/CountDownLatchTest.java (file contents):
Revision 1.7 by dl, Sat Jan 10 01:41:59 2004 UTC vs.
Revision 1.10 by jsr166, Mon Nov 16 05:30:07 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 12 | Line 12 | import java.util.concurrent.*;
12  
13   public class CountDownLatchTest extends JSR166TestCase {
14      public static void main(String[] args) {
15 <        junit.textui.TestRunner.run (suite());  
15 >        junit.textui.TestRunner.run (suite());
16      }
17      public static Test suite() {
18          return new TestSuite(CountDownLatchTest.class);
# Line 25 | Line 25 | public class CountDownLatchTest extends
25          try {
26              new CountDownLatch(-1);
27              shouldThrow();
28 <        } catch(IllegalArgumentException success){}
28 >        } catch (IllegalArgumentException success) {}
29      }
30  
31      /**
# Line 62 | Line 62 | public class CountDownLatchTest extends
62                          threadAssertTrue(l.getCount() > 0);
63                          l.await();
64                          threadAssertTrue(l.getCount() == 0);
65 <                    } catch(InterruptedException e){
65 >                    } catch (InterruptedException e) {
66                          threadUnexpectedException();
67                      }
68                  }
# Line 76 | Line 76 | public class CountDownLatchTest extends
76              l.countDown();
77              assertEquals(l.getCount(), 0);
78              t.join();
79 <        } catch (InterruptedException e){
79 >        } catch (InterruptedException e) {
80              unexpectedException();
81          }
82      }
83 <    
83 >
84  
85      /**
86       * timed await returns after countDown to zero
# Line 93 | Line 93 | public class CountDownLatchTest extends
93                      try {
94                          threadAssertTrue(l.getCount() > 0);
95                          threadAssertTrue(l.await(SMALL_DELAY_MS, TimeUnit.MILLISECONDS));
96 <                    } catch(InterruptedException e){
96 >                    } catch (InterruptedException e) {
97                          threadUnexpectedException();
98                      }
99                  }
# Line 107 | Line 107 | public class CountDownLatchTest extends
107              l.countDown();
108              assertEquals(l.getCount(), 0);
109              t.join();
110 <        } catch (InterruptedException e){
110 >        } catch (InterruptedException e) {
111              unexpectedException();
112          }
113      }
114 <    
114 >
115      /**
116       * await throws IE if interrupted before counted down
117       */
# Line 123 | Line 123 | public class CountDownLatchTest extends
123                          threadAssertTrue(l.getCount() > 0);
124                          l.await();
125                          threadShouldThrow();
126 <                    } catch(InterruptedException success){}
126 >                    } catch (InterruptedException success) {}
127                  }
128              });
129          t.start();
# Line 131 | Line 131 | public class CountDownLatchTest extends
131              assertEquals(l.getCount(), 1);
132              t.interrupt();
133              t.join();
134 <        } catch (InterruptedException e){
134 >        } catch (InterruptedException e) {
135              unexpectedException();
136          }
137      }
# Line 146 | Line 146 | public class CountDownLatchTest extends
146                      try {
147                          threadAssertTrue(l.getCount() > 0);
148                          l.await(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
149 <                        threadShouldThrow();                        
150 <                    } catch(InterruptedException success){}
149 >                        threadShouldThrow();
150 >                    } catch (InterruptedException success) {}
151                  }
152              });
153          t.start();
# Line 156 | Line 156 | public class CountDownLatchTest extends
156              assertEquals(l.getCount(), 1);
157              t.interrupt();
158              t.join();
159 <        } catch (InterruptedException e){
159 >        } catch (InterruptedException e) {
160              unexpectedException();
161          }
162      }
# Line 172 | Line 172 | public class CountDownLatchTest extends
172                          threadAssertTrue(l.getCount() > 0);
173                          threadAssertFalse(l.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
174                          threadAssertTrue(l.getCount() > 0);
175 <                    } catch(InterruptedException ie){
175 >                    } catch (InterruptedException ie) {
176                          threadUnexpectedException();
177                      }
178                  }
# Line 181 | Line 181 | public class CountDownLatchTest extends
181          try {
182              assertEquals(l.getCount(), 1);
183              t.join();
184 <        } catch (InterruptedException e){
184 >        } catch (InterruptedException e) {
185              unexpectedException();
186          }
187      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines