jdk-sandbox: comparison test/langtools/tools/javac/options/smokeTests/OptionSmokeTest.java

equal deleted inserted replaced

-:01b8120f867a
+:b0fcf59be391
 * @test
 * @bug 8196433
 * @summary use the new error diagnostic approach at javac.Main
 * @library /tools/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
+*          jdk.compiler/com.sun.tools.javac.code
 *          jdk.compiler/com.sun.tools.javac.main
 *          jdk.compiler/com.sun.tools.javac.util
 *          jdk.jdeps/com.sun.tools.javap
 * @build toolbox.ToolBox toolbox.JavacTask toolbox.TestRunner
 * @run main OptionSmokeTest
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import com.sun.tools.javac.util.Assert;
+import com.sun.tools.javac.code.Source;
 import toolbox.TestRunner;
 import toolbox.ToolBox;
 import toolbox.JavacTask;
 import toolbox.Task;
 new OptionSmokeTest().runTests();
 }
 @Test
 public void optionA1(Path base) throws Exception {
-doTest(base,
+doTest(base, "error: -A requires an argument; use '-Akey' or '-Akey=value'", "-A");
-"error: -A requires an argument; use '-Akey' or '-Akey=value'",
-"-A");
 }
 @Test
 public void optionA2(Path base) throws Exception {
 doTest(base,
 }
 @Test
 public void profileAndBSP(Path base) throws Exception {
 doTest(base, "error: profile and bootclasspath options cannot be used together",
-"-profile compact1 -bootclasspath . -target 8 -source 8");
+String.format("-profile compact1 -bootclasspath . -target %s -source %s", Source.DEFAULT.name, Source.DEFAULT.name));
 }
 @Test
 public void invalidProfile(Path base) throws Exception {
-doTest(base, "error: invalid profile: noProfile",
+doTest(base, "error: invalid profile: noProfile", "-profile noProfile");
-"-profile noProfile");
 }
 @Test
 public void invalidTarget(Path base) throws Exception {
-doTest(base, "error: invalid target release: 999999",
+doTest(base, "error: invalid target release: 999999", "-target 999999");
-"-target 999999");
 }
 @Test
 public void optionNotAvailableWithTarget(Path base) throws Exception {
-doTest(base, "error: option -profile not allowed with target 11",
+doTest(base, String.format("error: option -profile not allowed with target %s", Source.DEFAULT.name),
-"-profile compact1 -target 11");
+String.format("-profile compact1 -target %s", Source.DEFAULT.name));
 }
 @Test
 public void optionTooMany(Path base) throws Exception {
 doTest(base, "error: option --default-module-for-created-files can only be specified once",
 "--default-module-for-created-files=m1x --default-module-for-created-files=m1x");
 }
 @Test
 public void noSrcFiles(Path base) throws Exception {
-doTestNoSource(base, "error: no source files", "-target 11");
+doTestNoSource(base, "error: no source files", String.format("-target %s", Source.DEFAULT.name));
 }
 @Test
 public void requiresArg(Path base) throws Exception {
 doTestNoSource(base, "error: -target requires an argument", "-target");
 "--source-path . --module-source-path .");
 }
 @Test
 public void sourceAndTargetMismatch(Path base) throws Exception {
-doTest(base, "warning: source release 11 requires target release 11",
+doTest(base, String.format("warning: source release %s requires target release %s", Source.DEFAULT.name, Source.DEFAULT.name),
-"-source 11 -target 10");
+String.format("-source %s -target %s", Source.DEFAULT.name, Source.MIN.name));
 }
 @Test
 public void targetConflictsWithDefaultSource(Path base) throws Exception {
-doTest(base, "warning: target release 10 conflicts with default source release 11",
+doTest(base, String.format("warning: target release %s conflicts with default source release %s", Source.MIN.name, Source.DEFAULT.name),
-"-target 10");
+String.format("-target %s", Source.MIN.name));
 }
 @Test
 public void profileNotValidForTarget(Path base) throws Exception {
-doTest(base, "warning: profile compact2 is not valid for target release 1.7",
+doTest(base, String.format("warning: profile compact2 is not valid for target release %s", Source.MIN.name),
-"-profile compact2 -target 7 -source 7");
+String.format("-profile compact2 -target %s -source %s", Source.MIN.name, Source.MIN.name));
 }
 @Test
 public void fileNotFound(Path base) throws Exception {
 String log = new JavacTask(tb, Task.Mode.CMDLINE)
 .files("notExistent/T.java")
 .run(Task.Expect.FAIL)
 .writeAll()
 .getOutput(Task.OutputKind.DIRECT);
-Assert.check(log.startsWith("error: file not found: notExistent" + fileSeparator + "T.java"),
+Assert.check(log.startsWith(String.format("error: file not found: notExistent%sT.java", fileSeparator)),
-"real value of log:" + log);
+String.format("real value of log:%s", log));
 }
 static final String fileSeparator = System.getProperty("file.separator");
 @Test
 public void notADirectory(Path base) throws Exception {
-doTest(base, "error: not a directory: notADirectory" + fileSeparator + "src" + fileSeparator + "Dummy.java",
+doTest(base, String.format("error: not a directory: notADirectory%ssrc%sDummy.java", fileSeparator, fileSeparator),
-"-d notADirectory" + fileSeparator + "src" + fileSeparator + "Dummy.java");
+String.format("-d notADirectory%ssrc%sDummy.java", fileSeparator, fileSeparator));
 }
 @Test
 public void notAFile(Path base) throws Exception {
 // looks like a java file, it is a directory
 String log = new JavacTask(tb, Task.Mode.CMDLINE)
 .spaceSeparatedOptions("-XDsourcefile " + dir)
 .run(Task.Expect.FAIL)
 .writeAll()
 .getOutput(Task.OutputKind.DIRECT);
-Assert.check(log.startsWith("error: not a file: notAFile" + fileSeparator + "dir.java"));
+Assert.check(log.startsWith(String.format("error: not a file: notAFile%sdir.java", fileSeparator)));
 }
 @Test
 public void badValueForOption(Path base) throws Exception {
 doTestNoSource(base, "error: bad value for --patch-module option: \'notExistent\'",
 @Test
 public void unmatchedQuoteInEnvVar(Path base) throws Exception {
 Path src = base.resolve("src");
 tb.writeJavaFiles(src, "class Dummy {}");
 String log = new JavacTask(tb, Task.Mode.EXEC)
-.envVar("JDK_JAVAC_OPTIONS", "--add-exports jdk.compiler" + fileSeparator + "com.sun.tools.javac.jvm=\"ALL-UNNAMED")
+.envVar("JDK_JAVAC_OPTIONS",
+String.format("--add-exports jdk.compiler%scom.sun.tools.javac.jvm=\"ALL-UNNAMED", fileSeparator))
 .files(findJavaFiles(src))
 .run(Task.Expect.FAIL)
 .writeAll()
 .getOutput(Task.OutputKind.STDERR);
 Assert.check(log.startsWith("error: unmatched quote in environment variable JDK_JAVAC_OPTIONS"));
 }
 @Test
 public void optionCantBeUsedWithRelease(Path base) throws Exception {
 doTestNoSource(base, "error: option -source cannot be used together with --release",
-"--release 7 -source 7");
+String.format("--release %s -source %s", Source.DEFAULT.name, Source.DEFAULT.name));
 }
 @Test
 public void releaseVersionNotSupported(Path base) throws Exception {
 doTestNoSource(base, "error: release version 99999999 not supported",
 // taken from former test: tools/javac/options/release/ReleaseOptionClashes
 @Test
 public void releaseAndBootclasspath(Path base) throws Exception {
 doTestNoSource(base, "error: option --boot-class-path cannot be used together with --release",
-"--release 7 -bootclasspath any");
+String.format("--release %s -bootclasspath any", Source.DEFAULT.name));
 doTestNoSource(base, "error: option -Xbootclasspath: cannot be used together with --release",
-"--release 7 -Xbootclasspath:any");
+String.format("--release %s -Xbootclasspath:any", Source.DEFAULT.name));
 doTestNoSource(base, "error: option -Xbootclasspath/p: cannot be used together with --release",
-"--release 7 -Xbootclasspath/p:any");
+String.format("--release %s -Xbootclasspath/p:any", Source.DEFAULT.name));
 doTestNoSource(base, "error: option -endorseddirs cannot be used together with --release",
-"--release 7 -endorseddirs any");
+String.format("--release %s -endorseddirs any", Source.DEFAULT.name));
 doTestNoSource(base, "error: option -extdirs cannot be used together with --release",
-"--release 7 -extdirs any");
+String.format("--release %s -extdirs any", Source.DEFAULT.name));
 doTestNoSource(base, "error: option -source cannot be used together with --release",
-"--release 7 -source 8");
+String.format("--release %s -source %s", Source.MIN.name, Source.DEFAULT.name));
 doTestNoSource(base, "error: option -target cannot be used together with --release",
-"--release 7 -target 8");
+String.format("--release %s -target %s", Source.MIN.name, Source.DEFAULT.name));
 doTestNoSource(base, "error: option --system cannot be used together with --release",
-"--release 9 --system none");
+String.format("--release %s --system none", Source.DEFAULT.name));
 doTestNoSource(base, "error: option --upgrade-module-path cannot be used together with --release",
-"--release 9 --upgrade-module-path any");
+String.format("--release %s --upgrade-module-path any", Source.DEFAULT.name));
 }
 void doTest(Path base, String output, String options) throws Exception {
 Path src = base.resolve("src");
 tb.writeJavaFiles(src, "class Dummy { }");
 .spaceSeparatedOptions(options)
 .files(findJavaFiles(src))
 .run(Task.Expect.FAIL)
 .writeAll()
 .getOutput(Task.OutputKind.DIRECT);
-Assert.check(log.startsWith(output), "expected:\n" + output + '\n' + "found:\n" + log);
+Assert.check(log.startsWith(output), String.format("expected:\n%s\nfound:\n%s", output, log));
 }
 void doTestNoSource(Path base, String output, String options) throws Exception {
 String log = new JavacTask(tb, Task.Mode.CMDLINE)
 .spaceSeparatedOptions(options)
 .run(Task.Expect.FAIL)
 .writeAll()
 .getOutput(Task.OutputKind.DIRECT);
-Assert.check(log.startsWith(output), "expected:\n" + output + '\n' + "found:\n" + log);
+Assert.check(log.startsWith(output), String.format("expected:\n%s\nfound:\n%s", output, log));
 }
 }

changeset 51182	b0fcf59be391
parent 49822	53aae0c219e6
child 52323	c306abfeae0d