8238259: new tests do not account for Windows file separators

Reviewed-by: vromero
This commit is contained in:
Jonathan Gibbons 2020-01-30 15:50:07 -08:00
parent 18d6d92a06
commit 4122968ab6
2 changed files with 8 additions and 8 deletions

View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8236949 * @bug 8236949 8238259
* @summary javadoc -Xdoclint does not accumulate options correctly * @summary javadoc -Xdoclint does not accumulate options correctly
* @library /tools/lib ../../lib * @library /tools/lib ../../lib
* @modules jdk.compiler/com.sun.tools.doclint * @modules jdk.compiler/com.sun.tools.doclint
@ -143,19 +143,19 @@ public class TestDocLintOption extends JavadocTester {
checkExit(expectExit); checkExit(expectExit);
checkOutput(Output.OUT, expectGroups.contains(ACCESSIBILITY), checkOutput(Output.OUT, expectGroups.contains(ACCESSIBILITY),
"src/p/C.java:4: error: no \"alt\" attribute for image"); "C.java:4: error: no \"alt\" attribute for image");
checkOutput(Output.OUT, expectGroups.contains(HTML), checkOutput(Output.OUT, expectGroups.contains(HTML),
"src/p/C.java:8: error: text not allowed in <ul> element"); "C.java:8: error: text not allowed in <ul> element");
checkOutput(Output.OUT, expectGroups.contains(MISSING), checkOutput(Output.OUT, expectGroups.contains(MISSING),
"src/p/C.java:13: warning: no @return"); "C.java:13: warning: no @return");
checkOutput(Output.OUT, expectGroups.contains(REFERENCE), checkOutput(Output.OUT, expectGroups.contains(REFERENCE),
"src/p/C.java:15: error: invalid use of @return"); "C.java:15: error: invalid use of @return");
checkOutput(Output.OUT, expectGroups.contains(SYNTAX), checkOutput(Output.OUT, expectGroups.contains(SYNTAX),
"src/p/C.java:19: error: bad HTML entity"); "C.java:19: error: bad HTML entity");
} }
/** /**

View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8200383 * @bug 8200383 8238259
* @summary Add javadoc command line setting to fail on warnings * @summary Add javadoc command line setting to fail on warnings
* @library /tools/lib ../../lib * @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool * @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -74,7 +74,7 @@ public class TestWErrorOption extends JavadocTester {
"p"); "p");
checkExit(Exit.ERROR); checkExit(Exit.ERROR);
checkOutput(Output.OUT, true, checkOutput(Output.OUT, true,
"testWerror/src/p/C.java:6: warning - @return tag cannot be used in method with void return type.", "C.java:6: warning - @return tag cannot be used in method with void return type.",
"javadoc: error - warnings found and -Werror specified\n" "javadoc: error - warnings found and -Werror specified\n"
+ "1 error\n" + "1 error\n"
+ "1 warning\n"); + "1 warning\n");