From 7546938fc2d278a964fe3a16ba8161e5564be4a2 Mon Sep 17 00:00:00 2001
From: Paul Sandoz <psandoz@openjdk.org>
Date: Fri, 10 Jan 2014 16:17:34 +0100
Subject: [PATCH] 8031428: CountTest causes lambda Ser/Derialization tests to
 fail

Reviewed-by: chegar
---
 .../tests/java/util/stream/CountTest.java     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java
index 5bf2876f366..c5d337e8539 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java
@@ -29,7 +29,6 @@
 
 package org.openjdk.tests.java.util.stream;
 
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.DoubleStream;
 import java.util.stream.DoubleStreamTestDataProvider;
 import java.util.stream.IntStream;
@@ -47,45 +46,41 @@ public class CountTest extends OpTestCase {
 
     @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class)
     public void testOps(String name, TestData.OfRef<Integer> data) {
-        AtomicLong expectedCount = new AtomicLong();
-        data.stream().forEach(e -> expectedCount.incrementAndGet());
+        long expectedCount = data.size();
 
         withData(data).
                 terminal(Stream::count).
-                expectedResult(expectedCount.get()).
+                expectedResult(expectedCount).
                 exercise();
     }
 
     @Test(dataProvider = "IntStreamTestData", dataProviderClass = IntStreamTestDataProvider.class)
     public void testOps(String name, TestData.OfInt data) {
-        AtomicLong expectedCount = new AtomicLong();
-        data.stream().forEach(e -> expectedCount.incrementAndGet());
+        long expectedCount = data.size();
 
         withData(data).
                 terminal(IntStream::count).
-                expectedResult(expectedCount.get()).
+                expectedResult(expectedCount).
                 exercise();
     }
 
     @Test(dataProvider = "LongStreamTestData", dataProviderClass = LongStreamTestDataProvider.class)
     public void testOps(String name, TestData.OfLong data) {
-        AtomicLong expectedCount = new AtomicLong();
-        data.stream().forEach(e -> expectedCount.incrementAndGet());
+        long expectedCount = data.size();
 
         withData(data).
                 terminal(LongStream::count).
-                expectedResult(expectedCount.get()).
+                expectedResult(expectedCount).
                 exercise();
     }
 
     @Test(dataProvider = "DoubleStreamTestData", dataProviderClass = DoubleStreamTestDataProvider.class)
     public void testOps(String name, TestData.OfDouble data) {
-        AtomicLong expectedCount = new AtomicLong();
-        data.stream().forEach(e -> expectedCount.incrementAndGet());
+        long expectedCount = data.size();
 
         withData(data).
                 terminal(DoubleStream::count).
-                expectedResult(expectedCount.get()).
+                expectedResult(expectedCount).
                 exercise();
     }
 }