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

Comparing jsr166/src/test/tck/AtomicReferenceTest.java (file contents):
Revision 1.12 by jsr166, Tue Nov 17 03:12:51 2009 UTC vs.
Revision 1.15 by jsr166, Tue Dec 1 09:56:28 2009 UTC

# Line 23 | Line 23 | public class AtomicReferenceTest extends
23       */
24      public void testConstructor() {
25          AtomicReference ai = new AtomicReference(one);
26 <        assertEquals(one,ai.get());
26 >        assertSame(one,ai.get());
27      }
28  
29      /**
# Line 31 | Line 31 | public class AtomicReferenceTest extends
31       */
32      public void testConstructor2() {
33          AtomicReference ai = new AtomicReference();
34 <        assertNull(ai.get());
34 >        assertNull(ai.get());
35      }
36  
37      /**
# Line 39 | Line 39 | public class AtomicReferenceTest extends
39       */
40      public void testGetSet() {
41          AtomicReference ai = new AtomicReference(one);
42 <        assertEquals(one,ai.get());
43 <        ai.set(two);
44 <        assertEquals(two,ai.get());
45 <        ai.set(m3);
46 <        assertEquals(m3,ai.get());
42 >        assertSame(one,ai.get());
43 >        ai.set(two);
44 >        assertSame(two,ai.get());
45 >        ai.set(m3);
46 >        assertSame(m3,ai.get());
47      }
48  
49      /**
# Line 51 | Line 51 | public class AtomicReferenceTest extends
51       */
52      public void testGetLazySet() {
53          AtomicReference ai = new AtomicReference(one);
54 <        assertEquals(one,ai.get());
55 <        ai.lazySet(two);
56 <        assertEquals(two,ai.get());
57 <        ai.lazySet(m3);
58 <        assertEquals(m3,ai.get());
54 >        assertSame(one,ai.get());
55 >        ai.lazySet(two);
56 >        assertSame(two,ai.get());
57 >        ai.lazySet(m3);
58 >        assertSame(m3,ai.get());
59      }
60  
61      /**
# Line 63 | Line 63 | public class AtomicReferenceTest extends
63       */
64      public void testCompareAndSet() {
65          AtomicReference ai = new AtomicReference(one);
66 <        assertTrue(ai.compareAndSet(one,two));
67 <        assertTrue(ai.compareAndSet(two,m4));
68 <        assertEquals(m4,ai.get());
69 <        assertFalse(ai.compareAndSet(m5,seven));
70 <        assertFalse((seven.equals(ai.get())));
71 <        assertTrue(ai.compareAndSet(m4,seven));
72 <        assertEquals(seven,ai.get());
66 >        assertTrue(ai.compareAndSet(one,two));
67 >        assertTrue(ai.compareAndSet(two,m4));
68 >        assertSame(m4,ai.get());
69 >        assertFalse(ai.compareAndSet(m5,seven));
70 >        assertSame(m4,ai.get());
71 >        assertTrue(ai.compareAndSet(m4,seven));
72 >        assertSame(seven,ai.get());
73      }
74  
75      /**
# Line 78 | Line 78 | public class AtomicReferenceTest extends
78       */
79      public void testCompareAndSetInMultipleThreads() throws Exception {
80          final AtomicReference ai = new AtomicReference(one);
81 <        Thread t = new Thread(new Runnable() {
82 <                public void run() {
83 <                    while (!ai.compareAndSet(two, three)) Thread.yield();
84 <                }});
81 >        Thread t = new Thread(new CheckedRunnable() {
82 >            public void realRun() {
83 >                while (!ai.compareAndSet(two, three))
84 >                    Thread.yield();
85 >            }});
86  
87          t.start();
88          assertTrue(ai.compareAndSet(one, two));
89          t.join(LONG_DELAY_MS);
90          assertFalse(t.isAlive());
91 <        assertEquals(ai.get(), three);
91 >        assertSame(ai.get(), three);
92      }
93  
94      /**
# Line 96 | Line 97 | public class AtomicReferenceTest extends
97       */
98      public void testWeakCompareAndSet() {
99          AtomicReference ai = new AtomicReference(one);
100 <        while (!ai.weakCompareAndSet(one,two));
101 <        while (!ai.weakCompareAndSet(two,m4));
102 <        assertEquals(m4,ai.get());
100 >        while (!ai.weakCompareAndSet(one,two));
101 >        while (!ai.weakCompareAndSet(two,m4));
102 >        assertSame(m4,ai.get());
103          while (!ai.weakCompareAndSet(m4,seven));
104 <        assertEquals(seven,ai.get());
104 >        assertSame(seven,ai.get());
105      }
106  
107      /**
# Line 108 | Line 109 | public class AtomicReferenceTest extends
109       */
110      public void testGetAndSet() {
111          AtomicReference ai = new AtomicReference(one);
112 <        assertEquals(one,ai.getAndSet(zero));
113 <        assertEquals(zero,ai.getAndSet(m10));
114 <        assertEquals(m10,ai.getAndSet(one));
112 >        assertSame(one,ai.getAndSet(zero));
113 >        assertSame(zero,ai.getAndSet(m10));
114 >        assertSame(m10,ai.getAndSet(one));
115      }
116  
117      /**

Diff Legend

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