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 Stream.min and Stream.max (#520)

Browse Source
This commit is contained in:
Ivan Hetman 2020-09-08 19:02:45 +03:00 committed by GitHub
parent d97dce4650
commit fcc1fb7690
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classlib/src/main/java/org/teavm/classlib/java/util/stream/impl/TSimpleStreamImpl.java
View File

@ -226,12 +226,12 @@ public abstract class TSimpleStreamImpl<T> implements TStream<T> {
@Override @Override
public Optional<T> min(Comparator<? super T> comparator) { public Optional<T> min(Comparator<? super T> comparator) {
return reduce((a, b) -> comparator.compare(a, b) < 0 ? a : b); return reduce((a, b) -> comparator.compare(a, b) <= 0 ? a : b);
} }
@Override @Override
public Optional<T> max(Comparator<? super T> comparator) { public Optional<T> max(Comparator<? super T> comparator) {
return reduce((a, b) -> comparator.compare(a, b) > 0 ? a : b); return reduce((a, b) -> comparator.compare(a, b) >= 0 ? a : b);
} }
@Override @Override

22
tests/src/test/java/org/teavm/classlib/java/util/stream/StreamTest.java
View File

@ -18,12 +18,15 @@ package org.teavm.classlib.java.util.stream;
import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.teavm.classlib.java.util.stream.Helper.appendNumbersTo; import static org.teavm.classlib.java.util.stream.Helper.appendNumbersTo;
import static org.teavm.classlib.java.util.stream.Helper.testDoubleStream; import static org.teavm.classlib.java.util.stream.Helper.testDoubleStream;
import static org.teavm.classlib.java.util.stream.Helper.testIntStream; import static org.teavm.classlib.java.util.stream.Helper.testIntStream;
import static org.teavm.classlib.java.util.stream.Helper.testIntegerStream; import static org.teavm.classlib.java.util.stream.Helper.testIntegerStream;
import static org.teavm.classlib.java.util.stream.Helper.testLongStream; import static org.teavm.classlib.java.util.stream.Helper.testLongStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.Spliterator; import java.util.Spliterator;
@ -287,6 +290,25 @@ public class StreamTest {
assertFalse(Stream.<Integer>empty().min(Comparator.comparing(x -> x)).isPresent()); assertFalse(Stream.<Integer>empty().min(Comparator.comparing(x -> x)).isPresent());
assertFalse(Stream.<Integer>empty().max(Comparator.comparing(x -> x)).isPresent()); assertFalse(Stream.<Integer>empty().max(Comparator.comparing(x -> x)).isPresent());
IntPair first = new IntPair(0, 0);
IntPair second = new IntPair(0, 1);
Comparator<IntPair> comp = Comparator.comparingInt(p -> p.number);
assertEquals(0, Stream.of(first, second).max(comp).get().id);
assertEquals(0, Stream.of(first, second).min(comp).get().id);
assertSame(Collections.max(Arrays.asList(first, second), comp), Stream.of(first, second).max(comp).get());
assertSame(Collections.min(Arrays.asList(first, second), comp), Stream.of(first, second).min(comp).get());
}
private static class IntPair {
private final int number;
private final int id;
private IntPair(int number, int id) {
this.number = number;
this.id = id;
}
} }
@Test @Test