8142996: move jdk java/util/streams tests into java.base directories Reviewed-by: mchung

commit: 39cb0e222338c1c37ddb2670bf47265779ab1313 [log] [tgz]
author: Jonathan Gibbons <jjg@openjdk.org> Fri Nov 13 15:55:32 2015 -0800
committer: Jonathan Gibbons <jjg@openjdk.org> Fri Nov 13 15:55:32 2015 -0800
tree: b8eac4692d5553d57edd1fb5e22c9a4992d5c9fb
parent: 2714bdae50ceb9d76b7c6a3af1a1460052b0a31d [diff]
diff --git a/jdk/test/java/util/stream/bootlib/TEST.properties b/jdk/test/java/util/stream/bootlib/TEST.properties
index a50c2e8..317080b 100644
--- a/jdk/test/java/util/stream/bootlib/TEST.properties
+++ b/jdk/test/java/util/stream/bootlib/TEST.properties

@@ -1,3 +1,3 @@
 # This file identifies root(s) of the test-ng hierarchy.
 
-bootclasspath.dirs = .
+bootclasspath.dirs = java.base

diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/CollectorOps.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/CollectorOps.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/CollectorOps.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/CollectorOps.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/DefaultMethodStreams.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DefaultMethodStreams.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/DefaultMethodStreams.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DefaultMethodStreams.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestDataProvider.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestDataProvider.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DoubleStreamTestDataProvider.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestScenario.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/DoubleStreamTestScenario.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/DoubleStreamTestScenario.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/FlagDeclaringOp.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/FlagDeclaringOp.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/FlagDeclaringOp.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/FlagDeclaringOp.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/IntStreamTestDataProvider.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/IntStreamTestDataProvider.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntStreamTestDataProvider.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/IntStreamTestScenario.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntStreamTestScenario.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/IntStreamTestScenario.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntStreamTestScenario.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/IntermediateTestOp.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntermediateTestOp.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/IntermediateTestOp.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/IntermediateTestOp.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/LambdaTestHelpers.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestHelpers.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/LambdaTestHelpers.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestHelpers.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/LambdaTestMode.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestMode.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/LambdaTestMode.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestMode.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/LoggingTestCase.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LoggingTestCase.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/LoggingTestCase.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LoggingTestCase.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/LongStreamTestDataProvider.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/LongStreamTestDataProvider.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LongStreamTestDataProvider.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/LongStreamTestScenario.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LongStreamTestScenario.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/LongStreamTestScenario.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/LongStreamTestScenario.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/OpTestCase.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/OpTestCase.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/OpTestCase.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/OpTestCase.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/SpliteratorTestHelper.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/SpliteratorTestHelper.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/SpliteratorTestHelper.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/SpliteratorTestHelper.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/StatefulTestOp.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StatefulTestOp.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/StatefulTestOp.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StatefulTestOp.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/StatelessTestOp.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StatelessTestOp.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/StatelessTestOp.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StatelessTestOp.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/StreamOpFlagTestHelper.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/StreamOpFlagTestHelper.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamOpFlagTestHelper.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamTestDataProvider.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/StreamTestDataProvider.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamTestDataProvider.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/StreamTestScenario.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamTestScenario.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/StreamTestScenario.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/StreamTestScenario.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/TestData.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/TestData.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/TestData.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/TestData.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/TestFlagExpectedOp.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/TestFlagExpectedOp.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/TestFlagExpectedOp.java


diff --git a/jdk/test/java/util/stream/bootlib/java/util/stream/ThowableHelper.java b/jdk/test/java/util/stream/bootlib/java.base/java/util/stream/ThowableHelper.java
similarity index 100%
rename from jdk/test/java/util/stream/bootlib/java/util/stream/ThowableHelper.java
rename to jdk/test/java/util/stream/bootlib/java.base/java/util/stream/ThowableHelper.java


diff --git a/jdk/test/java/util/stream/boottest/TEST.properties b/jdk/test/java/util/stream/boottest/TEST.properties
index d51ddf7..980a89f 100644
--- a/jdk/test/java/util/stream/boottest/TEST.properties
+++ b/jdk/test/java/util/stream/boottest/TEST.properties

@@ -1,5 +1,5 @@
 # This file identifies root(s) of the test-ng hierarchy.
 
-TestNG.dirs = .
-bootclasspath.dirs = .
-lib.dirs = /java/util/stream/bootlib
+TestNG.dirs = java.base
+bootclasspath.dirs = java.base
+lib.dirs = /java/util/stream/bootlib/java.base

diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/DoubleNodeTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/DoubleNodeTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/DoubleNodeTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/FlagOpTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/FlagOpTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/FlagOpTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/IntNodeTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/IntNodeTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/IntNodeTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/LongNodeTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/LongNodeTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/LongNodeTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/NodeBuilderTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/NodeBuilderTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeBuilderTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/NodeTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/NodeTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/NodeTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/SliceSpliteratorTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/SliceSpliteratorTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/SliceSpliteratorTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/SpinedBufferTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/SpinedBufferTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/StreamFlagsTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/StreamFlagsTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamFlagsTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/StreamOpFlagsTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/StreamOpFlagsTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamOpFlagsTest.java


diff --git a/jdk/test/java/util/stream/boottest/java/util/stream/StreamReuseTest.java b/jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java
similarity index 100%
rename from jdk/test/java/util/stream/boottest/java/util/stream/StreamReuseTest.java
rename to jdk/test/java/util/stream/boottest/java.base/java/util/stream/StreamReuseTest.java


diff --git a/jdk/test/java/util/stream/test/TEST.properties b/jdk/test/java/util/stream/test/TEST.properties
index 4128f6a..706ed7c 100644
--- a/jdk/test/java/util/stream/test/TEST.properties
+++ b/jdk/test/java/util/stream/test/TEST.properties

@@ -2,7 +2,7 @@
 
 TestNG.dirs = .
 
-lib.dirs = /java/util/stream/bootlib
+lib.dirs = /java/util/stream/bootlib/java.base
 
 # Tests that must run in othervm mode
 othervm.dirs= /java/util/stream
commit	39cb0e222338c1c37ddb2670bf47265779ab1313	[log] [tgz]
author	Jonathan Gibbons <jjg@openjdk.org>	Fri Nov 13 15:55:32 2015 -0800
committer	Jonathan Gibbons <jjg@openjdk.org>	Fri Nov 13 15:55:32 2015 -0800
tree	b8eac4692d5553d57edd1fb5e22c9a4992d5c9fb
parent	2714bdae50ceb9d76b7c6a3af1a1460052b0a31d [diff]