--- a/langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java	Thu Aug 24 16:25:08 2017 +0200
+++ b/langtools/test/jdk/javadoc/doclet/testPackageHtml/TestPackageHtml.java	Wed Jul 05 13:46:05 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
 
 /*
  * @test
- * @bug      8150096
- * @summary  Make sure package.html is recognized by doclint
+ * @bug      8150096 8179704
+ * @summary  test package.html handling
  * @library  ../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
  * @build    JavadocTester
@@ -37,12 +37,36 @@
         tester.runTests();
     }
 
+    // Make sure package.html is recognized by doclint
     @Test
     void testPackageHtml() {
-        javadoc("-d", "out-pkg-html",
+        javadoc("-d", "out-pkg-html-1",
                 "-sourcepath", testSrc,
                 "pkg1");
         checkExit(Exit.ERROR);
         checkOutput(Output.OUT, true, "package.html:10: error: bad use of '>'");
     }
+
+    // Doclet must handle empty body in package.html, must
+    // ignore html comment in the first sentence and must
+    // ignore trailing whitespace in a first sentence.
+    @Test
+    void testPackageHtmlWithEmptyBody() {
+        javadoc("-d", "out-pkg-html-2",
+                "-sourcepath", testSrc,
+                "pkg2", "pkg3", "pkg4");
+        checkExit(Exit.OK);
+        checkOutput("index-all.html", true,
+              "<dl>\n"
+                      + "<dt><a href=\"pkg2/package-summary.html\">pkg2</a> - package pkg2</dt>\n"
+                      + "<dt><a href=\"pkg3/package-summary.html\">pkg3</a> - package pkg3</dt>\n"
+                      + "<dd>\n"
+                      + "<div class=\"block\">This is a documentation for <a href=\"pkg3/package-summary.html\"><code>pkg3</code></a></div>\n"
+                      + "</dd>\n"
+                      + "<dt><a href=\"pkg4/package-summary.html\">pkg4</a> - package pkg4</dt>\n"
+                      + "<dd>\n"
+                      + "<div class=\"block\">This is a documentation for <a href=\"pkg4/package-summary.html\"><code>pkg4</code></a></div>\n"
+                      + "</dd>\n"
+                      + "</dl>\n");
+    }
 }