test/java/util/stream/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -39,10 +39,11 @@
     private static final long[] ones = new long[100];
     private static final long[] twice = new long[200];
     private static final long[] pseudoRandom;
 
     private static final Object[][] testData;
+    private static final Object[][] testSmallData;
     private static final Object[][] spliteratorTestData;
 
     static {
         long[][] arrays = {to0, to1, to10, to100, to1000};
         for (long[] arr : arrays) {

@@ -76,15 +77,19 @@
             {"pseudorandom", pseudoRandom}
     };
 
     static {
         {
-            List<Object[]> list = new ArrayList<>();
+            List<Object[]> listSmall = new ArrayList<>();
+            List<Object[]> list1000 = new ArrayList<>();
+            List<Object[]> list = null;
             for (Object[] data : arrays) {
                 final Object name = data[0];
                 final long[] longs = (long[]) data[1];
 
+                list = longs.length >= 1000 ? list1000 : listSmall;
+
                 list.add(new Object[]{"array:" + name,
                         TestData.Factory.ofArray("array:" + name, longs)});
 
                 SpinedBuffer.OfLong isl = new SpinedBuffer.OfLong();
                 for (long i : longs) {

@@ -96,11 +101,13 @@
                 list.add(streamDataDescr("LongStream.longRange(0,l): " + longs.length,
                                          () -> LongStream.range(0, longs.length)));
                 list.add(streamDataDescr("LongStream.longRangeClosed(0,l): " + longs.length,
                                          () -> LongStream.rangeClosed(0, longs.length)));
             }
-            testData = list.toArray(new Object[0][]);
+            testSmallData = listSmall.toArray(new Object[0][]);
+            list1000.addAll(listSmall);
+            testData = list1000.toArray(new Object[0][]);
         }
 
         {
             List<Object[]> spliterators = new ArrayList<>();
             for (Object[] data : arrays) {

@@ -148,10 +155,15 @@
     @DataProvider(name = "LongStreamTestData")
     public static Object[][] makeLongStreamTestData() {
         return testData;
     }
 
+    @DataProvider(name = "LongStreamTestData.small")
+    public static Object[][] makeSmallLongStreamTestData() {
+        return testSmallData;
+    }
+
     // returns an array of (String name, Supplier<PrimitiveSpliterator<Long>>)
     @DataProvider(name = "LongSpliterator")
     public static Object[][] spliteratorProvider() {
         return spliteratorTestData;
     }