summaryrefslogtreecommitdiff
path: root/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java')
-rw-r--r--jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java87
1 files changed, 44 insertions, 43 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java b/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java
index ba61748d3c..5398c4ece3 100644
--- a/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java
+++ b/jsr166-tests/src/test/java/jsr166/TreeSubSetTest.java
@@ -6,16 +6,27 @@
package jsr166;
-import junit.framework.*;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
import java.util.NavigableSet;
-import java.util.SortedSet;
import java.util.Set;
+import java.util.SortedSet;
import java.util.TreeSet;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
public class TreeSubSetTest 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) {
@@ -31,9 +42,9 @@ public class TreeSubSetTest extends JSR166TestCase {
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)));
assertTrue(q.add(new Integer(-n)));
assertTrue(q.add(new Integer(n)));
@@ -126,8 +137,8 @@ public class TreeSubSetTest extends JSR166TestCase {
* add(null) throws NPE
*/
public void testAddNull() {
+ NavigableSet q = set0();
try {
- NavigableSet q = set0();
q.add(null);
shouldThrow();
} catch (NullPointerException success) {}
@@ -154,9 +165,8 @@ public class TreeSubSetTest extends JSR166TestCase {
* Add of non-Comparable throws CCE
*/
public void testAddNonComparable() {
+ NavigableSet q = set0();
try {
- NavigableSet q = set0();
- q.add(new Object());
q.add(new Object());
q.add(new Object());
shouldThrow();
@@ -167,8 +177,8 @@ public class TreeSubSetTest extends JSR166TestCase {
* addAll(null) throws NPE
*/
public void testAddAll1() {
+ NavigableSet q = set0();
try {
- NavigableSet q = set0();
q.addAll(null);
shouldThrow();
} catch (NullPointerException success) {}
@@ -178,9 +188,9 @@ public class TreeSubSetTest extends JSR166TestCase {
* addAll of a collection with null elements throws NPE
*/
public void testAddAll2() {
+ NavigableSet q = set0();
+ Integer[] ints = new Integer[SIZE];
try {
- NavigableSet q = set0();
- Integer[] ints = new Integer[SIZE];
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -191,11 +201,11 @@ public class TreeSubSetTest extends JSR166TestCase {
* possibly adding some elements
*/
public void testAddAll3() {
+ NavigableSet q = set0();
+ Integer[] ints = new Integer[SIZE];
+ for (int i = 0; i < SIZE-1; ++i)
+ ints[i] = new Integer(i+SIZE);
try {
- NavigableSet q = set0();
- Integer[] ints = new Integer[SIZE];
- for (int i = 0; i < SIZE-1; ++i)
- ints[i] = new Integer(i+SIZE);
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -232,13 +242,13 @@ public class TreeSubSetTest extends JSR166TestCase {
*/
public void testRemoveElement() {
NavigableSet 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));
@@ -317,8 +327,8 @@ public class TreeSubSetTest 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));
}
}
}
@@ -422,27 +432,19 @@ public class TreeSubSetTest extends JSR166TestCase {
*/
public void testIterator() {
NavigableSet 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() {
- NavigableSet q = set0();
- int i = 0;
- Iterator it = q.iterator();
- while (it.hasNext()) {
- assertTrue(q.contains(it.next()));
- ++i;
- }
- assertEquals(0, i);
+ assertIteratorExhausted(set0().iterator());
}
/**
@@ -648,9 +650,8 @@ public class TreeSubSetTest extends JSR166TestCase {
* Add of non-Comparable throws CCE
*/
public void testDescendingAddNonComparable() {
+ NavigableSet q = dset0();
try {
- NavigableSet q = dset0();
- q.add(new Object());
q.add(new Object());
q.add(new Object());
shouldThrow();
@@ -661,8 +662,8 @@ public class TreeSubSetTest extends JSR166TestCase {
* addAll(null) throws NPE
*/
public void testDescendingAddAll1() {
+ NavigableSet q = dset0();
try {
- NavigableSet q = dset0();
q.addAll(null);
shouldThrow();
} catch (NullPointerException success) {}
@@ -672,9 +673,9 @@ public class TreeSubSetTest extends JSR166TestCase {
* addAll of a collection with null elements throws NPE
*/
public void testDescendingAddAll2() {
+ NavigableSet q = dset0();
+ Integer[] ints = new Integer[SIZE];
try {
- NavigableSet q = dset0();
- Integer[] ints = new Integer[SIZE];
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -685,11 +686,11 @@ public class TreeSubSetTest extends JSR166TestCase {
* possibly adding some elements
*/
public void testDescendingAddAll3() {
+ NavigableSet q = dset0();
+ Integer[] ints = new Integer[SIZE];
+ for (int i = 0; i < SIZE-1; ++i)
+ ints[i] = new Integer(i+SIZE);
try {
- NavigableSet q = dset0();
- Integer[] ints = new Integer[SIZE];
- for (int i = 0; i < SIZE-1; ++i)
- ints[i] = new Integer(i+SIZE);
q.addAll(Arrays.asList(ints));
shouldThrow();
} catch (NullPointerException success) {}
@@ -726,10 +727,10 @@ public class TreeSubSetTest extends JSR166TestCase {
*/
public void testDescendingRemoveElement() {
NavigableSet q = populatedSet(SIZE);
- for (int i = 1; i < SIZE; i+=2) {
+ for (int i = 1; i < SIZE; i += 2) {
assertTrue(q.remove(new Integer(i)));
}
- for (int i = 0; i < SIZE; i+=2) {
+ for (int i = 0; i < SIZE; i += 2) {
assertTrue(q.remove(new Integer(i)));
assertFalse(q.remove(new Integer(i+1)));
}
@@ -805,8 +806,8 @@ public class TreeSubSetTest 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));
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 12:42:26 +0000