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.14 by jsr166, Tue Nov 17 03:12:51 2009 UTC vs.
Revision 1.18 by jsr166, Tue Dec 1 09:56:28 2009 UTC

# Line 31 | Line 31 | public class AtomicReferenceFieldUpdater
31                  a = AtomicReferenceFieldUpdater.newUpdater
32                  (AtomicReferenceFieldUpdaterTest.class, Integer.class, "y");
33              shouldThrow();
34 <        }
35 <        catch (RuntimeException rt) {}
34 >        } catch (RuntimeException success) {}
35      }
36  
37  
# Line 45 | Line 44 | public class AtomicReferenceFieldUpdater
44                  a = AtomicReferenceFieldUpdater.newUpdater
45                  (AtomicReferenceFieldUpdaterTest.class, Integer.class, "z");
46              shouldThrow();
47 <        }
49 <        catch (RuntimeException rt) {}
47 >        } catch (RuntimeException success) {}
48      }
49  
50      /**
# Line 58 | Line 56 | public class AtomicReferenceFieldUpdater
56                  a = AtomicReferenceFieldUpdater.newUpdater
57                  (AtomicReferenceFieldUpdaterTest.class, Integer.class, "w");
58              shouldThrow();
59 <        }
62 <        catch (RuntimeException rt) {}
59 >        } catch (RuntimeException success) {}
60      }
61  
62      /**
# Line 73 | Line 70 | public class AtomicReferenceFieldUpdater
70              return;
71          }
72          x = one;
73 <        assertEquals(one,a.get(this));
74 <        a.set(this,two);
75 <        assertEquals(two,a.get(this));
76 <        a.set(this,m3);
77 <        assertEquals(m3,a.get(this));
73 >        assertSame(one,a.get(this));
74 >        a.set(this,two);
75 >        assertSame(two,a.get(this));
76 >        a.set(this,m3);
77 >        assertSame(m3,a.get(this));
78      }
79  
80      /**
# Line 91 | Line 88 | public class AtomicReferenceFieldUpdater
88              return;
89          }
90          x = one;
91 <        assertEquals(one,a.get(this));
92 <        a.lazySet(this,two);
93 <        assertEquals(two,a.get(this));
94 <        a.lazySet(this,m3);
95 <        assertEquals(m3,a.get(this));
91 >        assertSame(one,a.get(this));
92 >        a.lazySet(this,two);
93 >        assertSame(two,a.get(this));
94 >        a.lazySet(this,m3);
95 >        assertSame(m3,a.get(this));
96      }
97  
98      /**
# Line 109 | Line 106 | public class AtomicReferenceFieldUpdater
106              return;
107          }
108          x = one;
109 <        assertTrue(a.compareAndSet(this,one,two));
110 <        assertTrue(a.compareAndSet(this,two,m4));
111 <        assertEquals(m4,a.get(this));
112 <        assertFalse(a.compareAndSet(this,m5,seven));
113 <        assertFalse((seven == a.get(this)));
114 <        assertTrue(a.compareAndSet(this,m4,seven));
115 <        assertEquals(seven,a.get(this));
109 >        assertTrue(a.compareAndSet(this,one,two));
110 >        assertTrue(a.compareAndSet(this,two,m4));
111 >        assertSame(m4,a.get(this));
112 >        assertFalse(a.compareAndSet(this,m5,seven));
113 >        assertFalse(seven == a.get(this));
114 >        assertTrue(a.compareAndSet(this,m4,seven));
115 >        assertSame(seven,a.get(this));
116      }
117  
118      /**
# Line 131 | Line 128 | public class AtomicReferenceFieldUpdater
128              return;
129          }
130  
131 <        Thread t = new Thread(new Runnable() {
132 <                public void run() {
133 <                    while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three)) Thread.yield();
134 <                }});
131 >        Thread t = new Thread(new CheckedRunnable() {
132 >            public void realRun() {
133 >                while (!a.compareAndSet(AtomicReferenceFieldUpdaterTest.this, two, three))
134 >                    Thread.yield();
135 >            }});
136  
137          t.start();
138          assertTrue(a.compareAndSet(this, one, two));
139          t.join(LONG_DELAY_MS);
140          assertFalse(t.isAlive());
141 <        assertEquals(a.get(this), three);
141 >        assertSame(a.get(this), three);
142      }
143  
144      /**
# Line 155 | Line 153 | public class AtomicReferenceFieldUpdater
153              return;
154          }
155          x = one;
156 <        while (!a.weakCompareAndSet(this,one,two));
157 <        while (!a.weakCompareAndSet(this,two,m4));
158 <        assertEquals(m4,a.get(this));
159 <        while (!a.weakCompareAndSet(this,m4,seven));
160 <        assertEquals(seven,a.get(this));
156 >        while (!a.weakCompareAndSet(this,one,two));
157 >        while (!a.weakCompareAndSet(this,two,m4));
158 >        assertSame(m4,a.get(this));
159 >        while (!a.weakCompareAndSet(this,m4,seven));
160 >        assertSame(seven,a.get(this));
161      }
162  
163      /**
# Line 173 | Line 171 | public class AtomicReferenceFieldUpdater
171              return;
172          }
173          x = one;
174 <        assertEquals(one,a.getAndSet(this, zero));
175 <        assertEquals(zero,a.getAndSet(this,m10));
176 <        assertEquals(m10,a.getAndSet(this,1));
174 >        assertSame(one,a.getAndSet(this, zero));
175 >        assertSame(zero,a.getAndSet(this,m10));
176 >        assertSame(m10,a.getAndSet(this,1));
177      }
178  
179   }

Diff Legend

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