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.12 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.13 by jsr166, Tue Dec 1 09:56:28 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());
25 >        assertSame(one,ai.getReference());
26          assertFalse(ai.isMarked());
27          AtomicMarkableReference a2 = new AtomicMarkableReference(null, true);
28          assertNull(a2.getReference());
29          assertTrue(a2.isMarked());
30 –
30      }
31  
32      /**
# Line 36 | Line 35 | public class AtomicMarkableReferenceTest
35      public void testGetSet() {
36          boolean[] mark = new boolean[1];
37          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
38 <        assertEquals(one,ai.getReference());
38 >        assertSame(one,ai.getReference());
39          assertFalse(ai.isMarked());
40 <        assertEquals(one, ai.get(mark));
40 >        assertSame(one, ai.get(mark));
41          assertFalse(mark[0]);
42          ai.set(two, false);
43 <        assertEquals(two,ai.getReference());
43 >        assertSame(two,ai.getReference());
44          assertFalse(ai.isMarked());
45 <        assertEquals(two, ai.get(mark));
45 >        assertSame(two, ai.get(mark));
46          assertFalse(mark[0]);
47          ai.set(one, true);
48 <        assertEquals(one,ai.getReference());
48 >        assertSame(one,ai.getReference());
49          assertTrue(ai.isMarked());
50 <        assertEquals(one, ai.get(mark));
50 >        assertSame(one, ai.get(mark));
51          assertTrue(mark[0]);
52      }
53  
# Line 61 | Line 60 | public class AtomicMarkableReferenceTest
60          assertFalse(ai.isMarked());
61          assertTrue(ai.attemptMark(one, true));
62          assertTrue(ai.isMarked());
63 <        assertEquals(one, ai.get(mark));
63 >        assertSame(one, ai.get(mark));
64          assertTrue(mark[0]);
65      }
66  
# Line 72 | Line 71 | public class AtomicMarkableReferenceTest
71      public void testCompareAndSet() {
72          boolean[] mark = new boolean[1];
73          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
74 <        assertEquals(one, ai.get(mark));
74 >        assertSame(one, ai.get(mark));
75          assertFalse(ai.isMarked());
76          assertFalse(mark[0]);
77  
78          assertTrue(ai.compareAndSet(one, two, false, false));
79 <        assertEquals(two, ai.get(mark));
79 >        assertSame(two, ai.get(mark));
80          assertFalse(mark[0]);
81  
82          assertTrue(ai.compareAndSet(two, m3, false, true));
83 <        assertEquals(m3, ai.get(mark));
83 >        assertSame(m3, ai.get(mark));
84          assertTrue(mark[0]);
85  
86          assertFalse(ai.compareAndSet(two, m3, true, true));
87 <        assertEquals(m3, ai.get(mark));
87 >        assertSame(m3, ai.get(mark));
88          assertTrue(mark[0]);
89      }
90  
# Line 105 | Line 104 | public class AtomicMarkableReferenceTest
104          assertTrue(ai.compareAndSet(one, two, false, false));
105          t.join(LONG_DELAY_MS);
106          assertFalse(t.isAlive());
107 <        assertEquals(ai.getReference(), three);
107 >        assertSame(ai.getReference(), three);
108          assertFalse(ai.isMarked());
109      }
110  
# Line 125 | Line 124 | public class AtomicMarkableReferenceTest
124          assertTrue(ai.compareAndSet(one, one, false, true));
125          t.join(LONG_DELAY_MS);
126          assertFalse(t.isAlive());
127 <        assertEquals(ai.getReference(), one);
127 >        assertSame(ai.getReference(), one);
128          assertFalse(ai.isMarked());
129      }
130  
# Line 136 | Line 135 | public class AtomicMarkableReferenceTest
135      public void testWeakCompareAndSet() {
136          boolean[] mark = new boolean[1];
137          AtomicMarkableReference ai = new AtomicMarkableReference(one, false);
138 <        assertEquals(one, ai.get(mark));
138 >        assertSame(one, ai.get(mark));
139          assertFalse(ai.isMarked());
140          assertFalse(mark[0]);
141  
142          while (!ai.weakCompareAndSet(one, two, false, false));
143 <        assertEquals(two, ai.get(mark));
143 >        assertSame(two, ai.get(mark));
144          assertFalse(mark[0]);
145  
146          while (!ai.weakCompareAndSet(two, m3, false, true));
147 <        assertEquals(m3, ai.get(mark));
147 >        assertSame(m3, ai.get(mark));
148          assertTrue(mark[0]);
149      }
150  

Diff Legend

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