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

Comparing jsr166/src/test/tck/AtomicReferenceFieldUpdaterTest.java (file contents):
Revision 1.13 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.16 by jsr166, Sat Nov 21 02:07:26 2009 UTC

# Line 73 | Line 73 | public class AtomicReferenceFieldUpdater
73              return;
74          }
75          x = one;
76 <        assertEquals(one,a.get(this));
77 <        a.set(this,two);
78 <        assertEquals(two,a.get(this));
79 <        a.set(this,m3);
80 <        assertEquals(m3,a.get(this));
76 >        assertEquals(one,a.get(this));
77 >        a.set(this,two);
78 >        assertEquals(two,a.get(this));
79 >        a.set(this,m3);
80 >        assertEquals(m3,a.get(this));
81      }
82  
83      /**
# Line 91 | Line 91 | public class AtomicReferenceFieldUpdater
91              return;
92          }
93          x = one;
94 <        assertEquals(one,a.get(this));
95 <        a.lazySet(this,two);
96 <        assertEquals(two,a.get(this));
97 <        a.lazySet(this,m3);
98 <        assertEquals(m3,a.get(this));
94 >        assertEquals(one,a.get(this));
95 >        a.lazySet(this,two);
96 >        assertEquals(two,a.get(this));
97 >        a.lazySet(this,m3);
98 >        assertEquals(m3,a.get(this));
99      }
100  
101      /**
# Line 109 | Line 109 | public class AtomicReferenceFieldUpdater
109              return;
110          }
111          x = one;
112 <        assertTrue(a.compareAndSet(this,one,two));
113 <        assertTrue(a.compareAndSet(this,two,m4));
114 <        assertEquals(m4,a.get(this));
115 <        assertFalse(a.compareAndSet(this,m5,seven));
116 <        assertFalse((seven == a.get(this)));
117 <        assertTrue(a.compareAndSet(this,m4,seven));
118 <        assertEquals(seven,a.get(this));
112 >        assertTrue(a.compareAndSet(this,one,two));
113 >        assertTrue(a.compareAndSet(this,two,m4));
114 >        assertEquals(m4,a.get(this));
115 >        assertFalse(a.compareAndSet(this,m5,seven));
116 >        assertFalse((seven == a.get(this)));
117 >        assertTrue(a.compareAndSet(this,m4,seven));
118 >        assertEquals(seven,a.get(this));
119      }
120  
121      /**
122       * compareAndSet in one thread enables another waiting for value
123       * to succeed
124       */
125 <    public void testCompareAndSetInMultipleThreads() {
125 >    public void testCompareAndSetInMultipleThreads() throws Exception {
126          x = one;
127          final AtomicReferenceFieldUpdater<AtomicReferenceFieldUpdaterTest, Integer>a;
128          try {
# Line 131 | Line 131 | public class AtomicReferenceFieldUpdater
131              return;
132          }
133  
134 <        Thread t = new Thread(new Runnable() {
135 <                public void run() {
136 <                    while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
137 <                }});
138 <        try {
139 <            t.start();
140 <            assertTrue(a.compareAndSet(this, one, two));
141 <            t.join(LONG_DELAY_MS);
142 <            assertFalse(t.isAlive());
143 <            assertEquals(a.get(this), three);
144 <        }
145 <        catch (Exception e) {
146 <            unexpectedException();
147 <        }
134 >        Thread t = new Thread(new CheckedRunnable() {
135 >            public void realRun() {
136 >                while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three))
137 >                    Thread.yield();
138 >            }});
139 >
140 >        t.start();
141 >        assertTrue(a.compareAndSet(this, one, two));
142 >        t.join(LONG_DELAY_MS);
143 >        assertFalse(t.isAlive());
144 >        assertEquals(a.get(this), three);
145      }
146  
147      /**
# Line 159 | Line 156 | public class AtomicReferenceFieldUpdater
156              return;
157          }
158          x = one;
159 <        while (!a.weakCompareAndSet(this,one,two));
160 <        while (!a.weakCompareAndSet(this,two,m4));
161 <        assertEquals(m4,a.get(this));
162 <        while (!a.weakCompareAndSet(this,m4,seven));
163 <        assertEquals(seven,a.get(this));
159 >        while (!a.weakCompareAndSet(this,one,two));
160 >        while (!a.weakCompareAndSet(this,two,m4));
161 >        assertEquals(m4,a.get(this));
162 >        while (!a.weakCompareAndSet(this,m4,seven));
163 >        assertEquals(seven,a.get(this));
164      }
165  
166      /**
# Line 177 | Line 174 | public class AtomicReferenceFieldUpdater
174              return;
175          }
176          x = one;
177 <        assertEquals(one,a.getAndSet(this, zero));
178 <        assertEquals(zero,a.getAndSet(this,m10));
179 <        assertEquals(m10,a.getAndSet(this,1));
177 >        assertEquals(one,a.getAndSet(this, zero));
178 >        assertEquals(zero,a.getAndSet(this,m10));
179 >        assertEquals(m10,a.getAndSet(this,1));
180      }
181  
182   }

Diff Legend

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