< prev index next >
test/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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.
@@ -22,29 +22,25 @@
*/
/*
* @test
* @summary flat-map operations
- * @bug 8044047
+ * @bug 8044047 8076458
*/
package org.openjdk.tests.java.util.stream;
import org.testng.annotations.Test;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.DoubleStream;
-import java.util.stream.DoubleStreamTestDataProvider;
import java.util.stream.IntStream;
-import java.util.stream.IntStreamTestDataProvider;
import java.util.stream.LongStream;
-import java.util.stream.LongStreamTestDataProvider;
import java.util.stream.OpTestCase;
import java.util.stream.Stream;
import java.util.stream.StreamTestDataProvider;
import java.util.stream.TestData;
@@ -98,40 +94,10 @@
s.get().flatMapToDouble(i -> DoubleStream.of(i, i).onClose(onClose::getAndIncrement)).count();
assertEquals(before.get(), onClose.get());
}
- @Test
- public void testIntClose() {
- AtomicInteger before = new AtomicInteger();
- AtomicInteger onClose = new AtomicInteger();
-
- IntStream.of(1, 2).peek(e -> before.getAndIncrement()).
- flatMap(i -> IntStream.of(i, i).onClose(onClose::getAndIncrement)).count();
- assertEquals(before.get(), onClose.get());
- }
-
- @Test
- public void testLongClose() {
- AtomicInteger before = new AtomicInteger();
- AtomicInteger onClose = new AtomicInteger();
-
- LongStream.of(1, 2).peek(e -> before.getAndIncrement()).
- flatMap(i -> LongStream.of(i, i).onClose(onClose::getAndIncrement)).count();
- assertEquals(before.get(), onClose.get());
- }
-
- @Test
- public void testDoubleClose() {
- AtomicInteger before = new AtomicInteger();
- AtomicInteger onClose = new AtomicInteger();
-
- DoubleStream.of(1, 2).peek(e -> before.getAndIncrement()).
- flatMap(i -> DoubleStream.of(i, i).onClose(onClose::getAndIncrement)).count();
- assertEquals(before.get(), onClose.get());
- }
-
@Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class)
public void testOps(String name, TestData.OfRef<Integer> data) {
Collection<Integer> result = exerciseOps(data, s -> s.flatMap(mfId));
assertEquals(data.size(), result.size());
@@ -143,51 +109,6 @@
exerciseOps(data, s -> s.flatMap(mfLt));
exerciseOps(data, s -> s.flatMap(integerRangeMapper));
exerciseOps(data, s -> s.flatMap((Integer e) -> IntStream.range(0, e).boxed().limit(10)));
}
-
- //
-
- @Test(dataProvider = "IntStreamTestData", dataProviderClass = IntStreamTestDataProvider.class)
- public void testIntOps(String name, TestData.OfInt data) {
- Collection<Integer> result = exerciseOps(data, s -> s.flatMap(i -> Collections.singleton(i).stream().mapToInt(j -> j)));
- assertEquals(data.size(), result.size());
- assertContents(data, result);
-
- result = exerciseOps(data, s -> s.flatMap(i -> IntStream.empty()));
- assertEquals(0, result.size());
-
- exerciseOps(data, s -> s.flatMap(e -> IntStream.range(0, e)));
- exerciseOps(data, s -> s.flatMap(e -> IntStream.range(0, e).limit(10)));
- }
-
- //
-
- @Test(dataProvider = "LongStreamTestData", dataProviderClass = LongStreamTestDataProvider.class)
- public void testLongOps(String name, TestData.OfLong data) {
- Collection<Long> result = exerciseOps(data, s -> s.flatMap(i -> Collections.singleton(i).stream().mapToLong(j -> j)));
- assertEquals(data.size(), result.size());
- assertContents(data, result);
-
- result = exerciseOps(data, s -> LongStream.empty());
- assertEquals(0, result.size());
-
- exerciseOps(data, s -> s.flatMap(e -> LongStream.range(0, e)));
- exerciseOps(data, s -> s.flatMap(e -> LongStream.range(0, e).limit(10)));
- }
-
- //
-
- @Test(dataProvider = "DoubleStreamTestData", dataProviderClass = DoubleStreamTestDataProvider.class)
- public void testDoubleOps(String name, TestData.OfDouble data) {
- Collection<Double> result = exerciseOps(data, s -> s.flatMap(i -> Collections.singleton(i).stream().mapToDouble(j -> j)));
- assertEquals(data.size(), result.size());
- assertContents(data, result);
-
- result = exerciseOps(data, s -> DoubleStream.empty());
- assertEquals(0, result.size());
-
- exerciseOps(data, s -> s.flatMap(e -> IntStream.range(0, (int) e).asDoubleStream()));
- exerciseOps(data, s -> s.flatMap(e -> IntStream.range(0, (int) e).limit(10).asDoubleStream()));
- }
}
< prev index next >