archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8250840: some tests use --enable-preview unnecessarily

Browse source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2020-09-09 07:51:43 +00:00
parent c655b703a9
commit c98417ebca
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
View file

@ -28,8 +28,8 @@
* @library /tools/lib ../../lib * @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool * @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build toolbox.ToolBox javadoc.tester.* * @build toolbox.ToolBox javadoc.tester.*
* @compile --enable-preview --source ${jdk.version} TestRecordLinks.java * @compile TestRecordLinks.java
* @run main/othervm --enable-preview TestRecordLinks * @run main TestRecordLinks
*/ */
import java.nio.file.Path; import java.nio.file.Path;

4
test/langtools/jdk/jshell/ToolSimpleTest.java
View file

@ -77,7 +77,7 @@ public class ToolSimpleTest extends ReplToolTesting {
@Test @Test
public void testSwitchExpression() { public void testSwitchExpression() {
test(false, new String[]{"--enable-preview", "--no-startup"}, test(false, new String[]{"--no-startup"},
(a) -> assertCommand(a, "enum Day {MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY }", "| created enum Day"), (a) -> assertCommand(a, "enum Day {MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY }", "| created enum Day"),
(a) -> assertCommand(a, "Day day = Day.FRIDAY;", "day ==> FRIDAY"), (a) -> assertCommand(a, "Day day = Day.FRIDAY;", "day ==> FRIDAY"),
(a) -> assertCommand(a, "switch (day) {", ""), (a) -> assertCommand(a, "switch (day) {", ""),
@ -91,7 +91,7 @@ public class ToolSimpleTest extends ReplToolTesting {
@Test @Test
public void testSwitchExpressionCompletion() { public void testSwitchExpressionCompletion() {
test(false, new String[]{"--enable-preview", "--no-startup"}, test(false, new String[]{"--no-startup"},
(a) -> assertCommand(a, "enum Day {MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY }", "| created enum Day"), (a) -> assertCommand(a, "enum Day {MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY }", "| created enum Day"),
(a) -> assertCommand(a, "Day day = Day.FRIDAY;", "day ==> FRIDAY"), (a) -> assertCommand(a, "Day day = Day.FRIDAY;", "day ==> FRIDAY"),
(a) -> assertCommand(a, "switch (day) {", ""), (a) -> assertCommand(a, "switch (day) {", ""),

2
test/langtools/tools/javac/ConditionalExpressionResolvePending.java
View file

@ -34,7 +34,7 @@
* jdk.compiler/com.sun.tools.javac.util * jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask * @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper * @build combo.ComboTestHelper
* @compile --enable-preview -source ${jdk.version} ConditionalExpressionResolvePending.java * @compile ConditionalExpressionResolvePending.java
* @run main/othervm --enable-preview ConditionalExpressionResolvePending * @run main/othervm --enable-preview ConditionalExpressionResolvePending
*/ */

4
test/langtools/tools/javac/patterns/BreakAndLoops.java
View file

@ -34,8 +34,8 @@
* jdk.compiler/com.sun.tools.javac.util * jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask * @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper * @build combo.ComboTestHelper
* @compile --enable-preview -source ${jdk.version} BreakAndLoops.java * @compile BreakAndLoops.java
* @run main/othervm --enable-preview BreakAndLoops * @run main BreakAndLoops
*/ */
import combo.ComboInstance; import combo.ComboInstance;

4
test/langtools/tools/javac/patterns/ConditionalTest.java
View file

@ -34,8 +34,8 @@
* jdk.compiler/com.sun.tools.javac.util * jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask * @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper * @build combo.ComboTestHelper
* @compile --enable-preview -source ${jdk.version} ConditionalTest.java * @compile ConditionalTest.java
* @run main/othervm --enable-preview ConditionalTest * @run main ConditionalTest
*/ */
import combo.ComboInstance; import combo.ComboInstance;

4
test/langtools/tools/javac/recovery/ClassBlockExits.java
View file

@ -32,8 +32,8 @@
* jdk.compiler/com.sun.tools.javac.util * jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask * @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper * @build combo.ComboTestHelper
* @compile --enable-preview -source ${jdk.version} ClassBlockExits.java * @compile ClassBlockExits.java
* @run main/othervm --enable-preview ClassBlockExits * @run main ClassBlockExits
*/ */
import combo.ComboInstance; import combo.ComboInstance;