Skip to content

Commit 301d6e3

Browse files
martinkretzschmarGoogle Java Core Libraries
authored and
Google Java Core Libraries
committed
IteratorsTest: Replace Integer varargs with int varargs
`Integer...` is hard to translate to KMP Kotlin. `Int...` has the correct nullness but results in an `IntArray` (i.e. `int[]`, which is different from Java behavior). `Int?...` results in `Array<Int?>` (i.e. `@Nullable Integer[]`) which matches the runtime type used by Java but has incorrect nullness. The test helper methods here could be easily converted to `int...` RELNOTES=n/a PiperOrigin-RevId: 608337483
1 parent 54e1c75 commit 301d6e3

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

android/guava-tests/test/com/google/common/collect/IteratorsTest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.google.common.collect.testing.features.CollectionFeature;
4040
import com.google.common.collect.testing.features.CollectionSize;
4141
import com.google.common.collect.testing.features.ListFeature;
42+
import com.google.common.primitives.Ints;
4243
import com.google.common.testing.NullPointerTester;
4344
import java.util.ArrayList;
4445
import java.util.Arrays;
@@ -918,8 +919,9 @@ protected DoubletonIteratorTester() {
918919
}
919920
}
920921

921-
private static Iterator<Integer> iterateOver(final Integer... values) {
922-
return newArrayList(values).iterator();
922+
private static Iterator<Integer> iterateOver(int... values) {
923+
// Note: Ints.asList's iterator does not support remove which we need for testing.
924+
return new ArrayList<>(Ints.asList(values)).iterator();
923925
}
924926

925927
public void testElementsEqual() {
@@ -1274,8 +1276,8 @@ public void testAsEnumerationTypical() {
12741276
assertFalse(enumer.hasMoreElements());
12751277
}
12761278

1277-
private static Enumeration<Integer> enumerate(Integer... ints) {
1278-
Vector<Integer> vector = new Vector<>(asList(ints));
1279+
private static Enumeration<Integer> enumerate(int... ints) {
1280+
Vector<Integer> vector = new Vector<>(Ints.asList(ints));
12791281
return vector.elements();
12801282
}
12811283

guava-tests/test/com/google/common/collect/IteratorsTest.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.google.common.collect.testing.features.CollectionFeature;
4040
import com.google.common.collect.testing.features.CollectionSize;
4141
import com.google.common.collect.testing.features.ListFeature;
42+
import com.google.common.primitives.Ints;
4243
import com.google.common.testing.NullPointerTester;
4344
import java.util.ArrayList;
4445
import java.util.Arrays;
@@ -918,8 +919,9 @@ protected DoubletonIteratorTester() {
918919
}
919920
}
920921

921-
private static Iterator<Integer> iterateOver(final Integer... values) {
922-
return newArrayList(values).iterator();
922+
private static Iterator<Integer> iterateOver(int... values) {
923+
// Note: Ints.asList's iterator does not support remove which we need for testing.
924+
return new ArrayList<>(Ints.asList(values)).iterator();
923925
}
924926

925927
public void testElementsEqual() {
@@ -1274,8 +1276,8 @@ public void testAsEnumerationTypical() {
12741276
assertFalse(enumer.hasMoreElements());
12751277
}
12761278

1277-
private static Enumeration<Integer> enumerate(Integer... ints) {
1278-
Vector<Integer> vector = new Vector<>(asList(ints));
1279+
private static Enumeration<Integer> enumerate(int... ints) {
1280+
Vector<Integer> vector = new Vector<>(Ints.asList(ints));
12791281
return vector.elements();
12801282
}
12811283

0 commit comments

Comments
 (0)