# HG changeset patch
# User psandoz
# Date 1389367054 -3600
# Node ID 0266d88a6ec6127f550f11041d27ffc265163ce6
# Parent  191b8793a5325c521e70b4f63c228170efbd6e36
8031428: CountTest causes lambda Ser/Derialization tests to fail
Reviewed-by: chegar

diff -r 191b8793a532 -r 0266d88a6ec6 jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java	Fri Jan 10 15:51:24 2014 +0100
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java	Fri Jan 10 16:17:34 2014 +0100
@@ -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 @@
 
     @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();
     }
 }