eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix range checking in AbstractList.subList. Add RandomAccess to object returned by Arrays.asList

Browse Source
This commit is contained in:
Alexey Andreev 2016-12-03 11:05:33 +03:00
parent c25dd1a99d
commit 10bb4ef3da
4 changed files with 77 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classlib/src/main/java/org/teavm/classlib/java/util/TAbstractList.java
View File

@ -144,7 +144,7 @@ public abstract class TAbstractList<E> extends TAbstractCollection<E> implements
if (fromIndex > toIndex) {
throw new TIllegalArgumentException();
}
if (fromIndex < 0 || toIndex >= size()) {
if (fromIndex < 0 || toIndex > size()) {
throw new TIndexOutOfBoundsException();
}
if (this instanceof TRandomAccess) {

35
classlib/src/main/java/org/teavm/classlib/java/util/TArrays.java
View File

@ -17,6 +17,7 @@ package org.teavm.classlib.java.util;
import java.lang.reflect.Array;
import java.util.Objects;
import java.util.RandomAccess;
import org.teavm.classlib.java.lang.TClass;
import org.teavm.classlib.java.lang.TComparable;
import org.teavm.classlib.java.lang.TDouble;
@ -1493,19 +1494,27 @@ public class TArrays extends TObject {
@SafeVarargs
public static <T> TList<T> asList(final T... a) {
return new TAbstractList<T>() {
@Override public T get(int index) {
return a[index];
}
@Override public T set(int index, T element) {
T old = a[index];
a[index] = element;
return old;
}
@Override public int size() {
return a.length;
}
};
return new ArrayAsList<>(a);
}
static class ArrayAsList<T> extends TAbstractList<T> implements RandomAccess {
private T[] array;
public ArrayAsList(T[] array) {
this.array = array;
}
@Override public T get(int index) {
return array[index];
}
@Override public T set(int index, T element) {
T old = array[index];
array[index] = element;
return old;
}
@Override public int size() {
return array.length;
}
}
public static TString deepToString(Object[] a) {

45
tests/src/test/java/org/teavm/classlib/java/util/ArrayListTest.java
View File

@ -113,4 +113,49 @@ public class ArrayListTest {
}
return list;
}
@Test
public void subListRange() {
List<Integer> list = fillFromZeroToNine();
List<Integer> sublist = list.subList(0, 10);
assertEquals(10, sublist.size());
sublist = list.subList(0, 0);
assertEquals(0, sublist.size());
sublist = list.subList(10, 10);
assertEquals(0, sublist.size());
sublist = list.subList(5, 5);
assertEquals(0, sublist.size());
try {
list.subList(-1, -1);
fail("Expected IOOBE for negative indexes");
} catch (IndexOutOfBoundsException e) {
// OK
}
try {
list.subList(11, 11);
fail("Expected IOOBE for indexes beyond size");
} catch (IndexOutOfBoundsException e) {
// OK
}
try {
list.subList(-1, 11);
fail("Expected IOOBE for indexes beyond limits");
} catch (IndexOutOfBoundsException e) {
// OK
}
try {
list.subList(5, 4);
fail("Expected IAE for lowerIndex > upperIndex");
} catch (IllegalArgumentException e) {
// OK
}
}
}

9
tests/src/test/java/org/teavm/classlib/java/util/CollectionsTest.java
View File

@ -116,4 +116,13 @@ public class CollectionsTest {
assertEquals(-1, Collections.lastIndexOfSubList(list, Arrays.asList(5, 1)));
assertEquals(0, Collections.lastIndexOfSubList(list, list));
}
@Test
public void shuffleWorksOnArrayAsList() {
List<Integer> list = Arrays.asList(1, 2, 3, 4);
Collections.shuffle(list);
for (int i = 1; i <= 4; ++i) {
assertTrue("List expected to contain " + i, list.contains(i));
}
}
}