From 1604846c446c839bf7f7604d8a9728a3385616dd Mon Sep 17 00:00:00 2001 From: Paul Sandoz Date: Thu, 3 Oct 2013 10:59:51 +0200 Subject: [PATCH] 8025567: Mark relevant public stream tests as serialization hostile Reviewed-by: alanb --- .../openjdk/tests/java/util/stream/ForEachOpTest.java | 8 ++++---- .../org/openjdk/tests/java/util/stream/SliceOpTest.java | 9 ++++++--- .../tests/java/util/stream/StreamBuilderTest.java | 8 ++++---- .../openjdk/tests/java/util/stream/ToArrayOpTest.java | 3 ++- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java index d5bb72cda5b..e7337e608a3 100644 --- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java +++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java @@ -69,7 +69,7 @@ public class ForEachOpTest extends OpTestCase { }; } - @Test + @Test(groups = { "serialization-hostile" }) public void testForEachOrdered() { List input = countTo(10000); TestData.OfRef data = TestData.Factory.ofCollection("[1, 10000]", input); @@ -116,7 +116,7 @@ public class ForEachOpTest extends OpTestCase { // - @Test + @Test(groups = { "serialization-hostile" }) public void testIntForEachOrdered() { List input = countTo(10000); TestData.OfInt data = TestData.Factory.ofIntSupplier("[1, 10000]", @@ -164,7 +164,7 @@ public class ForEachOpTest extends OpTestCase { // - @Test + @Test(groups = { "serialization-hostile" }) public void testLongForEachOrdered() { List input = countTo(10000); TestData.OfLong data = TestData.Factory.ofLongSupplier("[1, 10000]", @@ -212,7 +212,7 @@ public class ForEachOpTest extends OpTestCase { // - @Test + @Test(groups = { "serialization-hostile" }) public void testDoubleForEachOrdered() { List input = countTo(10000); TestData.OfDouble data = TestData.Factory.ofDoubleSupplier("[1, 10000]", diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java index b8c9b54a343..a02348623c2 100644 --- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java +++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java @@ -147,7 +147,8 @@ public class SliceOpTest extends OpTestCase { return Math.max(0, dataSize - skip); } - @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class) + @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class, + groups = { "serialization-hostile" }) public void testSkipOps(String name, TestData.OfRef data) { List skips = sizes(data.size()); @@ -169,7 +170,8 @@ public class SliceOpTest extends OpTestCase { } } - @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class) + @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class, + groups = { "serialization-hostile" }) public void testSkipLimitOps(String name, TestData.OfRef data) { List skips = sizes(data.size()); List limits = skips; @@ -242,7 +244,8 @@ public class SliceOpTest extends OpTestCase { testSkipLimitOps("testSkipLimitOpsWithNonSplittingSpliterator", data); } - @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class) + @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class, + groups = { "serialization-hostile" }) public void testLimitOps(String name, TestData.OfRef data) { List limits = sizes(data.size()); diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java index cbf87b1e779..d8d46fd6368 100644 --- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java +++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java @@ -97,7 +97,7 @@ public class StreamBuilderTest extends OpTestCase { checkISE(() -> sb.build()); } - @Test(dataProvider = "sizes") + @Test(dataProvider = "sizes", groups = { "serialization-hostile" }) public void testStreamBuilder(int size) { testStreamBuilder(size, (s) -> { Stream.Builder sb = Stream.builder(); @@ -159,7 +159,7 @@ public class StreamBuilderTest extends OpTestCase { checkISE(() -> sb.build()); } - @Test(dataProvider = "sizes") + @Test(dataProvider = "sizes", groups = { "serialization-hostile" }) public void testIntStreamBuilder(int size) { testIntStreamBuilder(size, (s) -> { IntStream.Builder sb = IntStream.builder(); @@ -221,7 +221,7 @@ public class StreamBuilderTest extends OpTestCase { checkISE(() -> sb.build()); } - @Test(dataProvider = "sizes") + @Test(dataProvider = "sizes", groups = { "serialization-hostile" }) public void testLongStreamBuilder(int size) { testLongStreamBuilder(size, (s) -> { LongStream.Builder sb = LongStream.builder(); @@ -282,7 +282,7 @@ public class StreamBuilderTest extends OpTestCase { checkISE(() -> sb.build()); } - @Test(dataProvider = "sizes") + @Test(dataProvider = "sizes", groups = { "serialization-hostile" }) public void testDoubleStreamBuilder(int size) { testDoubleStreamBuilder(size, (s) -> { DoubleStream.Builder sb = DoubleStream.builder(); diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java index 04475e87260..5132d9d91ec 100644 --- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java +++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java @@ -165,7 +165,8 @@ public class ToArrayOpTest extends OpTestCase { }; } - @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class) + @Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class, + groups = { "serialization-hostile" }) public void testStatefulOpPermutations(String name, TestData.OfRef data) { for (Function, Stream> f : statefulOpPermutations) { withData(data).terminal(f, s -> s.toArray())