Mercurial > hg > openjdk > jdk8u > jdk
changeset 13461:a23ef4a0fbcb
8148928: java/util/stream/test/**/SequentialOpTest.java timed out intermittently
Reviewed-by: psandoz
Contributed-by: huaming.li@oracle.com
author | amlu |
---|---|
date | Fri, 05 Feb 2016 09:54:56 +0800 |
parents | 1a9f062574c0 |
children | 27bdb1ffadcc |
files | test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java test/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java |
diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java Mon Feb 01 09:38:08 2016 +0800 +++ b/test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java Fri Feb 05 09:54:56 2016 +0800 @@ -47,6 +47,7 @@ private static final Object[][] testData; private static final Object[][] testSmallData; + private static final Object[][] testMiniData; private static final Object[][] withNullTestData; private static final Object[][] spliteratorTestData; @@ -85,6 +86,7 @@ static { { + List<Object[]> listMini = new ArrayList<>(); List<Object[]> listSmall = new ArrayList<>(); List<Object[]> list1000 = new ArrayList<>(); List<Object[]> list = null; @@ -93,7 +95,7 @@ final Integer[] ints = (Integer[])data[1]; final List<Integer> intsAsList = Arrays.asList(ints); - list = ints.length >= 1000 ? list1000 : listSmall; + list = ints.length >= 1000 ? list1000 : (ints.length >= 100 ? listSmall : listMini); list.add(arrayDataDescr("array:" + name, ints)); list.add(collectionDataDescr("ArrayList.asList:" + name, intsAsList)); @@ -119,6 +121,8 @@ // @@@ Add more } + testMiniData = listMini.toArray(new Object[0][]); + listSmall.addAll(listMini); testSmallData = listSmall.toArray(new Object[0][]); list1000.addAll(listSmall); testData = list1000.toArray(new Object[0][]); @@ -204,6 +208,11 @@ return testSmallData; } + @DataProvider(name = "StreamTestData<Integer>.mini") + public static Object[][] makeMiniStreamTestData() { + return testMiniData; + } + @DataProvider(name = "withNull:StreamTestData<Integer>") public static Object[][] makeStreamWithNullTestData() { return withNullTestData;
--- a/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java Mon Feb 01 09:38:08 2016 +0800 +++ b/test/java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java Fri Feb 05 09:54:56 2016 +0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -94,7 +94,7 @@ } @SuppressWarnings({"rawtypes", "unchecked"}) - @Test(dataProvider = "StreamTestData<Integer>", dataProviderClass = StreamTestDataProvider.class) + @Test(dataProvider = "StreamTestData<Integer>.mini", dataProviderClass = StreamTestDataProvider.class) public void testMixedSeqPar(String name, TestData.OfRef<Integer> data) { Function<Integer, Integer> id = LambdaTestHelpers.identity(); UnaryOperator<Stream<Integer>>[] changers