OpenJDK / jigsaw / jake / jdk
changeset 14489:5b75092f3ecc
Enable java.util.stream tests
| author | mchung |
|---|---|
| date | Mon, 16 Nov 2015 16:02:09 -0800 |
| parents | 7d50c0ed10ea |
| children | 67c711a267db e5fcea3aa679 |
| files | test/ProblemList.jake.txt test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java test/java/nio/file/Files/StreamLinesTest.java test/java/security/PermissionCollection/PermissionCollectionStreamTest.java test/java/util/Scanner/ScannerStreamTest.java test/java/util/regex/PatternStreamTest.java test/java/util/stream/bootlib/TEST.properties test/java/util/stream/boottest/TEST.properties test/java/util/stream/test/TEST.properties |
| diffstat | 9 files changed, 13 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/test/ProblemList.jake.txt Mon Nov 16 12:54:01 2015 +0800 +++ b/test/ProblemList.jake.txt Mon Nov 16 16:02:09 2015 -0800 @@ -58,79 +58,6 @@ # 8059035 sun/tools/jinfo/JInfoSanityTest.java generic-all -############################################################################ - -# Exclude tests depending on package-private API or testlibrary -# until jtreg support is implemented - -java/util/stream/boottest/java/util/stream/DoubleNodeTest.java generic-all -java/util/stream/boottest/java/util/stream/FlagOpTest.java generic-all -java/util/stream/boottest/java/util/stream/IntNodeTest.java generic-all -java/util/stream/boottest/java/util/stream/LongNodeTest.java generic-all -java/util/stream/boottest/java/util/stream/NodeBuilderTest.java generic-all -java/util/stream/boottest/java/util/stream/NodeTest.java generic-all -java/util/stream/boottest/java/util/stream/SliceSpliteratorTest.java generic-all -java/util/stream/boottest/java/util/stream/SpinedBufferTest.java generic-all -java/util/stream/boottest/java/util/stream/StreamFlagsTest.java generic-all -java/util/stream/boottest/java/util/stream/StreamOpFlagsTest.java generic-all -java/util/stream/boottest/java/util/stream/StreamReuseTest.java generic-all -java/util/stream/boottest/java/util/stream/UnorderedTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/lang/invoke/DeserializeMethodTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/lang/invoke/MHProxiesTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/lang/invoke/SerializedLambdaTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/MapTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/NullArgsTestCase.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/SplittableRandomTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ConcatTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/CountLargeTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/DoublePrimitiveOpsTests.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/FilterOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/FindAnyOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/FindFirstOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ForEachOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/GroupByOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/IntPrimitiveOpsTests.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/IntReduceTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/IntSliceOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/IntUniqOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/LongPrimitiveOpsTests.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/MapOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/MatchOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/MinMaxTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveAverageOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/PrimitiveSumTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/RangeTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceByOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ReduceTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/SequentialOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/SliceOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/SortedOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/StreamLinkTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/StreamParSeqTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/StreamSpliteratorTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/TeeOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpStatefulTest.java generic-all -java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java generic-all - -# these tests use the streams tests -java/util/regex/PatternStreamTest.java generic-all -java/util/Scanner/ScannerStreamTest.java generic-all -java/nio/file/Files/StreamLinesTest.java generic-all -java/net/NetworkInterface/NetworkInterfaceStreamTest.java generic-all -java/security/PermissionCollection/PermissionCollectionStreamTest.java generic-all ############################################################################
--- a/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/net/NetworkInterface/NetworkInterfaceStreamTest.java Mon Nov 16 16:02:09 2015 -0800 @@ -24,8 +24,8 @@ /* @test * @bug 8081678 * @summary Tests for stream returning methods - * @library ../../util/stream/bootlib/java.base - * @build java.util.stream.OpTestCase + * @library ../../util/stream/bootlib + * @build java.base/java.util.stream.OpTestCase * @run testng/othervm NetworkInterfaceStreamTest * @run testng/othervm -Djava.net.preferIPv4Stack=true NetworkInterfaceStreamTest * @key intermittent
--- a/test/java/nio/file/Files/StreamLinesTest.java Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/nio/file/Files/StreamLinesTest.java Mon Nov 16 16:02:09 2015 -0800 @@ -23,8 +23,8 @@ /* @test * @bug 8072773 - * @library /lib/testlibrary/ ../../../util/stream/bootlib/java.base - * @build java.util.stream.OpTestCase + * @library /lib/testlibrary/ ../../../util/stream/bootlib + * @build java.base/java.util.stream.OpTestCase * @build jdk.testlibrary.RandomFactory * @run testng/othervm StreamLinesTest * @summary Tests streams returned from Files.lines, primarily focused on
--- a/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/security/PermissionCollection/PermissionCollectionStreamTest.java Mon Nov 16 16:02:09 2015 -0800 @@ -24,8 +24,8 @@ /* @test * @bug 8081678 * @summary Tests for stream returning methods - * @library ../../util/stream/bootlib/java.base - * @build java.util.stream.OpTestCase + * @library ../../util/stream/bootlib + * @build java.base/java.util.stream.OpTestCase * @run testng/othervm PermissionCollectionStreamTest */
--- a/test/java/util/Scanner/ScannerStreamTest.java Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/util/Scanner/ScannerStreamTest.java Mon Nov 16 16:02:09 2015 -0800 @@ -46,8 +46,8 @@ * @test * @bug 8072722 * @summary Tests of stream support in java.util.Scanner - * @library ../stream/bootlib/java.base - * @build java.util.stream.OpTestCase + * @library ../stream/bootlib + * @build java.base/java.util.stream.OpTestCase * @run testng/othervm ScannerStreamTest */
--- a/test/java/util/regex/PatternStreamTest.java Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/util/regex/PatternStreamTest.java Mon Nov 16 16:02:09 2015 -0800 @@ -25,8 +25,8 @@ * @test * @bug 8016846 8024341 8071479 * @summary Unit tests stream and lambda-based methods on Pattern and Matcher - * @library ../stream/bootlib/java.base - * @build java.util.stream.OpTestCase + * @library ../stream/bootlib + * @build java.base/java.util.stream.OpTestCase * @run testng/othervm PatternStreamTest */
--- a/test/java/util/stream/bootlib/TEST.properties Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/util/stream/bootlib/TEST.properties Mon Nov 16 16:02:09 2015 -0800 @@ -1,3 +1,1 @@ # This file identifies root(s) of the test-ng hierarchy. - -bootclasspath.dirs = java.base
--- a/test/java/util/stream/boottest/TEST.properties Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/util/stream/boottest/TEST.properties Mon Nov 16 16:02:09 2015 -0800 @@ -1,5 +1,4 @@ # This file identifies root(s) of the test-ng hierarchy. -TestNG.dirs = java.base -bootclasspath.dirs = java.base -lib.dirs = /java/util/stream/bootlib/java.base +TestNG.dirs = . +lib.dirs = /java/util/stream/bootlib
--- a/test/java/util/stream/test/TEST.properties Mon Nov 16 12:54:01 2015 +0800 +++ b/test/java/util/stream/test/TEST.properties Mon Nov 16 16:02:09 2015 -0800 @@ -2,7 +2,7 @@ TestNG.dirs = . -lib.dirs = /java/util/stream/bootlib/java.base +lib.dirs = /java/util/stream/bootlib # Tests that must run in othervm mode othervm.dirs= /java/util/stream