changeset 58844:085463e75652

8238259: new tests do not account for Windows file separators Reviewed-by: vromero
author jjg
date Thu, 30 Jan 2020 15:50:07 -0800
parents 8482ab8f9b4c
children 0905868db490
files test/langtools/jdk/javadoc/doclet/testDocLintOption/TestDocLintOption.java test/langtools/jdk/javadoc/tool/testWErrorOption/TestWErrorOption.java
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/jdk/javadoc/doclet/testDocLintOption/TestDocLintOption.java	Thu Jan 30 08:55:20 2020 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testDocLintOption/TestDocLintOption.java	Thu Jan 30 15:50:07 2020 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     8236949
+ * @bug     8236949 8238259
  * @summary javadoc -Xdoclint does not accumulate options correctly
  * @library /tools/lib ../../lib
  * @modules jdk.compiler/com.sun.tools.doclint
@@ -143,19 +143,19 @@
         checkExit(expectExit);
 
         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),
-                "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),
-                "src/p/C.java:13: warning: no @return");
+                "C.java:13: warning: no @return");
 
         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),
-                "src/p/C.java:19: error: bad HTML entity");
+                "C.java:19: error: bad HTML entity");
     }
 
     /**
--- a/test/langtools/jdk/javadoc/tool/testWErrorOption/TestWErrorOption.java	Thu Jan 30 08:55:20 2020 -0800
+++ b/test/langtools/jdk/javadoc/tool/testWErrorOption/TestWErrorOption.java	Thu Jan 30 15:50:07 2020 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug     8200383
+ * @bug     8200383 8238259
  * @summary Add javadoc command line setting to fail on warnings
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -74,7 +74,7 @@
                 "p");
         checkExit(Exit.ERROR);
         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"
                 + "1 error\n"
                 + "1 warning\n");