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

Comparing jsr166/src/test/tck/AtomicIntegerTest.java (file contents):
Revision 1.13 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.15 by jsr166, Tue Nov 17 03:12:51 2009 UTC

# Line 21 | Line 21 | public class AtomicIntegerTest extends J
21      /**
22       * constructor initializes to given value
23       */
24 <    public void testConstructor(){
24 >    public void testConstructor() {
25          AtomicInteger ai = new AtomicInteger(1);
26          assertEquals(1,ai.get());
27      }
# Line 29 | Line 29 | public class AtomicIntegerTest extends J
29      /**
30       * default constructed initializes to zero
31       */
32 <    public void testConstructor2(){
32 >    public void testConstructor2() {
33          AtomicInteger ai = new AtomicInteger();
34          assertEquals(0,ai.get());
35      }
# Line 37 | Line 37 | public class AtomicIntegerTest extends J
37      /**
38       * get returns the last value set
39       */
40 <    public void testGetSet(){
40 >    public void testGetSet() {
41          AtomicInteger ai = new AtomicInteger(1);
42          assertEquals(1,ai.get());
43          ai.set(2);
# Line 50 | Line 50 | public class AtomicIntegerTest extends J
50      /**
51       * get returns the last value lazySet in same thread
52       */
53 <    public void testGetLazySet(){
53 >    public void testGetLazySet() {
54          AtomicInteger ai = new AtomicInteger(1);
55          assertEquals(1,ai.get());
56          ai.lazySet(2);
# Line 62 | Line 62 | public class AtomicIntegerTest extends J
62      /**
63       * compareAndSet succeeds in changing value if equal to expected else fails
64       */
65 <    public void testCompareAndSet(){
65 >    public void testCompareAndSet() {
66          AtomicInteger ai = new AtomicInteger(1);
67          assertTrue(ai.compareAndSet(1,2));
68          assertTrue(ai.compareAndSet(2,-4));
# Line 77 | Line 77 | public class AtomicIntegerTest extends J
77       * compareAndSet in one thread enables another waiting for value
78       * to succeed
79       */
80 <    public void testCompareAndSetInMultipleThreads() {
80 >    public void testCompareAndSetInMultipleThreads() throws Exception {
81          final AtomicInteger ai = new AtomicInteger(1);
82          Thread t = new Thread(new Runnable() {
83                  public void run() {
84                      while (!ai.compareAndSet(2, 3)) Thread.yield();
85                  }});
86 <        try {
87 <            t.start();
88 <            assertTrue(ai.compareAndSet(1, 2));
89 <            t.join(LONG_DELAY_MS);
90 <            assertFalse(t.isAlive());
91 <            assertEquals(ai.get(), 3);
92 <        }
93 <        catch (Exception e) {
94 <            unexpectedException();
95 <        }
86 >
87 >        t.start();
88 >        assertTrue(ai.compareAndSet(1, 2));
89 >        t.join(LONG_DELAY_MS);
90 >        assertFalse(t.isAlive());
91 >        assertEquals(ai.get(), 3);
92      }
93  
94      /**
95       * repeated weakCompareAndSet succeeds in changing value when equal
96       * to expected
97       */
98 <    public void testWeakCompareAndSet(){
98 >    public void testWeakCompareAndSet() {
99          AtomicInteger ai = new AtomicInteger(1);
100          while (!ai.weakCompareAndSet(1,2));
101          while (!ai.weakCompareAndSet(2,-4));
# Line 111 | Line 107 | public class AtomicIntegerTest extends J
107      /**
108       * getAndSet returns previous value and sets to given value
109       */
110 <    public void testGetAndSet(){
110 >    public void testGetAndSet() {
111          AtomicInteger ai = new AtomicInteger(1);
112          assertEquals(1,ai.getAndSet(0));
113          assertEquals(0,ai.getAndSet(-10));
# Line 121 | Line 117 | public class AtomicIntegerTest extends J
117      /**
118       * getAndAdd returns previous value and adds given value
119       */
120 <    public void testGetAndAdd(){
120 >    public void testGetAndAdd() {
121          AtomicInteger ai = new AtomicInteger(1);
122          assertEquals(1,ai.getAndAdd(2));
123          assertEquals(3,ai.get());
# Line 132 | Line 128 | public class AtomicIntegerTest extends J
128      /**
129       * getAndDecrement returns previous value and decrements
130       */
131 <    public void testGetAndDecrement(){
131 >    public void testGetAndDecrement() {
132          AtomicInteger ai = new AtomicInteger(1);
133          assertEquals(1,ai.getAndDecrement());
134          assertEquals(0,ai.getAndDecrement());
# Line 142 | Line 138 | public class AtomicIntegerTest extends J
138      /**
139       * getAndIncrement returns previous value and increments
140       */
141 <    public void testGetAndIncrement(){
141 >    public void testGetAndIncrement() {
142          AtomicInteger ai = new AtomicInteger(1);
143          assertEquals(1,ai.getAndIncrement());
144          assertEquals(2,ai.get());
# Line 156 | Line 152 | public class AtomicIntegerTest extends J
152      /**
153       * addAndGet adds given value to current, and returns current value
154       */
155 <    public void testAddAndGet(){
155 >    public void testAddAndGet() {
156          AtomicInteger ai = new AtomicInteger(1);
157          assertEquals(3,ai.addAndGet(2));
158          assertEquals(3,ai.get());
# Line 167 | Line 163 | public class AtomicIntegerTest extends J
163      /**
164       * decrementAndGet decrements and returns current value
165       */
166 <    public void testDecrementAndGet(){
166 >    public void testDecrementAndGet() {
167          AtomicInteger ai = new AtomicInteger(1);
168          assertEquals(0,ai.decrementAndGet());
169          assertEquals(-1,ai.decrementAndGet());
# Line 178 | Line 174 | public class AtomicIntegerTest extends J
174      /**
175       * incrementAndGet increments and returns current value
176       */
177 <    public void testIncrementAndGet(){
177 >    public void testIncrementAndGet() {
178          AtomicInteger ai = new AtomicInteger(1);
179          assertEquals(2,ai.incrementAndGet());
180          assertEquals(2,ai.get());
# Line 192 | Line 188 | public class AtomicIntegerTest extends J
188      /**
189       * a deserialized serialized atomic holds same value
190       */
191 <    public void testSerialization() {
191 >    public void testSerialization() throws Exception {
192          AtomicInteger l = new AtomicInteger();
193  
194 <        try {
195 <            l.set(22);
196 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
197 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
198 <            out.writeObject(l);
199 <            out.close();
200 <
201 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
202 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
203 <            AtomicInteger r = (AtomicInteger) in.readObject();
208 <            assertEquals(l.get(), r.get());
209 <        } catch (Exception e){
210 <            unexpectedException();
211 <        }
194 >        l.set(22);
195 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
196 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
197 >        out.writeObject(l);
198 >        out.close();
199 >
200 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
201 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
202 >        AtomicInteger r = (AtomicInteger) in.readObject();
203 >        assertEquals(l.get(), r.get());
204      }
205  
206      /**

Diff Legend

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