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.11 by jsr166, Tue Nov 17 06:58:50 2009 UTC vs.
Revision 1.12 by jsr166, Sat Nov 21 02:07:26 2009 UTC

# Line 22 | Line 22 | public class AtomicMarkableReferenceTest
22       */
23      public void testConstructor() {
24          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
25 <        assertEquals(one,ai.getReference());
26 <        assertFalse(ai.isMarked());
25 >        assertEquals(one,ai.getReference());
26 >        assertFalse(ai.isMarked());
27          AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
28 <        assertNull(a2.getReference());
29 <        assertTrue(a2.isMarked());
28 >        assertNull(a2.getReference());
29 >        assertTrue(a2.isMarked());
30  
31      }
32  
# Line 36 | Line 36 | public class AtomicMarkableReferenceTest
36      public void testGetSet() {
37          boolean[] mark = new boolean[1];
38          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
39 <        assertEquals(one,ai.getReference());
40 <        assertFalse(ai.isMarked());
39 >        assertEquals(one,ai.getReference());
40 >        assertFalse(ai.isMarked());
41          assertEquals(one, ai.get(mark));
42          assertFalse(mark[0]);
43 <        ai.set(two, false);
44 <        assertEquals(two,ai.getReference());
45 <        assertFalse(ai.isMarked());
43 >        ai.set(two, false);
44 >        assertEquals(two,ai.getReference());
45 >        assertFalse(ai.isMarked());
46          assertEquals(two, ai.get(mark));
47          assertFalse(mark[0]);
48 <        ai.set(one, true);
49 <        assertEquals(one,ai.getReference());
50 <        assertTrue(ai.isMarked());
48 >        ai.set(one, true);
49 >        assertEquals(one,ai.getReference());
50 >        assertTrue(ai.isMarked());
51          assertEquals(one, ai.get(mark));
52          assertTrue(mark[0]);
53      }
# Line 60 | Line 60 | public class AtomicMarkableReferenceTest
60          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
61          assertFalse(ai.isMarked());
62          assertTrue(ai.attemptMark(one, true));
63 <        assertTrue(ai.isMarked());
63 >        assertTrue(ai.isMarked());
64          assertEquals(one, ai.get(mark));
65          assertTrue(mark[0]);
66      }
# Line 72 | Line 72 | public class AtomicMarkableReferenceTest
72      public void testCompareAndSet() {
73          boolean[] mark = new boolean[1];
74          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
75 <        assertEquals(one, ai.get(mark));
75 >        assertEquals(one, ai.get(mark));
76          assertFalse(ai.isMarked());
77 <        assertFalse(mark[0]);
77 >        assertFalse(mark[0]);
78  
79          assertTrue(ai.compareAndSet(one, two, false, false));
80 <        assertEquals(two, ai.get(mark));
81 <        assertFalse(mark[0]);
80 >        assertEquals(two, ai.get(mark));
81 >        assertFalse(mark[0]);
82  
83          assertTrue(ai.compareAndSet(two, m3, false, true));
84 <        assertEquals(m3, ai.get(mark));
85 <        assertTrue(mark[0]);
84 >        assertEquals(m3, ai.get(mark));
85 >        assertTrue(mark[0]);
86  
87          assertFalse(ai.compareAndSet(two, m3, true, true));
88 <        assertEquals(m3, ai.get(mark));
89 <        assertTrue(mark[0]);
88 >        assertEquals(m3, ai.get(mark));
89 >        assertTrue(mark[0]);
90      }
91  
92      /**
# Line 136 | Line 136 | public class AtomicMarkableReferenceTest
136      public void testWeakCompareAndSet() {
137          boolean[] mark = new boolean[1];
138          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
139 <        assertEquals(one, ai.get(mark));
139 >        assertEquals(one, ai.get(mark));
140          assertFalse(ai.isMarked());
141 <        assertFalse(mark[0]);
141 >        assertFalse(mark[0]);
142  
143          while (!ai.weakCompareAndSet(one, two, false, false));
144 <        assertEquals(two, ai.get(mark));
145 <        assertFalse(mark[0]);
144 >        assertEquals(two, ai.get(mark));
145 >        assertFalse(mark[0]);
146  
147          while (!ai.weakCompareAndSet(two, m3, false, true));
148 <        assertEquals(m3, ai.get(mark));
149 <        assertTrue(mark[0]);
148 >        assertEquals(m3, ai.get(mark));
149 >        assertTrue(mark[0]);
150      }
151  
152   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines