From 1aa0bf7daf8543eb2ce0b49bb3814ff80d32b0eb Mon Sep 17 00:00:00 2001
From: Amy Lu <amlu@openjdk.org>
Date: Thu, 16 Jul 2015 10:21:21 +0200
Subject: [PATCH] 8131140: Mark some tests from WhileOpStatefulTest.java and
 WhileOpTest.java as serialization hostile

Reviewed-by: psandoz
---
 .../java/util/stream/WhileOpStatefulTest.java   |  8 ++++----
 .../tests/java/util/stream/WhileOpTest.java     | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
index 4c39ae6022d..c980e17d05f 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java
@@ -87,7 +87,7 @@ public class WhileOpStatefulTest extends OpTestCase {
                 });
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testCountTakeWithCount() {
         testTakeWhileMulti(
                 s -> {
@@ -116,7 +116,7 @@ public class WhileOpStatefulTest extends OpTestCase {
                 });
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testCountTakeWithToArray() {
         testTakeWhileMulti(
                 s -> {
@@ -146,7 +146,7 @@ public class WhileOpStatefulTest extends OpTestCase {
     }
 
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testCountDropWithCount() {
         testDropWhileMulti(
                 s -> {
@@ -179,7 +179,7 @@ public class WhileOpStatefulTest extends OpTestCase {
                 });
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testCountDropWithToArray() {
         testDropWhileMulti(
                 s -> {
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
index b710791fb4e..5b023b87e79 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
@@ -51,7 +51,8 @@ import java.util.stream.TestData;
 @Test
 public class WhileOpTest extends OpTestCase {
 
-    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class)
+    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class,
+          groups = { "serialization-hostile" })
     public void testTakeWhileOps(String name, TestData.OfRef<Integer> data) {
         for (int size : sizes(data.size())) {
             setContext("takeWhile", size);
@@ -73,7 +74,8 @@ public class WhileOpTest extends OpTestCase {
         }
     }
 
-    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class)
+    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class,
+          groups = { "serialization-hostile" })
     public void testDropWhileOps(String name, TestData.OfRef<Integer> data) {
         for (int size : sizes(data.size())) {
             setContext("dropWhile", size);
@@ -94,7 +96,8 @@ public class WhileOpTest extends OpTestCase {
         }
     }
 
-    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class)
+    @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class,
+          groups = { "serialization-hostile" })
     public void testDropTakeWhileOps(String name, TestData.OfRef<Integer> data) {
         for (int size : sizes(data.size())) {
             setContext("dropWhile", size);
@@ -319,7 +322,7 @@ public class WhileOpTest extends OpTestCase {
         }
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testRefDefaultClose() {
         AtomicBoolean isClosed = new AtomicBoolean();
         Stream<Integer> s = Stream.of(1, 2, 3).onClose(() -> isClosed.set(true));
@@ -329,7 +332,7 @@ public class WhileOpTest extends OpTestCase {
         assertTrue(isClosed.get());
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testIntDefaultClose() {
         AtomicBoolean isClosed = new AtomicBoolean();
         IntStream s = IntStream.of(1, 2, 3).onClose(() -> isClosed.set(true));
@@ -339,7 +342,7 @@ public class WhileOpTest extends OpTestCase {
         assertTrue(isClosed.get());
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testLongDefaultClose() {
         AtomicBoolean isClosed = new AtomicBoolean();
         LongStream s = LongStream.of(1, 2, 3).onClose(() -> isClosed.set(true));
@@ -349,7 +352,7 @@ public class WhileOpTest extends OpTestCase {
         assertTrue(isClosed.get());
     }
 
-    @Test
+    @Test(groups = { "serialization-hostile" })
     public void testDoubleDefaultClose() {
         AtomicBoolean isClosed = new AtomicBoolean();
         DoubleStream s = DoubleStream.of(1, 2, 3).onClose(() -> isClosed.set(true));