提交 66348935 编写于 作者: P psandoz

8044047: Missing null pointer checks for streams

Reviewed-by: dfuchs
Contributed-by: paul.sandoz@oracle.com, ivan.gerasimov@oracle.com
上级 fa84c4e6
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -327,6 +327,7 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>> ...@@ -327,6 +327,7 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public S onClose(Runnable closeHandler) { public S onClose(Runnable closeHandler) {
Objects.requireNonNull(closeHandler);
Runnable existingHandler = sourceStage.sourceCloseAction; Runnable existingHandler = sourceStage.sourceCloseAction;
sourceStage.sourceCloseAction = sourceStage.sourceCloseAction =
(existingHandler == null) (existingHandler == null)
......
...@@ -53,7 +53,7 @@ import java.util.function.Predicate; ...@@ -53,7 +53,7 @@ import java.util.function.Predicate;
* parallelism, which governs the behavior of all stream types. * parallelism, which governs the behavior of all stream types.
* *
* @param <T> the type of the stream elements * @param <T> the type of the stream elements
* @param <S> the type of of the stream implementing {@code BaseStream} * @param <S> the type of the stream implementing {@code BaseStream}
* @since 1.8 * @since 1.8
* @see Stream * @see Stream
* @see IntStream * @see IntStream
......
...@@ -254,6 +254,7 @@ abstract class DoublePipeline<E_IN> ...@@ -254,6 +254,7 @@ abstract class DoublePipeline<E_IN>
@Override @Override
public final DoubleStream flatMap(DoubleFunction<? extends DoubleStream> mapper) { public final DoubleStream flatMap(DoubleFunction<? extends DoubleStream> mapper) {
Objects.requireNonNull(mapper);
return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE, return new StatelessOp<Double>(this, StreamShape.DOUBLE_VALUE,
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) { StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override @Override
...@@ -469,6 +470,7 @@ abstract class DoublePipeline<E_IN> ...@@ -469,6 +470,7 @@ abstract class DoublePipeline<E_IN>
public final <R> R collect(Supplier<R> supplier, public final <R> R collect(Supplier<R> supplier,
ObjDoubleConsumer<R> accumulator, ObjDoubleConsumer<R> accumulator,
BiConsumer<R, R> combiner) { BiConsumer<R, R> combiner) {
Objects.requireNonNull(combiner);
BinaryOperator<R> operator = (left, right) -> { BinaryOperator<R> operator = (left, right) -> {
combiner.accept(left, right); combiner.accept(left, right);
return left; return left;
......
...@@ -768,7 +768,7 @@ public interface DoubleStream extends BaseStream<Double, DoubleStream> { ...@@ -768,7 +768,7 @@ public interface DoubleStream extends BaseStream<Double, DoubleStream> {
* to the element at position {@code n - 1}. * to the element at position {@code n - 1}.
* *
* @param seed the initial element * @param seed the initial element
* @param f a function to be applied to to the previous element to produce * @param f a function to be applied to the previous element to produce
* a new element * a new element
* @return a new sequential {@code DoubleStream} * @return a new sequential {@code DoubleStream}
*/ */
......
...@@ -290,6 +290,7 @@ abstract class IntPipeline<E_IN> ...@@ -290,6 +290,7 @@ abstract class IntPipeline<E_IN>
@Override @Override
public final IntStream flatMap(IntFunction<? extends IntStream> mapper) { public final IntStream flatMap(IntFunction<? extends IntStream> mapper) {
Objects.requireNonNull(mapper);
return new StatelessOp<Integer>(this, StreamShape.INT_VALUE, return new StatelessOp<Integer>(this, StreamShape.INT_VALUE,
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) { StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override @Override
...@@ -465,6 +466,7 @@ abstract class IntPipeline<E_IN> ...@@ -465,6 +466,7 @@ abstract class IntPipeline<E_IN>
public final <R> R collect(Supplier<R> supplier, public final <R> R collect(Supplier<R> supplier,
ObjIntConsumer<R> accumulator, ObjIntConsumer<R> accumulator,
BiConsumer<R, R> combiner) { BiConsumer<R, R> combiner) {
Objects.requireNonNull(combiner);
BinaryOperator<R> operator = (left, right) -> { BinaryOperator<R> operator = (left, right) -> {
combiner.accept(left, right); combiner.accept(left, right);
return left; return left;
......
...@@ -734,7 +734,7 @@ public interface IntStream extends BaseStream<Integer, IntStream> { ...@@ -734,7 +734,7 @@ public interface IntStream extends BaseStream<Integer, IntStream> {
* element at position {@code n - 1}. * element at position {@code n - 1}.
* *
* @param seed the initial element * @param seed the initial element
* @param f a function to be applied to to the previous element to produce * @param f a function to be applied to the previous element to produce
* a new element * a new element
* @return A new sequential {@code IntStream} * @return A new sequential {@code IntStream}
*/ */
......
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -271,6 +271,7 @@ abstract class LongPipeline<E_IN> ...@@ -271,6 +271,7 @@ abstract class LongPipeline<E_IN>
@Override @Override
public final LongStream flatMap(LongFunction<? extends LongStream> mapper) { public final LongStream flatMap(LongFunction<? extends LongStream> mapper) {
Objects.requireNonNull(mapper);
return new StatelessOp<Long>(this, StreamShape.LONG_VALUE, return new StatelessOp<Long>(this, StreamShape.LONG_VALUE,
StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) { StreamOpFlag.NOT_SORTED | StreamOpFlag.NOT_DISTINCT | StreamOpFlag.NOT_SIZED) {
@Override @Override
...@@ -447,6 +448,7 @@ abstract class LongPipeline<E_IN> ...@@ -447,6 +448,7 @@ abstract class LongPipeline<E_IN>
public final <R> R collect(Supplier<R> supplier, public final <R> R collect(Supplier<R> supplier,
ObjLongConsumer<R> accumulator, ObjLongConsumer<R> accumulator,
BiConsumer<R, R> combiner) { BiConsumer<R, R> combiner) {
Objects.requireNonNull(combiner);
BinaryOperator<R> operator = (left, right) -> { BinaryOperator<R> operator = (left, right) -> {
combiner.accept(left, right); combiner.accept(left, right);
return left; return left;
......
...@@ -727,7 +727,7 @@ public interface LongStream extends BaseStream<Long, LongStream> { ...@@ -727,7 +727,7 @@ public interface LongStream extends BaseStream<Long, LongStream> {
* element at position {@code n - 1}. * element at position {@code n - 1}.
* *
* @param seed the initial element * @param seed the initial element
* @param f a function to be applied to to the previous element to produce * @param f a function to be applied to the previous element to produce
* a new element * a new element
* @return a new sequential {@code LongStream} * @return a new sequential {@code LongStream}
*/ */
......
...@@ -74,7 +74,7 @@ abstract class PipelineHelper<P_OUT> { ...@@ -74,7 +74,7 @@ abstract class PipelineHelper<P_OUT> {
/** /**
* Returns the exact output size of the portion of the output resulting from * Returns the exact output size of the portion of the output resulting from
* applying the pipeline stages described by this {@code PipelineHelper} to * applying the pipeline stages described by this {@code PipelineHelper} to
* the the portion of the input described by the provided * the portion of the input described by the provided
* {@code Spliterator}, if known. If not known or known infinite, will * {@code Spliterator}, if known. If not known or known infinite, will
* return {@code -1}. * return {@code -1}.
* *
......
...@@ -693,7 +693,7 @@ final class SliceOps { ...@@ -693,7 +693,7 @@ final class SliceOps {
* size. * size.
* *
* @param target the target size * @param target the target size
* @return return the number of completed elements * @return the number of completed elements
*/ */
private long completedSize(long target) { private long completedSize(long target) {
if (completed) if (completed)
......
...@@ -1013,7 +1013,7 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> { ...@@ -1013,7 +1013,7 @@ public interface Stream<T> extends BaseStream<T, Stream<T>> {
* *
* @param <T> the type of stream elements * @param <T> the type of stream elements
* @param seed the initial element * @param seed the initial element
* @param f a function to be applied to to the previous element to produce * @param f a function to be applied to the previous element to produce
* a new element * a new element
* @return a new sequential {@code Stream} * @return a new sequential {@code Stream}
*/ */
......
...@@ -115,7 +115,7 @@ import java.util.Spliterator; ...@@ -115,7 +115,7 @@ import java.util.Spliterator;
* characteristics that stream has; when describing a stream operation, one need * characteristics that stream has; when describing a stream operation, one need
* describe whether the operation preserves, injects, or clears that * describe whether the operation preserves, injects, or clears that
* characteristic. Accordingly, two bits are used for each flag, so as to allow * characteristic. Accordingly, two bits are used for each flag, so as to allow
* representing not only the presence of of a characteristic, but how an * representing not only the presence of a characteristic, but how an
* operation modifies that characteristic. There are two common forms in which * operation modifies that characteristic. There are two common forms in which
* flag bits are combined into an {@code int} bit set. <em>Stream flags</em> * flag bits are combined into an {@code int} bit set. <em>Stream flags</em>
* are a unioned bit set constructed by ORing the enum characteristic values of * are a unioned bit set constructed by ORing the enum characteristic values of
......
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package java.util.stream;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
public final class ThowableHelper {
public static void checkException(Class<? extends Exception> ce, Runnable r) {
Exception caught = null;
try {
r.run();
} catch (Exception e) {
caught = e;
}
assertNotNull(caught);
assertTrue(ce.isInstance(caught));
}
public static void checkNPE(Runnable r) {
checkException(NullPointerException.class, r);
}
public static void checkISE(Runnable r) {
checkException(IllegalStateException.class, r);
}
}
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -20,52 +20,110 @@ ...@@ -20,52 +20,110 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
/*
* @test
* @summary primtive stream collection with summary statistics
* @bug 8044047
*/
package org.openjdk.tests.java.util.stream; package org.openjdk.tests.java.util.stream;
import org.testng.annotations.Test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.DoubleSummaryStatistics; import java.util.DoubleSummaryStatistics;
import java.util.IntSummaryStatistics; import java.util.IntSummaryStatistics;
import java.util.List; import java.util.List;
import java.util.LongSummaryStatistics; import java.util.LongSummaryStatistics;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
import java.util.stream.OpTestCase; import java.util.stream.OpTestCase;
import org.testng.annotations.Test;
import static java.util.stream.LambdaTestHelpers.countTo; import static java.util.stream.LambdaTestHelpers.countTo;
import static java.util.stream.ThowableHelper.checkNPE;
/**
* TestSummaryStatistics
*
* @author Brian Goetz
*/
@Test @Test
public class SummaryStatisticsTest extends OpTestCase { public class CollectAndSummaryStatisticsTest extends OpTestCase {
public void testIntCollectNull() {
checkNPE(() -> IntStream.of(1).collect(null,
IntSummaryStatistics::accept,
IntSummaryStatistics::combine));
checkNPE(() -> IntStream.of(1).collect(IntSummaryStatistics::new,
null,
IntSummaryStatistics::combine));
checkNPE(() -> IntStream.of(1).collect(IntSummaryStatistics::new,
IntSummaryStatistics::accept,
null));
}
public void testLongCollectNull() {
checkNPE(() -> LongStream.of(1).collect(null,
LongSummaryStatistics::accept,
LongSummaryStatistics::combine));
checkNPE(() -> LongStream.of(1).collect(LongSummaryStatistics::new,
null,
LongSummaryStatistics::combine));
checkNPE(() -> LongStream.of(1).collect(LongSummaryStatistics::new,
LongSummaryStatistics::accept,
null));
}
public void testDoubleCollectNull() {
checkNPE(() -> DoubleStream.of(1).collect(null,
DoubleSummaryStatistics::accept,
DoubleSummaryStatistics::combine));
checkNPE(() -> DoubleStream.of(1).collect(DoubleSummaryStatistics::new,
null,
DoubleSummaryStatistics::combine));
checkNPE(() -> DoubleStream.of(1).collect(DoubleSummaryStatistics::new,
DoubleSummaryStatistics::accept,
null));
}
public void testIntStatistics() { public void testIntStatistics() {
List<IntSummaryStatistics> instances = new ArrayList<>(); List<IntSummaryStatistics> instances = new ArrayList<>();
instances.add(countTo(1000).stream().collect(Collectors.summarizingInt(i -> i))); instances.add(countTo(1000).stream().collect(Collectors.summarizingInt(i -> i)));
instances.add(countTo(1000).stream().mapToInt(i -> i).summaryStatistics()); instances.add(countTo(1000).stream().mapToInt(i -> i).summaryStatistics());
instances.add(countTo(1000).stream().mapToInt(i -> i).collect(IntSummaryStatistics::new,
IntSummaryStatistics::accept,
IntSummaryStatistics::combine));
instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingInt(i -> i))); instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingInt(i -> i)));
instances.add(countTo(1000).parallelStream().mapToInt(i -> i).summaryStatistics()); instances.add(countTo(1000).parallelStream().mapToInt(i -> i).summaryStatistics());
instances.add(countTo(1000).parallelStream().mapToInt(i -> i).collect(IntSummaryStatistics::new,
IntSummaryStatistics::accept,
IntSummaryStatistics::combine));
for (IntSummaryStatistics stats : instances) { for (IntSummaryStatistics stats : instances) {
assertEquals(stats.getCount(), 1000); assertEquals(stats.getCount(), 1000);
assertEquals(stats.getSum(), countTo(1000).stream().mapToInt(i -> i).sum()); assertEquals(stats.getSum(), countTo(1000).stream().mapToInt(i -> i).sum());
assertEquals(stats.getAverage(), (double) stats.getSum() / stats.getCount());
assertEquals(stats.getMax(), 1000); assertEquals(stats.getMax(), 1000);
assertEquals(stats.getMin(), 1); assertEquals(stats.getMin(), 1);
} }
} }
public void testLongStatistics() { public void testLongStatistics() {
List<LongSummaryStatistics> instances = new ArrayList<>(); List<LongSummaryStatistics> instances = new ArrayList<>();
instances.add(countTo(1000).stream().collect(Collectors.summarizingLong(i -> i))); instances.add(countTo(1000).stream().collect(Collectors.summarizingLong(i -> i)));
instances.add(countTo(1000).stream().mapToLong(i -> i).summaryStatistics()); instances.add(countTo(1000).stream().mapToLong(i -> i).summaryStatistics());
instances.add(countTo(1000).stream().mapToLong(i -> i).collect(LongSummaryStatistics::new,
LongSummaryStatistics::accept,
LongSummaryStatistics::combine));
instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingLong(i -> i))); instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingLong(i -> i)));
instances.add(countTo(1000).parallelStream().mapToLong(i -> i).summaryStatistics()); instances.add(countTo(1000).parallelStream().mapToLong(i -> i).summaryStatistics());
instances.add(countTo(1000).parallelStream().mapToLong(i -> i).collect(LongSummaryStatistics::new,
LongSummaryStatistics::accept,
LongSummaryStatistics::combine));
for (LongSummaryStatistics stats : instances) { for (LongSummaryStatistics stats : instances) {
assertEquals(stats.getCount(), 1000); assertEquals(stats.getCount(), 1000);
assertEquals(stats.getSum(), (long) countTo(1000).stream().mapToInt(i -> i).sum()); assertEquals(stats.getSum(), (long) countTo(1000).stream().mapToInt(i -> i).sum());
assertEquals(stats.getAverage(), (double) stats.getSum() / stats.getCount());
assertEquals(stats.getMax(), 1000L); assertEquals(stats.getMax(), 1000L);
assertEquals(stats.getMin(), 1L); assertEquals(stats.getMin(), 1L);
} }
...@@ -75,12 +133,19 @@ public class SummaryStatisticsTest extends OpTestCase { ...@@ -75,12 +133,19 @@ public class SummaryStatisticsTest extends OpTestCase {
List<DoubleSummaryStatistics> instances = new ArrayList<>(); List<DoubleSummaryStatistics> instances = new ArrayList<>();
instances.add(countTo(1000).stream().collect(Collectors.summarizingDouble(i -> i))); instances.add(countTo(1000).stream().collect(Collectors.summarizingDouble(i -> i)));
instances.add(countTo(1000).stream().mapToDouble(i -> i).summaryStatistics()); instances.add(countTo(1000).stream().mapToDouble(i -> i).summaryStatistics());
instances.add(countTo(1000).stream().mapToDouble(i -> i).collect(DoubleSummaryStatistics::new,
DoubleSummaryStatistics::accept,
DoubleSummaryStatistics::combine));
instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingDouble(i -> i))); instances.add(countTo(1000).parallelStream().collect(Collectors.summarizingDouble(i -> i)));
instances.add(countTo(1000).parallelStream().mapToDouble(i -> i).summaryStatistics()); instances.add(countTo(1000).parallelStream().mapToDouble(i -> i).summaryStatistics());
instances.add(countTo(1000).parallelStream().mapToDouble(i -> i).collect(DoubleSummaryStatistics::new,
DoubleSummaryStatistics::accept,
DoubleSummaryStatistics::combine));
for (DoubleSummaryStatistics stats : instances) { for (DoubleSummaryStatistics stats : instances) {
assertEquals(stats.getCount(), 1000); assertEquals(stats.getCount(), 1000);
assertEquals(stats.getSum(), (double) countTo(1000).stream().mapToInt(i -> i).sum()); assertEquals(stats.getSum(), (double) countTo(1000).stream().mapToInt(i -> i).sum());
assertEquals(stats.getAverage(), stats.getSum() / stats.getCount());
assertEquals(stats.getMax(), 1000.0); assertEquals(stats.getMax(), 1000.0);
assertEquals(stats.getMin(), 1.0); assertEquals(stats.getMin(), 1.0);
} }
......
/* /*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
/*
* @test
* @summary flat-map operations
* @bug 8044047
*/
package org.openjdk.tests.java.util.stream; package org.openjdk.tests.java.util.stream;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -31,14 +38,17 @@ import java.util.function.Function; ...@@ -31,14 +38,17 @@ import java.util.function.Function;
import java.util.stream.*; import java.util.stream.*;
import static java.util.stream.LambdaTestHelpers.*; import static java.util.stream.LambdaTestHelpers.*;
import static java.util.stream.ThowableHelper.checkNPE;
/**
* ExplodeOpTest
*
* @author Brian Goetz
*/
@Test @Test
public class ExplodeOpTest extends OpTestCase { public class FlatMapOpTest extends OpTestCase {
public void testNullMapper() {
checkNPE(() -> Stream.of(1).flatMap(null));
checkNPE(() -> IntStream.of(1).flatMap(null));
checkNPE(() -> LongStream.of(1).flatMap(null));
checkNPE(() -> DoubleStream.of(1).flatMap(null));
}
static final Function<Integer, Stream<Integer>> integerRangeMapper static final Function<Integer, Stream<Integer>> integerRangeMapper
= e -> IntStream.range(0, e).boxed(); = e -> IntStream.range(0, e).boxed();
......
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -38,6 +38,7 @@ import java.util.stream.Stream; ...@@ -38,6 +38,7 @@ import java.util.stream.Stream;
import java.util.stream.TestData; import java.util.stream.TestData;
import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toList;
import static java.util.stream.ThowableHelper.checkISE;
@Test @Test
public class StreamBuilderTest extends OpTestCase { public class StreamBuilderTest extends OpTestCase {
...@@ -52,23 +53,6 @@ public class StreamBuilderTest extends OpTestCase { ...@@ -52,23 +53,6 @@ public class StreamBuilderTest extends OpTestCase {
return sizes.stream().map(i -> new Object[] { i }).toArray(Object[][]::new); return sizes.stream().map(i -> new Object[] { i }).toArray(Object[][]::new);
} }
private void checkException(Class<? extends Exception> ce, Runnable r) {
Exception caught = null;
try {
r.run();
} catch (Exception e) {
caught = e;
}
assertNotNull(caught);
assertTrue(ce.isInstance(caught));
}
private void checkISE(Runnable r) {
checkException(IllegalStateException.class, r);
}
//
@Test @Test
public void testSingleton() { public void testSingleton() {
......
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -20,6 +20,13 @@ ...@@ -20,6 +20,13 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
/*
* @test
* @summary close handlers and closing streams
* @bug 8044047
*/
package org.openjdk.tests.java.util.stream; package org.openjdk.tests.java.util.stream;
import java.util.Arrays; import java.util.Arrays;
...@@ -29,14 +36,14 @@ import java.util.stream.Stream; ...@@ -29,14 +36,14 @@ import java.util.stream.Stream;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import static java.util.stream.LambdaTestHelpers.countTo; import static java.util.stream.LambdaTestHelpers.countTo;
import static java.util.stream.ThowableHelper.checkNPE;
/**
* StreamCloseTest
*
* @author Brian Goetz
*/
@Test(groups = { "serialization-hostile" }) @Test(groups = { "serialization-hostile" })
public class StreamCloseTest extends OpTestCase { public class StreamCloseTest extends OpTestCase {
public void testNullCloseHandler() {
checkNPE(() -> Stream.of(1).onClose(null));
}
public void testEmptyCloseHandler() { public void testEmptyCloseHandler() {
try (Stream<Integer> ints = countTo(100).stream()) { try (Stream<Integer> ints = countTo(100).stream()) {
ints.forEach(i -> {}); ints.forEach(i -> {});
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册