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

TArrayDeque fix for .remove(Object) (#302)

Browse Source 
* TArrayDeque fix for .remove(Object)

ArrayDeque removes items by shifting the existing items to overwrite
the removed item. It did not update the head/tail pointers once the
operation was complete leaving a null item at the head/tail of the
collection. This change updates the pointers so that the null element is
excluded and the correct size is returned.
This commit is contained in:
adamjryan 2017-10-10 20:39:06 +01:00 committed by Alexey Andreev
parent 26824f1399
commit 8d2e468f44
2 changed files with 131 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classlib/src/main/java/org/teavm/classlib/java/util/TArrayDeque.java
View File

@ -254,24 +254,24 @@ public class TArrayDeque<E> extends TAbstractCollection<E> implements TDeque<E>
for (int i = index + 1; i < tail; ++i) {
array[i - 1] = array[i];
}
array[tail - 1] = null;
array[--tail] = null;
} else {
for (int i = index - 1; i >= head; --i) {
array[i + 1] = array[i];
}
array[head] = null;
array[head++] = null;
}
} else {
if (index >= head) {
for (int i = index - 1; i >= head; --i) {
array[i + 1] = array[i];
}
array[head] = null;
array[head++] = null;
} else {
for (int i = index + 1; i < tail; ++i) {
array[i - 1] = array[i];
}
array[tail - 1] = null;
array[--tail] = null;
}
}
}

127
classlib/src/test/java/org/teavm/classlib/java/util/TArrayDequeTest.java Normal file
View File

@ -0,0 +1,127 @@
/*
* Copyright 2017 Adam Ryan.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.teavm.classlib.java.util;
import org.junit.Assert;
import org.junit.Test;
public class TArrayDequeTest {
@Test
public void eachRemovedObjectShouldReduceTheSizeByOne() {
TArrayDeque<Object> arrayDeque = new TArrayDeque<>();
Object object1 = new Object();
Object object2 = new Object();
Object object3 = new Object();
arrayDeque.add(object1);
Assert.assertTrue(arrayDeque.size() == 1);
arrayDeque.remove(object1);
Assert.assertTrue(arrayDeque.size() == 0);
arrayDeque.add(object1);
arrayDeque.add(object2);
arrayDeque.add(object3);
Assert.assertTrue(arrayDeque.size() == 3);
arrayDeque.remove(object1);
arrayDeque.remove(object2);
arrayDeque.remove(object3);
Assert.assertTrue(arrayDeque.size() == 0);
arrayDeque.remove(object1);
Assert.assertTrue(arrayDeque.size() == 0);
}
@Test
public void removeFirstShouldNotContainTheFirstAddedObject() {
TArrayDeque<Object> arrayDeque1 = new TArrayDeque<>();
Object object1 = new Object();
Object object2 = new Object();
Object object3 = new Object();
arrayDeque1.add(object1);
arrayDeque1.add(object2);
arrayDeque1.add(object3);
arrayDeque1.removeFirst();
Assert.assertTrue(arrayDeque1.size() == 2);
Assert.assertTrue(arrayDeque1.contains(object2));
Assert.assertTrue(arrayDeque1.contains(object3));
TArrayDeque<Object> arrayDeque2 = new TArrayDeque<>();
arrayDeque2.add(object1);
arrayDeque2.add(object2);
arrayDeque2.add(object3);
arrayDeque2.remove(object1);
arrayDeque2.removeFirst();
Assert.assertTrue(arrayDeque2.size() == 1);
Assert.assertTrue(arrayDeque2.contains(object3));
TArrayDeque<Object> arrayDeque3 = new TArrayDeque<>();
arrayDeque3.add(object1);
arrayDeque3.add(object2);
arrayDeque3.add(object3);
arrayDeque3.remove(object2);
arrayDeque3.removeFirst();
Assert.assertTrue(arrayDeque3.size() == 1);
Assert.assertTrue(arrayDeque3.contains(object3));
TArrayDeque<Object> arrayDeque4 = new TArrayDeque<>();
arrayDeque4.add(object1);
arrayDeque4.add(object2);
arrayDeque4.add(object3);
arrayDeque4.remove(object3);
arrayDeque4.removeFirst();
Assert.assertTrue(arrayDeque4.size() == 1);
Assert.assertTrue(arrayDeque4.contains(object2));
}
@Test
public void removeLastShouldNotContainTheLastAddedObject() {
TArrayDeque<Object> arrayDeque1 = new TArrayDeque<>();
Object object1 = new Object();
Object object2 = new Object();
Object object3 = new Object();
arrayDeque1.add(object1);
arrayDeque1.add(object2);
arrayDeque1.add(object3);
arrayDeque1.removeLast();
Assert.assertTrue(arrayDeque1.size() == 2);
Assert.assertTrue(arrayDeque1.contains(object1));
Assert.assertTrue(arrayDeque1.contains(object2));
TArrayDeque<Object> arrayDeque2 = new TArrayDeque<>();
arrayDeque2.add(object1);
arrayDeque2.add(object2);
arrayDeque2.add(object3);
arrayDeque2.remove(object3);
arrayDeque2.removeLast();
Assert.assertTrue(arrayDeque2.size() == 1);
Assert.assertTrue(arrayDeque2.contains(object1));
TArrayDeque<Object> arrayDeque3 = new TArrayDeque<>();
arrayDeque3.add(object1);
arrayDeque3.add(object2);
arrayDeque3.add(object3);
arrayDeque3.remove(object2);
arrayDeque3.removeLast();
Assert.assertTrue(arrayDeque3.size() == 1);
Assert.assertTrue(arrayDeque3.contains(object1));
TArrayDeque<Object> arrayDeque4 = new TArrayDeque<>();
arrayDeque4.add(object1);
arrayDeque4.add(object2);
arrayDeque4.add(object3);
arrayDeque4.remove(object3);
arrayDeque4.removeLast();
Assert.assertTrue(arrayDeque4.size() == 1);
Assert.assertTrue(arrayDeque4.contains(object1));
}
}