|
|
@@ -120,19 +120,19 @@ public class CollectionTester<T> {
|
|
|
Collection<T> target = f.apply(new int[]{1,2,3,4,5});
|
|
|
Object[] e = $list(1,2,3,4,5).toArray();
|
|
|
|
|
|
- assertArrayContentEquals(e, target.toArray((T[])new Object[0]));
|
|
|
- assertArrayContentEquals(e, target.toArray((T[])new Object[3]));
|
|
|
+ assertArrayContentEquals(e, target.toArray(new Object[0]));
|
|
|
+ assertArrayContentEquals(e, target.toArray(new Object[3]));
|
|
|
|
|
|
List<T> list = $list(1,2,3,4,5);
|
|
|
list.add(null);
|
|
|
list.add(null);
|
|
|
list.add(null);
|
|
|
Object[] e8 = list.toArray();
|
|
|
- assertArrayContentEquals(e8, target.toArray((T[])new Object[8]));
|
|
|
+ assertArrayContentEquals(e8, target.toArray(new Object[8]));
|
|
|
}
|
|
|
|
|
|
private List<T> $list(int... values) {
|
|
|
- return $var.list(values).into(new ArrayList<T>());
|
|
|
+ return $var.list(values).into(new ArrayList<>());
|
|
|
}
|
|
|
|
|
|
private static <Q> void assertContentEquals(Collection<Q> a, Collection<Q> b) {
|
|
|
@@ -142,7 +142,7 @@ public class CollectionTester<T> {
|
|
|
assertTrue("assertContentEquals: b IN a", b.containsAll(a));
|
|
|
}
|
|
|
|
|
|
- private static void assertArrayContentEquals(Object[] a, Object[] b) {
|
|
|
+ private static <A,B> void assertArrayContentEquals(A[] a, B[] b) {
|
|
|
List<Object> alist = Arrays.asList(a);
|
|
|
List<Object> blist = Arrays.asList(b);
|
|
|
assertTrue("assertContentEquals", alist.containsAll(blist) && blist.containsAll(alist));
|