Commit 301d6e3 authored and Google Java Core Libraries
committed
1 parent 54e1c75 commit 301d6e3 Copy full SHA for 301d6e3
File tree 2 files changed +12
-8
lines changed
android/guava-tests/test/com/google/common/collect
guava-tests/test/com/google/common/collect
2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 39
39
import com .google .common .collect .testing .features .CollectionFeature ;
40
40
import com .google .common .collect .testing .features .CollectionSize ;
41
41
import com .google .common .collect .testing .features .ListFeature ;
42
+ import com .google .common .primitives .Ints ;
42
43
import com .google .common .testing .NullPointerTester ;
43
44
import java .util .ArrayList ;
44
45
import java .util .Arrays ;
@@ -918,8 +919,9 @@ protected DoubletonIteratorTester() {
918
919
}
919
920
}
920
921
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 ();
923
925
}
924
926
925
927
public void testElementsEqual () {
@@ -1274,8 +1276,8 @@ public void testAsEnumerationTypical() {
1274
1276
assertFalse (enumer .hasMoreElements ());
1275
1277
}
1276
1278
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 ));
1279
1281
return vector .elements ();
1280
1282
}
1281
1283
Original file line number Diff line number Diff line change 39
39
import com .google .common .collect .testing .features .CollectionFeature ;
40
40
import com .google .common .collect .testing .features .CollectionSize ;
41
41
import com .google .common .collect .testing .features .ListFeature ;
42
+ import com .google .common .primitives .Ints ;
42
43
import com .google .common .testing .NullPointerTester ;
43
44
import java .util .ArrayList ;
44
45
import java .util .Arrays ;
@@ -918,8 +919,9 @@ protected DoubletonIteratorTester() {
918
919
}
919
920
}
920
921
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 ();
923
925
}
924
926
925
927
public void testElementsEqual () {
@@ -1274,8 +1276,8 @@ public void testAsEnumerationTypical() {
1274
1276
assertFalse (enumer .hasMoreElements ());
1275
1277
}
1276
1278
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 ));
1279
1281
return vector .elements ();
1280
1282
}
1281
1283
You can’t perform that action at this time.
0 commit comments