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

Comparing jsr166/src/test/tck/AtomicMarkableReferenceTest.java (file contents):
Revision 1.18 by jsr166, Fri Jun 10 20:01:21 2011 UTC vs.
Revision 1.21 by jsr166, Wed Dec 31 19:21:20 2014 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
9   import java.util.concurrent.atomic.AtomicMarkableReference;
10  
11 + import junit.framework.Test;
12 + import junit.framework.TestSuite;
13 +
14   public class AtomicMarkableReferenceTest extends JSR166TestCase {
15      public static void main(String[] args) {
16          junit.textui.TestRunner.run(suite());
# Line 104 | Line 106 | public class AtomicMarkableReferenceTest
106          assertTrue(ai.compareAndSet(one, two, false, false));
107          t.join(LONG_DELAY_MS);
108          assertFalse(t.isAlive());
109 <        assertSame(ai.getReference(), three);
109 >        assertSame(three, ai.getReference());
110          assertFalse(ai.isMarked());
111      }
112  
# Line 124 | Line 126 | public class AtomicMarkableReferenceTest
126          assertTrue(ai.compareAndSet(one, one, false, true));
127          t.join(LONG_DELAY_MS);
128          assertFalse(t.isAlive());
129 <        assertSame(ai.getReference(), one);
129 >        assertSame(one, ai.getReference());
130          assertFalse(ai.isMarked());
131      }
132  
# Line 139 | Line 141 | public class AtomicMarkableReferenceTest
141          assertFalse(ai.isMarked());
142          assertFalse(mark[0]);
143  
144 <        while (!ai.weakCompareAndSet(one, two, false, false));
144 >        do {} while (!ai.weakCompareAndSet(one, two, false, false));
145          assertSame(two, ai.get(mark));
146          assertFalse(mark[0]);
147  
148 <        while (!ai.weakCompareAndSet(two, m3, false, true));
148 >        do {} while (!ai.weakCompareAndSet(two, m3, false, true));
149          assertSame(m3, ai.get(mark));
150          assertTrue(mark[0]);
151      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines