8250840: some tests use --enable-preview unnecessarily

Reviewed-by: vromero
openjdk · Sep 9, 2020 · c98417e · c98417e · bridgekeeper · Sep 9, 2020
1 parent c655b70
commit c98417e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java b/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
@@ -28,8 +28,8 @@
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
  * @build    toolbox.ToolBox javadoc.tester.*
- * @compile --enable-preview --source ${jdk.version} TestRecordLinks.java
- * @run main/othervm --enable-preview TestRecordLinks
+ * @compile TestRecordLinks.java
+ * @run main TestRecordLinks
  */
 
 import java.nio.file.Path;

diff --git a/test/langtools/jdk/jshell/ToolSimpleTest.java b/test/langtools/jdk/jshell/ToolSimpleTest.java
@@ -77,7 +77,7 @@ public void testOpenComment() {
 
     @Test
     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, "Day day = Day.FRIDAY;", "day ==> FRIDAY"),
                 (a) -> assertCommand(a, "switch (day) {", ""),
@@ -91,7 +91,7 @@ public void testSwitchExpression() {
 
     @Test
     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, "Day day = Day.FRIDAY;", "day ==> FRIDAY"),
                 (a) -> assertCommand(a, "switch (day) {", ""),

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

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

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

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