Skip to content

Commit 4122968

Browse files
8238259: new tests do not account for Windows file separators
Reviewed-by: vromero
1 parent 18d6d92 commit 4122968

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

test/langtools/jdk/javadoc/doclet/testDocLintOption/TestDocLintOption.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
* @bug 8236949
26+
* @bug 8236949 8238259
2727
* @summary javadoc -Xdoclint does not accumulate options correctly
2828
* @library /tools/lib ../../lib
2929
* @modules jdk.compiler/com.sun.tools.doclint
@@ -143,19 +143,19 @@ void test(Path base, List<String> options, Exit expectExit, Set<Group> expectGro
143143
checkExit(expectExit);
144144

145145
checkOutput(Output.OUT, expectGroups.contains(ACCESSIBILITY),
146-
"src/p/C.java:4: error: no \"alt\" attribute for image");
146+
"C.java:4: error: no \"alt\" attribute for image");
147147

148148
checkOutput(Output.OUT, expectGroups.contains(HTML),
149-
"src/p/C.java:8: error: text not allowed in <ul> element");
149+
"C.java:8: error: text not allowed in <ul> element");
150150

151151
checkOutput(Output.OUT, expectGroups.contains(MISSING),
152-
"src/p/C.java:13: warning: no @return");
152+
"C.java:13: warning: no @return");
153153

154154
checkOutput(Output.OUT, expectGroups.contains(REFERENCE),
155-
"src/p/C.java:15: error: invalid use of @return");
155+
"C.java:15: error: invalid use of @return");
156156

157157
checkOutput(Output.OUT, expectGroups.contains(SYNTAX),
158-
"src/p/C.java:19: error: bad HTML entity");
158+
"C.java:19: error: bad HTML entity");
159159
}
160160

161161
/**

test/langtools/jdk/javadoc/tool/testWErrorOption/TestWErrorOption.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
* @bug 8200383
26+
* @bug 8200383 8238259
2727
* @summary Add javadoc command line setting to fail on warnings
2828
* @library /tools/lib ../../lib
2929
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -74,7 +74,7 @@ public void testWerror(Path base) throws Exception {
7474
"p");
7575
checkExit(Exit.ERROR);
7676
checkOutput(Output.OUT, true,
77-
"testWerror/src/p/C.java:6: warning - @return tag cannot be used in method with void return type.",
77+
"C.java:6: warning - @return tag cannot be used in method with void return type.",
7878
"javadoc: error - warnings found and -Werror specified\n"
7979
+ "1 error\n"
8080
+ "1 warning\n");

0 commit comments

Comments
 (0)