Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions guava-tests/test/com/google/common/collect/ListsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@
import java.util.ListIterator;
import java.util.NoSuchElementException;
import java.util.RandomAccess;
import java.util.Spliterator;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Expand Down Expand Up @@ -674,6 +676,57 @@ public void testTransformHashCodeSequential() {
assertEquals(SOME_STRING_LIST.hashCode(), list.hashCode());
}

@GwtIncompatible // Spliterator
public void testTransformSpliterator_delegatesCharacteristics_randomAccess() {
CopyOnWriteArrayList<Integer> cowList = new CopyOnWriteArrayList<>(asList(1, 2, 3));
assertEquals(
cowList.spliterator().characteristics(),
transform(cowList, i -> i).spliterator().characteristics());

ArrayList<Integer> arrayList = new ArrayList<>(asList(1, 2, 3));
assertEquals(
arrayList.spliterator().characteristics(),
transform(arrayList, i -> i).spliterator().characteristics());
}

@GwtIncompatible // Spliterator
public void testTransformSpliterator_delegatesCharacteristics_sequential() {
LinkedList<Integer> fromList = new LinkedList<>(asList(1, 2, 3));
Spliterator<Integer> spliterator = transform(fromList, i -> i).spliterator();
assertTrue(spliterator.hasCharacteristics(Spliterator.ORDERED));
assertTrue(spliterator.hasCharacteristics(Spliterator.SIZED));
}

@GwtIncompatible // Spliterator, CopyOnWriteArrayList
public void testTransformSpliterator_concurrentStreamDoesNotThrow() throws Exception {
CopyOnWriteArrayList<Integer> fromList = new CopyOnWriteArrayList<>();
for (int i = 0; i < 1000; i++) {
fromList.add(i);
}
List<Integer> view = transform(fromList, i -> i);
AtomicBoolean stop = new AtomicBoolean();
Thread mutator =
new Thread(
() -> {
while (!stop.get()) {
for (int i = 0; i < 1000; i++) {
fromList.add(i);
}
fromList.clear();
}
});
mutator.setDaemon(true);
mutator.start();
try {
for (int i = 0; i < 100; i++) {
view.stream().forEach(x -> {});
}
} finally {
stop.set(true);
mutator.join(1000);
}
}

public void testTransformModifiableRandomAccess() {
List<Integer> fromList = new ArrayList<>(SOME_LIST);
List<String> list = transform(fromList, SOME_FUNCTION);
Expand Down
13 changes: 13 additions & 0 deletions guava/src/com/google/common/collect/Lists.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.RandomAccess;
import java.util.Spliterator;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Predicate;
import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -605,6 +606,12 @@ public boolean removeIf(Predicate<? super T> filter) {
return fromList.removeIf(element -> filter.test(function.apply(element)));
}

@Override
@GwtIncompatible // Spliterator
public Spliterator<T> spliterator() {
return CollectSpliterators.map(fromList.spliterator(), 0, function::apply);
}

@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
}

Expand Down Expand Up @@ -678,6 +685,12 @@ public int size() {
return fromList.size();
}

@Override
@GwtIncompatible // Spliterator
public Spliterator<T> spliterator() {
return CollectSpliterators.map(fromList.spliterator(), 0, function::apply);
}

@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0;
}

Expand Down