--- jsr166/src/test/tck/AtomicIntegerArrayTest.java 2011/06/10 20:17:11 1.25 +++ jsr166/src/test/tck/AtomicIntegerArrayTest.java 2011/08/10 07:14:48 1.26 @@ -23,9 +23,9 @@ public class AtomicIntegerArrayTest exte * constructor creates array of given size with all elements zero */ public void testConstructor() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) - assertEquals(0, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) + assertEquals(0, aa.get(i)); } /** @@ -34,7 +34,7 @@ public class AtomicIntegerArrayTest exte public void testConstructor2NPE() { try { int[] a = null; - AtomicIntegerArray ai = new AtomicIntegerArray(a); + AtomicIntegerArray aa = new AtomicIntegerArray(a); shouldThrow(); } catch (NullPointerException success) {} } @@ -44,36 +44,46 @@ public class AtomicIntegerArrayTest exte */ public void testConstructor2() { int[] a = { 17, 3, -42, 99, -7 }; - AtomicIntegerArray ai = new AtomicIntegerArray(a); - assertEquals(a.length, ai.length()); - for (int i = 0; i < a.length; ++i) - assertEquals(a[i], ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(a); + assertEquals(a.length, aa.length()); + for (int i = 0; i < a.length; i++) + assertEquals(a[i], aa.get(i)); } /** * get and set for out of bound indices throw IndexOutOfBoundsException */ public void testIndexing() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - try { - ai.get(SIZE); - shouldThrow(); - } catch (IndexOutOfBoundsException success) { - } - try { - ai.get(-1); - shouldThrow(); - } catch (IndexOutOfBoundsException success) { - } - try { - ai.set(SIZE, 0); - shouldThrow(); - } catch (IndexOutOfBoundsException success) { - } - try { - ai.set(-1, 0); - shouldThrow(); - } catch (IndexOutOfBoundsException success) { + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int index : new int[] { -1, SIZE }) { + try { + aa.get(index); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.set(index, 1); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.lazySet(index, 1); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.compareAndSet(index, 1, 2); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.weakCompareAndSet(index, 1, 2); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.getAndAdd(index, 1); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} + try { + aa.addAndGet(index, 1); + shouldThrow(); + } catch (IndexOutOfBoundsException success) {} } } @@ -81,14 +91,14 @@ public class AtomicIntegerArrayTest exte * get returns the last value set at index */ public void testGetSet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(1, ai.get(i)); - ai.set(i, 2); - assertEquals(2, ai.get(i)); - ai.set(i, -3); - assertEquals(-3, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(1, aa.get(i)); + aa.set(i, 2); + assertEquals(2, aa.get(i)); + aa.set(i, -3); + assertEquals(-3, aa.get(i)); } } @@ -96,14 +106,14 @@ public class AtomicIntegerArrayTest exte * get returns the last value lazySet at index by same thread */ public void testGetLazySet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.lazySet(i, 1); - assertEquals(1, ai.get(i)); - ai.lazySet(i, 2); - assertEquals(2, ai.get(i)); - ai.lazySet(i, -3); - assertEquals(-3, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.lazySet(i, 1); + assertEquals(1, aa.get(i)); + aa.lazySet(i, 2); + assertEquals(2, aa.get(i)); + aa.lazySet(i, -3); + assertEquals(-3, aa.get(i)); } } @@ -111,16 +121,16 @@ public class AtomicIntegerArrayTest exte * compareAndSet succeeds in changing value if equal to expected else fails */ public void testCompareAndSet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertTrue(ai.compareAndSet(i, 1, 2)); - assertTrue(ai.compareAndSet(i, 2, -4)); - assertEquals(-4, ai.get(i)); - assertFalse(ai.compareAndSet(i, -5, 7)); - assertEquals(-4, ai.get(i)); - assertTrue(ai.compareAndSet(i, -4, 7)); - assertEquals(7, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertTrue(aa.compareAndSet(i, 1, 2)); + assertTrue(aa.compareAndSet(i, 2, -4)); + assertEquals(-4, aa.get(i)); + assertFalse(aa.compareAndSet(i, -5, 7)); + assertEquals(-4, aa.get(i)); + assertTrue(aa.compareAndSet(i, -4, 7)); + assertEquals(7, aa.get(i)); } } @@ -149,14 +159,14 @@ public class AtomicIntegerArrayTest exte * to expected */ public void testWeakCompareAndSet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - while (!ai.weakCompareAndSet(i, 1, 2)); - while (!ai.weakCompareAndSet(i, 2, -4)); - assertEquals(-4, ai.get(i)); - while (!ai.weakCompareAndSet(i, -4, 7)); - assertEquals(7, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + while (!aa.weakCompareAndSet(i, 1, 2)); + while (!aa.weakCompareAndSet(i, 2, -4)); + assertEquals(-4, aa.get(i)); + while (!aa.weakCompareAndSet(i, -4, 7)); + assertEquals(7, aa.get(i)); } } @@ -164,12 +174,12 @@ public class AtomicIntegerArrayTest exte * getAndSet returns previous value and sets to given value at given index */ public void testGetAndSet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(1, ai.getAndSet(i, 0)); - assertEquals(0, ai.getAndSet(i, -10)); - assertEquals(-10, ai.getAndSet(i, 1)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(1, aa.getAndSet(i, 0)); + assertEquals(0, aa.getAndSet(i, -10)); + assertEquals(-10, aa.getAndSet(i, 1)); } } @@ -177,13 +187,13 @@ public class AtomicIntegerArrayTest exte * getAndAdd returns previous value and adds given value */ public void testGetAndAdd() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(1, ai.getAndAdd(i, 2)); - assertEquals(3, ai.get(i)); - assertEquals(3, ai.getAndAdd(i, -4)); - assertEquals(-1, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(1, aa.getAndAdd(i, 2)); + assertEquals(3, aa.get(i)); + assertEquals(3, aa.getAndAdd(i, -4)); + assertEquals(-1, aa.get(i)); } } @@ -191,12 +201,12 @@ public class AtomicIntegerArrayTest exte * getAndDecrement returns previous value and decrements */ public void testGetAndDecrement() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(1, ai.getAndDecrement(i)); - assertEquals(0, ai.getAndDecrement(i)); - assertEquals(-1, ai.getAndDecrement(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(1, aa.getAndDecrement(i)); + assertEquals(0, aa.getAndDecrement(i)); + assertEquals(-1, aa.getAndDecrement(i)); } } @@ -204,16 +214,16 @@ public class AtomicIntegerArrayTest exte * getAndIncrement returns previous value and increments */ public void testGetAndIncrement() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(1, ai.getAndIncrement(i)); - assertEquals(2, ai.get(i)); - ai.set(i, -2); - assertEquals(-2, ai.getAndIncrement(i)); - assertEquals(-1, ai.getAndIncrement(i)); - assertEquals(0, ai.getAndIncrement(i)); - assertEquals(1, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(1, aa.getAndIncrement(i)); + assertEquals(2, aa.get(i)); + aa.set(i, -2); + assertEquals(-2, aa.getAndIncrement(i)); + assertEquals(-1, aa.getAndIncrement(i)); + assertEquals(0, aa.getAndIncrement(i)); + assertEquals(1, aa.get(i)); } } @@ -221,13 +231,13 @@ public class AtomicIntegerArrayTest exte * addAndGet adds given value to current, and returns current value */ public void testAddAndGet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(3, ai.addAndGet(i, 2)); - assertEquals(3, ai.get(i)); - assertEquals(-1, ai.addAndGet(i, -4)); - assertEquals(-1, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(3, aa.addAndGet(i, 2)); + assertEquals(3, aa.get(i)); + assertEquals(-1, aa.addAndGet(i, -4)); + assertEquals(-1, aa.get(i)); } } @@ -235,13 +245,13 @@ public class AtomicIntegerArrayTest exte * decrementAndGet decrements and returns current value */ public void testDecrementAndGet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(0, ai.decrementAndGet(i)); - assertEquals(-1, ai.decrementAndGet(i)); - assertEquals(-2, ai.decrementAndGet(i)); - assertEquals(-2, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(0, aa.decrementAndGet(i)); + assertEquals(-1, aa.decrementAndGet(i)); + assertEquals(-2, aa.decrementAndGet(i)); + assertEquals(-2, aa.get(i)); } } @@ -249,34 +259,34 @@ public class AtomicIntegerArrayTest exte * incrementAndGet increments and returns current value */ public void testIncrementAndGet() { - AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) { - ai.set(i, 1); - assertEquals(2, ai.incrementAndGet(i)); - assertEquals(2, ai.get(i)); - ai.set(i, -2); - assertEquals(-1, ai.incrementAndGet(i)); - assertEquals(0, ai.incrementAndGet(i)); - assertEquals(1, ai.incrementAndGet(i)); - assertEquals(1, ai.get(i)); + AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) { + aa.set(i, 1); + assertEquals(2, aa.incrementAndGet(i)); + assertEquals(2, aa.get(i)); + aa.set(i, -2); + assertEquals(-1, aa.incrementAndGet(i)); + assertEquals(0, aa.incrementAndGet(i)); + assertEquals(1, aa.incrementAndGet(i)); + assertEquals(1, aa.get(i)); } } static final int COUNTDOWN = 100000; class Counter extends CheckedRunnable { - final AtomicIntegerArray ai; + final AtomicIntegerArray aa; volatile int counts; - Counter(AtomicIntegerArray a) { ai = a; } + Counter(AtomicIntegerArray a) { aa = a; } public void realRun() { for (;;) { boolean done = true; - for (int i = 0; i < ai.length(); ++i) { - int v = ai.get(i); + for (int i = 0; i < aa.length(); i++) { + int v = aa.get(i); assertTrue(v >= 0); if (v != 0) { done = false; - if (ai.compareAndSet(i, v, v-1)) + if (aa.compareAndSet(i, v, v-1)) ++counts; } } @@ -291,11 +301,11 @@ public class AtomicIntegerArrayTest exte * update a number of times equal to total count */ public void testCountingInMultipleThreads() throws InterruptedException { - final AtomicIntegerArray ai = new AtomicIntegerArray(SIZE); - for (int i = 0; i < SIZE; ++i) - ai.set(i, COUNTDOWN); - Counter c1 = new Counter(ai); - Counter c2 = new Counter(ai); + final AtomicIntegerArray aa = new AtomicIntegerArray(SIZE); + for (int i = 0; i < SIZE; i++) + aa.set(i, COUNTDOWN); + Counter c1 = new Counter(aa); + Counter c2 = new Counter(aa); Thread t1 = new Thread(c1); Thread t2 = new Thread(c2); t1.start(); @@ -325,8 +335,8 @@ public class AtomicIntegerArrayTest exte */ public void testToString() { int[] a = { 17, 3, -42, 99, -7 }; - AtomicIntegerArray ai = new AtomicIntegerArray(a); - assertEquals(Arrays.toString(a), ai.toString()); + AtomicIntegerArray aa = new AtomicIntegerArray(a); + assertEquals(Arrays.toString(a), aa.toString()); } }