ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/AtomicIntegerTest.java

Comparing jsr166/src/test/tck/AtomicIntegerTest.java (file contents):
Revision 1.23 by jsr166, Fri Jun 10 20:01:21 2011 UTC vs.
Revision 1.31 by jsr166, Fri Jun 17 19:00:48 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
9		import java.util.concurrent.atomic.AtomicInteger;
10
11	+	import junit.framework.Test;
12	+	import junit.framework.TestSuite;
13	+
14		public class AtomicIntegerTest extends JSR166TestCase {
15		public static void main(String[] args) {
16	<	junit.textui.TestRunner.run(suite());
16	>	main(suite(), args);
17		}
18		public static Test suite() {
19		return new TestSuite(AtomicIntegerTest.class);
#	Line 91 | Line 93 | public class AtomicIntegerTest extends J
93		assertTrue(ai.compareAndSet(1, 2));
94		t.join(LONG_DELAY_MS);
95		assertFalse(t.isAlive());
96	<	assertEquals(ai.get(), 3);
96	>	assertEquals(3, ai.get());
97		}
98
99		/**
#	Line 100 | Line 102 | public class AtomicIntegerTest extends J
102		*/
103		public void testWeakCompareAndSet() {
104		AtomicInteger ai = new AtomicInteger(1);
105	<	while (!ai.weakCompareAndSet(1, 2));
106	<	while (!ai.weakCompareAndSet(2, -4));
105	>	do {} while (!ai.weakCompareAndSet(1, 2));
106	>	do {} while (!ai.weakCompareAndSet(2, -4));
107		assertEquals(-4, ai.get());
108	<	while (!ai.weakCompareAndSet(-4, 7));
108	>	do {} while (!ai.weakCompareAndSet(-4, 7));
109		assertEquals(7, ai.get());
110		}
111
#	Line 194 | Line 196 | public class AtomicIntegerTest extends J
196		public void testSerialization() throws Exception {
197		AtomicInteger x = new AtomicInteger();
198		AtomicInteger y = serialClone(x);
199	<	assertTrue(x != y);
199	>	assertNotSame(x, y);
200		x.set(22);
201		AtomicInteger z = serialClone(x);
202		assertEquals(22, x.get());
#	Line 210 | Line 212 | public class AtomicIntegerTest extends J
212		assertEquals("0", ai.toString());
213		for (int x : VALUES) {
214		ai.set(x);
215	<	assertEquals(ai.toString(), Integer.toString(x));
215	>	assertEquals(Integer.toString(x), ai.toString());
216		}
217		}
218

Diff Legend

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