--- a/jdk/test/java/util/stream/boottest/java/util/stream/LongNodeTest.java	Fri Nov 20 15:40:23 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.util.stream;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.PrimitiveIterator;
-import java.util.Spliterators;
-import java.util.function.Function;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-@Test
-public class LongNodeTest extends OpTestCase {
-
-    @DataProvider(name = "nodes")
-    public Object[][] createSizes() {
-        List<Object[]> params = new ArrayList<>();
-
-        for (int size : Arrays.asList(0, 1, 4, 15, 16, 17, 127, 128, 129, 1000)) {
-            long[] array = new long[size];
-            for (int i = 0; i < array.length; i++) {
-                array[i] = i;
-            }
-
-            List<Node<Long>> nodes = new ArrayList<>();
-
-            nodes.add(Nodes.node(array));
-            nodes.add(degenerateTree(Spliterators.iterator(Arrays.spliterator(array))));
-            nodes.add(tree(toList(array), l -> Nodes.node(toLongArray(l))));
-            nodes.add(fill(array, Nodes.longBuilder(array.length)));
-            nodes.add(fill(array, Nodes.longBuilder()));
-
-            for (Node<Long> node : nodes) {
-                params.add(new Object[]{array, node});
-            }
-
-        }
-
-        return params.toArray(new Object[0][]);
-    }
-
-    private static void assertEqualsListLongArray(List<Long> list, long[] array) {
-        assertEquals(list.size(), array.length);
-        for (int i = 0; i < array.length; i++)
-            assertEquals(array[i], (long) list.get(i));
-    }
-
-    private List<Long> toList(long[] a) {
-        List<Long> l = new ArrayList<>();
-        for (long i : a) {
-            l.add(i);
-        }
-
-        return l;
-    }
-
-    private long[] toLongArray(List<Long> l) {
-        long[] a = new long[l.size()];
-
-        int i = 0;
-        for (Long e : l) {
-            a[i++] = e;
-        }
-        return a;
-    }
-
-    private Node.OfLong fill(long[] array, Node.Builder.OfLong nb) {
-        nb.begin(array.length);
-        for (long i : array)
-            nb.accept(i);
-        nb.end();
-        return nb.build();
-    }
-
-    private Node.OfLong degenerateTree(PrimitiveIterator.OfLong it) {
-        if (!it.hasNext()) {
-            return Nodes.node(new long[0]);
-        }
-
-        long i = it.nextLong();
-        if (it.hasNext()) {
-            return new Nodes.ConcNode.OfLong(Nodes.node(new long[] {i}), degenerateTree(it));
-        }
-        else {
-            return Nodes.node(new long[] {i});
-        }
-    }
-
-    private Node.OfLong tree(List<Long> l, Function<List<Long>, Node.OfLong> m) {
-        if (l.size() < 3) {
-            return m.apply(l);
-        }
-        else {
-            return new Nodes.ConcNode.OfLong(
-                    tree(l.subList(0, l.size() / 2), m),
-                    tree(l.subList(l.size() / 2, l.size()), m));
-        }
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testAsArray(long[] array, Node.OfLong n) {
-        assertEquals(n.asPrimitiveArray(), array);
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testFlattenAsArray(long[] array, Node.OfLong n) {
-        assertEquals(Nodes.flattenLong(n).asPrimitiveArray(), array);
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testCopyTo(long[] array, Node.OfLong n) {
-        long[] copy = new long[(int) n.count()];
-        n.copyInto(copy, 0);
-
-        assertEquals(copy, array);
-    }
-
-    @Test(dataProvider = "nodes", groups = { "serialization-hostile" })
-    public void testForEach(long[] array, Node.OfLong n) {
-        List<Long> l = new ArrayList<>((int) n.count());
-        n.forEach((long e) -> {
-            l.add(e);
-        });
-
-        assertEqualsListLongArray(l, array);
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testStreams(long[] array, Node.OfLong n) {
-        TestData.OfLong data = TestData.Factory.ofNode("Node", n);
-
-        exerciseOps(data, s -> s);
-
-        exerciseTerminalOps(data, s -> s.toArray());
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testSpliterator(long[] array, Node.OfLong n) {
-        SpliteratorTestHelper.testLongSpliterator(n::spliterator);
-    }
-
-    @Test(dataProvider = "nodes")
-    public void testTruncate(long[] array, Node.OfLong n) {
-        int[] nums = new int[] { 0, 1, array.length / 2, array.length - 1, array.length };
-        for (int start : nums)
-            for (int end : nums) {
-                if (start < 0 || end < 0 || end < start || end > array.length)
-                    continue;
-                Node.OfLong slice = n.truncate(start, end, Long[]::new);
-                long[] asArray = slice.asPrimitiveArray();
-                for (int k = start; k < end; k++)
-                    assertEquals(array[k], asArray[k - start]);
-            }
-    }
-}