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

Comparing jsr166/src/test/tck/AtomicIntegerArrayTest.java (file contents):
Revision 1.12 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.22 by jsr166, Tue May 31 16:16:23 2011 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.atomic.*;
11 < import java.io.*;
12 < import java.util.*;
10 > import java.util.Arrays;
11 > import java.util.concurrent.atomic.AtomicIntegerArray;
12  
13   public class AtomicIntegerArrayTest extends JSR166TestCase {
14  
15 <    public static void main (String[] args) {
16 <        junit.textui.TestRunner.run (suite());
15 >    public static void main(String[] args) {
16 >        junit.textui.TestRunner.run(suite());
17      }
18      public static Test suite() {
19          return new TestSuite(AtomicIntegerArrayTest.class);
20      }
21  
23 –
22      /**
23       * constructor creates array of given size with all elements zero
24       */
# Line 37 | Line 35 | public class AtomicIntegerArrayTest exte
35          try {
36              int[] a = null;
37              AtomicIntegerArray ai = new AtomicIntegerArray(a);
38 <        } catch (NullPointerException success) {
39 <        } catch (Exception ex) {
42 <            unexpectedException();
43 <        }
38 >            shouldThrow();
39 >        } catch (NullPointerException success) {}
40      }
41  
42      /**
# Line 57 | Line 53 | public class AtomicIntegerArrayTest exte
53      /**
54       * get and set for out of bound indices throw IndexOutOfBoundsException
55       */
56 <    public void testIndexing(){
56 >    public void testIndexing() {
57          AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
58          try {
59              ai.get(SIZE);
60 <        } catch (IndexOutOfBoundsException success){
60 >            shouldThrow();
61 >        } catch (IndexOutOfBoundsException success) {
62          }
63          try {
64              ai.get(-1);
65 <        } catch (IndexOutOfBoundsException success){
65 >            shouldThrow();
66 >        } catch (IndexOutOfBoundsException success) {
67          }
68          try {
69              ai.set(SIZE, 0);
70 <        } catch (IndexOutOfBoundsException success){
70 >            shouldThrow();
71 >        } catch (IndexOutOfBoundsException success) {
72          }
73          try {
74              ai.set(-1, 0);
75 <        } catch (IndexOutOfBoundsException success){
75 >            shouldThrow();
76 >        } catch (IndexOutOfBoundsException success) {
77          }
78      }
79  
# Line 118 | Line 118 | public class AtomicIntegerArrayTest exte
118              assertTrue(ai.compareAndSet(i, 2,-4));
119              assertEquals(-4,ai.get(i));
120              assertFalse(ai.compareAndSet(i, -5,7));
121 <            assertFalse((7 == ai.get(i)));
121 >            assertEquals(-4,ai.get(i));
122              assertTrue(ai.compareAndSet(i, -4,7));
123              assertEquals(7,ai.get(i));
124          }
# Line 128 | Line 128 | public class AtomicIntegerArrayTest exte
128       * compareAndSet in one thread enables another waiting for value
129       * to succeed
130       */
131 <    public void testCompareAndSetInMultipleThreads() {
131 >    public void testCompareAndSetInMultipleThreads() throws Exception {
132          final AtomicIntegerArray a = new AtomicIntegerArray(1);
133          a.set(0, 1);
134 <        Thread t = new Thread(new Runnable() {
135 <                public void run() {
136 <                    while (!a.compareAndSet(0, 2, 3)) Thread.yield();
137 <                }});
138 <        try {
139 <            t.start();
140 <            assertTrue(a.compareAndSet(0, 1, 2));
141 <            t.join(LONG_DELAY_MS);
142 <            assertFalse(t.isAlive());
143 <            assertEquals(a.get(0), 3);
144 <        }
145 <        catch (Exception e) {
146 <            unexpectedException();
147 <        }
134 >        Thread t = new Thread(new CheckedRunnable() {
135 >            public void realRun() {
136 >                while (!a.compareAndSet(0, 2, 3))
137 >                    Thread.yield();
138 >            }});
139 >
140 >        t.start();
141 >        assertTrue(a.compareAndSet(0, 1, 2));
142 >        t.join(LONG_DELAY_MS);
143 >        assertFalse(t.isAlive());
144 >        assertEquals(a.get(0), 3);
145      }
146  
147      /**
# Line 164 | Line 161 | public class AtomicIntegerArrayTest exte
161      }
162  
163      /**
164 <     *  getAndSet returns previous value and sets to given value at given index
164 >     * getAndSet returns previous value and sets to given value at given index
165       */
166      public void testGetAndSet() {
167          AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
# Line 177 | Line 174 | public class AtomicIntegerArrayTest exte
174      }
175  
176      /**
177 <     *  getAndAdd returns previous value and adds given value
177 >     * getAndAdd returns previous value and adds given value
178       */
179      public void testGetAndAdd() {
180          AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
# Line 221 | Line 218 | public class AtomicIntegerArrayTest exte
218      }
219  
220      /**
221 <     *  addAndGet adds given value to current, and returns current value
221 >     * addAndGet adds given value to current, and returns current value
222       */
223      public void testAddAndGet() {
224          AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
# Line 249 | Line 246 | public class AtomicIntegerArrayTest exte
246      }
247  
248      /**
249 <     *  incrementAndGet increments and returns current value
249 >     * incrementAndGet increments and returns current value
250       */
251      public void testIncrementAndGet() {
252          AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
# Line 267 | Line 264 | public class AtomicIntegerArrayTest exte
264  
265      static final int COUNTDOWN = 100000;
266  
267 <    class Counter implements Runnable {
267 >    class Counter extends CheckedRunnable {
268          final AtomicIntegerArray ai;
269          volatile int counts;
270          Counter(AtomicIntegerArray a) { ai = a; }
271 <        public void run() {
271 >        public void realRun() {
272              for (;;) {
273                  boolean done = true;
274                  for (int i = 0; i < ai.length(); ++i) {
275                      int v = ai.get(i);
276 <                    threadAssertTrue(v >= 0);
276 >                    assertTrue(v >= 0);
277                      if (v != 0) {
278                          done = false;
279                          if (ai.compareAndSet(i, v, v-1))
# Line 293 | Line 290 | public class AtomicIntegerArrayTest exte
290       * Multiple threads using same array of counters successfully
291       * update a number of times equal to total count
292       */
293 <    public void testCountingInMultipleThreads() {
294 <        try {
295 <            final AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
296 <            for (int i = 0; i < SIZE; ++i)
297 <                ai.set(i, COUNTDOWN);
298 <            Counter c1 = new Counter(ai);
299 <            Counter c2 = new Counter(ai);
300 <            Thread t1 = new Thread(c1);
301 <            Thread t2 = new Thread(c2);
302 <            t1.start();
303 <            t2.start();
304 <            t1.join();
305 <            t2.join();
309 <            assertEquals(c1.counts+c2.counts, SIZE * COUNTDOWN);
310 <        }
311 <        catch (InterruptedException ie) {
312 <            unexpectedException();
313 <        }
293 >    public void testCountingInMultipleThreads() throws InterruptedException {
294 >        final AtomicIntegerArray ai = new AtomicIntegerArray(SIZE);
295 >        for (int i = 0; i < SIZE; ++i)
296 >            ai.set(i, COUNTDOWN);
297 >        Counter c1 = new Counter(ai);
298 >        Counter c2 = new Counter(ai);
299 >        Thread t1 = new Thread(c1);
300 >        Thread t2 = new Thread(c2);
301 >        t1.start();
302 >        t2.start();
303 >        t1.join();
304 >        t2.join();
305 >        assertEquals(c1.counts+c2.counts, SIZE * COUNTDOWN);
306      }
307  
316 –
308      /**
309       * a deserialized serialized array holds same values
310       */
311 <    public void testSerialization() {
312 <        AtomicIntegerArray l = new AtomicIntegerArray(SIZE);
313 <        for (int i = 0; i < SIZE; ++i)
314 <            l.set(i, -i);
315 <
316 <        try {
317 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
318 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
319 <            out.writeObject(l);
329 <            out.close();
330 <
331 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
332 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
333 <            AtomicIntegerArray r = (AtomicIntegerArray) in.readObject();
334 <            for (int i = 0; i < SIZE; ++i) {
335 <                assertEquals(l.get(i), r.get(i));
336 <            }
337 <        } catch (Exception e){
338 <            e.printStackTrace();
339 <            unexpectedException();
311 >    public void testSerialization() throws Exception {
312 >        AtomicIntegerArray x = new AtomicIntegerArray(SIZE);
313 >        for (int i = 0; i < SIZE; i++)
314 >            x.set(i, -i);
315 >        AtomicIntegerArray y = serialClone(x);
316 >        assertTrue(x != y);
317 >        assertEquals(x.length(), y.length());
318 >        for (int i = 0; i < SIZE; i++) {
319 >            assertEquals(x.get(i), y.get(i));
320          }
321      }
322  
343 –
323      /**
324       * toString returns current value.
325       */

Diff Legend

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