Automated rollback of 9e6e1d0

*** Reason for rollback *** Appears to tickle a J2CL bug. *** Original change description *** Fix #3156 by implementing a proper CollectSpliterators.flatMapTo{Int,Long,Double}. *** ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=198112871
google · May 29, 2018 · c30df91 · c30df91
1 parent e04eb59
commit c30df91
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 364 deletions.
diff --git a/guava-gwt/test/com/google/common/collect/StreamsTest_gwt.java b/guava-gwt/test/com/google/common/collect/StreamsTest_gwt.java
@@ -18,26 +18,6 @@ public class StreamsTest_gwt extends com.google.gwt.junit.client.GWTTestCase {
 @Override public String getModuleName() {
   return "com.google.common.collect.testModule";
 }
-public void testConcatInfiniteStream() throws Exception {
-  com.google.common.collect.StreamsTest testCase = new com.google.common.collect.StreamsTest();
-  testCase.testConcatInfiniteStream();
-}
-
-public void testConcatInfiniteStream_double() throws Exception {
-  com.google.common.collect.StreamsTest testCase = new com.google.common.collect.StreamsTest();
-  testCase.testConcatInfiniteStream_double();
-}
-
-public void testConcatInfiniteStream_int() throws Exception {
-  com.google.common.collect.StreamsTest testCase = new com.google.common.collect.StreamsTest();
-  testCase.testConcatInfiniteStream_int();
-}
-
-public void testConcatInfiniteStream_long() throws Exception {
-  com.google.common.collect.StreamsTest testCase = new com.google.common.collect.StreamsTest();
-  testCase.testConcatInfiniteStream_long();
-}
-
 public void testConcat_doubleStream() throws Exception {
   com.google.common.collect.StreamsTest testCase = new com.google.common.collect.StreamsTest();
   testCase.testConcat_doubleStream();

diff --git a/guava-tests/test/com/google/common/collect/StreamsTest.java b/guava-tests/test/com/google/common/collect/StreamsTest.java
@@ -172,30 +172,6 @@ public void testStream_optionalDouble() {
     assertThat(stream(OptionalDouble.of(5.0))).containsExactly(5.0);
   }
 
-  public void testConcatInfiniteStream() {
-    assertThat(Streams.concat(Stream.of(1, 2, 3), Stream.generate(() -> 5)).limit(5))
-        .containsExactly(1, 2, 3, 5, 5)
-        .inOrder();
-  }
-
-  public void testConcatInfiniteStream_int() {
-    assertThat(Streams.concat(IntStream.of(1, 2, 3), IntStream.generate(() -> 5)).limit(5))
-        .containsExactly(1, 2, 3, 5, 5)
-        .inOrder();
-  }
-
-  public void testConcatInfiniteStream_long() {
-    assertThat(Streams.concat(LongStream.of(1, 2, 3), LongStream.generate(() -> 5)).limit(5))
-        .containsExactly(1L, 2L, 3L, 5L, 5L)
-        .inOrder();
-  }
-
-  public void testConcatInfiniteStream_double() {
-    assertThat(Streams.concat(DoubleStream.of(1, 2, 3), DoubleStream.generate(() -> 5)).limit(5))
-        .containsExactly(1., 2., 3., 5., 5.)
-        .inOrder();
-  }
-
   private void testMapWithIndex(Function<Collection<String>, Stream<String>> collectionImpl) {
     SpliteratorTester.of(
             () ->