test/jdk/javadoc/doclet/testWarnings/TestWarnings.java

@@ -42,20 +42,31 @@
         tester.runTests();
     }
 
     @Test
     void testDefault() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-default",
+        javadoc("-d", "out-default",
                 "-sourcepath", testSrc,
                 "pkg");
-        checkExit(Exit.FAILED);  // TODO: investigate; suspect bad input HTML
+        checkExit(Exit.FAILED);
 
-        checkOutput(Output.WARNING, true,
-                "X.java:11: warning - Missing closing '}' character for inline tag");
-        checkOutput(Output.ERROR, true,
+        checkOutput(Output.OUT, true,
+                "X.java:23: error: self-closing element not allowed");
+
+        checkOutput(Output.OUT, true,
+                "X.java:24: error: self-closing element not allowed");
+
+        checkOutput(Output.OUT, true,
+                "X.java:25: error: self-closing element not allowed");
+
+        checkOutput(Output.OUT, true,
+                "X.java:26: error: self-closing element not allowed");
+
+        /* DCErroneous
+        checkOutput(Output.OUT, true,
                 "package.html: error - Body tag missing from HTML");
+        */
 
         checkOutput("pkg/X.html", false,
                 "can't find m()");
         checkOutput("pkg/X.html", false,
                 "can't find X()");

@@ -63,16 +74,15 @@
                 "can't find f");
     }
 
     @Test
     void testPrivate() {
-        javadoc("-Xdoclint:none",
-                "-d", "out-private",
+        javadoc("-d", "out-private",
                 "-private",
                 "-sourcepath", testSrc,
                 "pkg");
-        checkExit(Exit.FAILED);  // TODO: investigate; suspect bad input HTML
+        checkExit(Exit.FAILED);
 
         checkOutput("pkg/X.html", true,
             "<a href=\"../pkg/X.html#m--\"><code>m()</code></a><br/>",
             "<a href=\"../pkg/X.html#X--\"><code>X()</code></a><br/>",
             "<a href=\"../pkg/X.html#f\"><code>f</code></a><br/>");