summaryrefslogtreecommitdiff
path: root/jsr166-tests/src/test/java/jsr166/TreeSetTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/TreeSetTest.java')
-rw-r--r--jsr166-tests/src/test/java/jsr166/TreeSetTest.java70
1 files changed, 36 insertions, 34 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/TreeSetTest.java b/jsr166-tests/src/test/java/jsr166/TreeSetTest.java
index 2957019e47..a935637432 100644
--- a/jsr166-tests/src/test/java/jsr166/TreeSetTest.java
+++ b/jsr166-tests/src/test/java/jsr166/TreeSetTest.java
@@ -6,7 +6,6 @@
package jsr166;
-import junit.framework.*;
import java.util.Arrays;
import java.util.BitSet;
import java.util.Collection;
@@ -19,7 +18,19 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
public class TreeSetTest extends JSR166TestCase {
+ // android-note: Removed because the CTS runner does a bad job of
+ // retrying tests that have suite() declarations.
+ //
+ // public static void main(String[] args) {
+ // main(suite(), args);
+ // }
+ // public static Test suite() {
+ // return new TestSuite(...);
+ // }
static class MyReverseComparator implements Comparator {
public int compare(Object x, Object y) {
@@ -39,9 +50,9 @@ public class TreeSetTest extends JSR166TestCase {
private TreeSet<Integer> populatedSet(int n) {
TreeSet<Integer> q = new TreeSet<Integer>();
assertTrue(q.isEmpty());
- for (int i = n-1; i >= 0; i-=2)
+ for (int i = n-1; i >= 0; i -= 2)
assertTrue(q.add(new Integer(i)));
- for (int i = (n & 1); i < n; i+=2)
+ for (int i = (n & 1); i < n; i += 2)
assertTrue(q.add(new Integer(i)));
assertFalse(q.isEmpty());
assertEquals(n, q.size());
@@ -75,7 +86,7 @@ public class TreeSetTest extends JSR166TestCase {
*/
public void testConstructor3() {
try {
- TreeSet q = new TreeSet((Collection)null);
+ new TreeSet((Collection)null);
shouldThrow();
} catch (NullPointerException success) {}
}
@@ -86,7 +97,7 @@ public class TreeSetTest extends JSR166TestCase {
public void testConstructor4() {
try {
Integer[] ints = new Integer[SIZE];
- TreeSet q = new TreeSet(Arrays.asList(ints));
+ new TreeSet(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
}
@@ -99,7 +110,7 @@ public class TreeSetTest extends JSR166TestCase {
Integer[] ints = new Integer[SIZE];
for (int i = 0; i < SIZE-1; ++i)
ints[i] = new Integer(i);
- TreeSet q = new TreeSet(Arrays.asList(ints));
+ new TreeSet(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
}
@@ -164,8 +175,8 @@ public class TreeSetTest extends JSR166TestCase {
* add(null) throws NPE if nonempty
*/
public void testAddNull() {
+ TreeSet q = populatedSet(SIZE);
try {
- TreeSet q = populatedSet(SIZE);
q.add(null);
shouldThrow();
} catch (NullPointerException success) {}
@@ -193,9 +204,8 @@ public class TreeSetTest extends JSR166TestCase {
* Add of non-Comparable throws CCE
*/
public void testAddNonComparable() {
+ TreeSet q = new TreeSet();
try {
- TreeSet q = new TreeSet();
- q.add(new Object());
q.add(new Object());
q.add(new Object());
shouldThrow();
@@ -206,8 +216,8 @@ public class TreeSetTest extends JSR166TestCase {
* addAll(null) throws NPE
*/
public void testAddAll1() {
+ TreeSet q = new TreeSet();
try {
- TreeSet q = new TreeSet();
q.addAll(null);
shouldThrow();
} catch (NullPointerException success) {}
@@ -217,9 +227,9 @@ public class TreeSetTest extends JSR166TestCase {
* addAll of a collection with null elements throws NPE
*/
public void testAddAll2() {
+ TreeSet q = new TreeSet();
+ Integer[] ints = new Integer[SIZE];
try {
- TreeSet q = new TreeSet();
- Integer[] ints = new Integer[SIZE];
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -230,11 +240,11 @@ public class TreeSetTest extends JSR166TestCase {
* possibly adding some elements
*/
public void testAddAll3() {
+ TreeSet q = new TreeSet();
+ Integer[] ints = new Integer[SIZE];
+ for (int i = 0; i < SIZE-1; ++i)
+ ints[i] = new Integer(i);
try {
- TreeSet q = new TreeSet();
- Integer[] ints = new Integer[SIZE];
- for (int i = 0; i < SIZE-1; ++i)
- ints[i] = new Integer(i);
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -282,13 +292,13 @@ public class TreeSetTest extends JSR166TestCase {
*/
public void testRemoveElement() {
TreeSet q = populatedSet(SIZE);
- for (int i = 1; i < SIZE; i+=2) {
+ for (int i = 1; i < SIZE; i += 2) {
assertTrue(q.contains(i));
assertTrue(q.remove(i));
assertFalse(q.contains(i));
assertTrue(q.contains(i-1));
}
- for (int i = 0; i < SIZE; i+=2) {
+ for (int i = 0; i < SIZE; i += 2) {
assertTrue(q.contains(i));
assertTrue(q.remove(i));
assertFalse(q.contains(i));
@@ -367,8 +377,8 @@ public class TreeSetTest extends JSR166TestCase {
assertTrue(q.removeAll(p));
assertEquals(SIZE-i, q.size());
for (int j = 0; j < i; ++j) {
- Integer I = (Integer)(p.pollFirst());
- assertFalse(q.contains(I));
+ Integer x = (Integer)(p.pollFirst());
+ assertFalse(q.contains(x));
}
}
}
@@ -472,27 +482,19 @@ public class TreeSetTest extends JSR166TestCase {
*/
public void testIterator() {
TreeSet q = populatedSet(SIZE);
- int i = 0;
Iterator it = q.iterator();
- while (it.hasNext()) {
+ int i;
+ for (i = 0; it.hasNext(); i++)
assertTrue(q.contains(it.next()));
- ++i;
- }
assertEquals(i, SIZE);
+ assertIteratorExhausted(it);
}
/**
* iterator of empty set has no elements
*/
public void testEmptyIterator() {
- TreeSet q = new TreeSet();
- int i = 0;
- Iterator it = q.iterator();
- while (it.hasNext()) {
- assertTrue(q.contains(it.next()));
- ++i;
- }
- assertEquals(0, i);
+ assertIteratorExhausted(new TreeSet().iterator());
}
/**
@@ -732,7 +734,7 @@ public class TreeSetTest extends JSR166TestCase {
// Add entries till we're back to original size
while (set.size() < size) {
int element = min + rnd.nextInt(rangeSize);
- assertTrue(element >= min && element<= max);
+ assertTrue(element >= min && element <= max);
put(set, element);
}
}
@@ -757,7 +759,7 @@ public class TreeSetTest extends JSR166TestCase {
// Add entries till we're back to original size
while (set.size() < size) {
int element = min - 5 + rnd.nextInt(rangeSize + 10);
- if (element >= min && element<= max) {
+ if (element >= min && element <= max) {
put(set, element);
} else {
try {
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 12:23:02 +0000