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

Comparing jsr166/src/test/tck/AtomicStampedReferenceTest.java (file contents):
Revision 1.11 by jsr166, Tue Nov 17 03:12:51 2009 UTC vs.
Revision 1.15 by jsr166, Wed Aug 25 00:07:03 2010 UTC

# Line 10 | Line 10 | import junit.framework.*;
10   import java.util.concurrent.atomic.*;
11  
12   public class AtomicStampedReferenceTest extends JSR166TestCase {
13 <    public static void main (String[] args) {
14 <        junit.textui.TestRunner.run (suite());
13 >    public static void main(String[] args) {
14 >        junit.textui.TestRunner.run(suite());
15      }
16      public static Test suite() {
17          return new TestSuite(AtomicStampedReferenceTest.class);
# Line 22 | Line 22 | public class AtomicStampedReferenceTest
22       */
23      public void testConstructor() {
24          AtomicStampedReference ai = new AtomicStampedReference(one, 0);
25 <        assertEquals(one,ai.getReference());
26 <        assertEquals(0, ai.getStamp());
25 >        assertSame(one,ai.getReference());
26 >        assertEquals(0, ai.getStamp());
27          AtomicStampedReference a2 = new AtomicStampedReference(null, 1);
28 <        assertNull(a2.getReference());
29 <        assertEquals(1, a2.getStamp());
30 <
28 >        assertNull(a2.getReference());
29 >        assertEquals(1, a2.getStamp());
30      }
31  
32      /**
# Line 36 | Line 35 | public class AtomicStampedReferenceTest
35      public void testGetSet() {
36          int[] mark = new int[1];
37          AtomicStampedReference ai = new AtomicStampedReference(one, 0);
38 <        assertEquals(one,ai.getReference());
39 <        assertEquals(0, ai.getStamp());
40 <        assertEquals(one, ai.get(mark));
41 <        assertEquals(0, mark[0]);
42 <        ai.set(two, 0);
43 <        assertEquals(two,ai.getReference());
44 <        assertEquals(0, ai.getStamp());
45 <        assertEquals(two, ai.get(mark));
46 <        assertEquals(0, mark[0]);
47 <        ai.set(one, 1);
48 <        assertEquals(one,ai.getReference());
49 <        assertEquals(1, ai.getStamp());
50 <        assertEquals(one, ai.get(mark));
38 >        assertSame(one,ai.getReference());
39 >        assertEquals(0, ai.getStamp());
40 >        assertSame(one, ai.get(mark));
41 >        assertEquals(0, mark[0]);
42 >        ai.set(two, 0);
43 >        assertSame(two,ai.getReference());
44 >        assertEquals(0, ai.getStamp());
45 >        assertSame(two, ai.get(mark));
46 >        assertEquals(0, mark[0]);
47 >        ai.set(one, 1);
48 >        assertSame(one,ai.getReference());
49 >        assertEquals(1, ai.getStamp());
50 >        assertSame(one, ai.get(mark));
51          assertEquals(1,mark[0]);
52      }
53  
# Line 60 | Line 59 | public class AtomicStampedReferenceTest
59          AtomicStampedReference ai = new AtomicStampedReference(one, 0);
60          assertEquals(0, ai.getStamp());
61          assertTrue(ai.attemptStamp(one, 1));
62 <        assertEquals(1, ai.getStamp());
63 <        assertEquals(one, ai.get(mark));
62 >        assertEquals(1, ai.getStamp());
63 >        assertSame(one, ai.get(mark));
64          assertEquals(1, mark[0]);
65      }
66  
# Line 72 | Line 71 | public class AtomicStampedReferenceTest
71      public void testCompareAndSet() {
72          int[] mark = new int[1];
73          AtomicStampedReference ai = new AtomicStampedReference(one, 0);
74 <        assertEquals(one, ai.get(mark));
74 >        assertSame(one, ai.get(mark));
75          assertEquals(0, ai.getStamp());
76 <        assertEquals(0, mark[0]);
76 >        assertEquals(0, mark[0]);
77  
78          assertTrue(ai.compareAndSet(one, two, 0, 0));
79 <        assertEquals(two, ai.get(mark));
80 <        assertEquals(0, mark[0]);
79 >        assertSame(two, ai.get(mark));
80 >        assertEquals(0, mark[0]);
81  
82          assertTrue(ai.compareAndSet(two, m3, 0, 1));
83 <        assertEquals(m3, ai.get(mark));
84 <        assertEquals(1, mark[0]);
83 >        assertSame(m3, ai.get(mark));
84 >        assertEquals(1, mark[0]);
85  
86          assertFalse(ai.compareAndSet(two, m3, 1, 1));
87 <        assertEquals(m3, ai.get(mark));
88 <        assertEquals(1, mark[0]);
87 >        assertSame(m3, ai.get(mark));
88 >        assertEquals(1, mark[0]);
89      }
90  
91      /**
# Line 95 | Line 94 | public class AtomicStampedReferenceTest
94       */
95      public void testCompareAndSetInMultipleThreads() throws Exception {
96          final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
97 <        Thread t = new Thread(new Runnable() {
98 <                public void run() {
99 <                    while (!ai.compareAndSet(two, three, 0, 0)) Thread.yield();
100 <                }});
97 >        Thread t = new Thread(new CheckedRunnable() {
98 >            public void realRun() {
99 >                while (!ai.compareAndSet(two, three, 0, 0))
100 >                    Thread.yield();
101 >            }});
102  
103          t.start();
104          assertTrue(ai.compareAndSet(one, two, 0, 0));
105          t.join(LONG_DELAY_MS);
106          assertFalse(t.isAlive());
107 <        assertEquals(ai.getReference(), three);
107 >        assertSame(ai.getReference(), three);
108          assertEquals(ai.getStamp(), 0);
109      }
110  
# Line 114 | Line 114 | public class AtomicStampedReferenceTest
114       */
115      public void testCompareAndSetInMultipleThreads2() throws Exception {
116          final AtomicStampedReference ai = new AtomicStampedReference(one, 0);
117 <        Thread t = new Thread(new Runnable() {
118 <                public void run() {
119 <                    while (!ai.compareAndSet(one, one, 1, 2)) Thread.yield();
120 <                }});
117 >        Thread t = new Thread(new CheckedRunnable() {
118 >            public void realRun() {
119 >                while (!ai.compareAndSet(one, one, 1, 2))
120 >                    Thread.yield();
121 >            }});
122  
123          t.start();
124          assertTrue(ai.compareAndSet(one, one, 0, 1));
125          t.join(LONG_DELAY_MS);
126          assertFalse(t.isAlive());
127 <        assertEquals(ai.getReference(), one);
127 >        assertSame(ai.getReference(), one);
128          assertEquals(ai.getStamp(), 2);
129      }
130  
# Line 134 | Line 135 | public class AtomicStampedReferenceTest
135      public void testWeakCompareAndSet() {
136          int[] mark = new int[1];
137          AtomicStampedReference ai = new AtomicStampedReference(one, 0);
138 <        assertEquals(one, ai.get(mark));
139 <        assertEquals(0, ai.getStamp ());
140 <        assertEquals(0, mark[0]);
138 >        assertSame(one, ai.get(mark));
139 >        assertEquals(0, ai.getStamp());
140 >        assertEquals(0, mark[0]);
141  
142          while (!ai.weakCompareAndSet(one, two, 0, 0));
143 <        assertEquals(two, ai.get(mark));
144 <        assertEquals(0, mark[0]);
143 >        assertSame(two, ai.get(mark));
144 >        assertEquals(0, mark[0]);
145  
146          while (!ai.weakCompareAndSet(two, m3, 0, 1));
147 <        assertEquals(m3, ai.get(mark));
148 <        assertEquals(1, mark[0]);
147 >        assertSame(m3, ai.get(mark));
148 >        assertEquals(1, mark[0]);
149      }
150  
151   }

Diff Legend

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