8149402: "-group" option issue for classes from default package

Reviewed-by: jjg
This commit is contained in:
Kumar Srinivasan 2017-12-07 14:21:25 -08:00
parent d57db3b793
commit 7604d1d515
3 changed files with 9 additions and 10 deletions
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util
test/langtools/jdk/javadoc/doclet/testGroupOption

@ -290,7 +290,7 @@ public class Group {
groupList.add(defaultGroupName);
}
for (PackageElement pkg : packages) {
String pkgName = pkg.isUnnamed() ? null : configuration.utils.getPackageName(pkg);
String pkgName = configuration.utils.getPackageName(pkg);
String groupName = pkg.isUnnamed() ? null : elementNameGroupMap.get(pkgName);
// if this package is not explicitly assigned to a group,
// try matching it to group specified by regular expression

@ -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
@ -21,4 +21,4 @@
* questions.
*/
public class C {}
public class InUnnamedPackage {}

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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,9 +23,9 @@
/*
* @test
* @bug 4924383
* @summary Test to make sure the -group option does not cause a bad warning
* to be printed. Test for the group defined using patterns.
* @bug 4924383 8149402
* @summary Test to make sure the -group option works correctly
* with the given pattern usages.
* @author jamieh
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -55,8 +55,7 @@ public class TestGroupOption extends JavadocTester {
"-group");
}
// @Test
// @ignore 8149402
@Test
// Make sure the "Other packages" section is printed and the header for empty section is not.
// Make sure that the headers of group that is defined using patterns are printed.
void test2() {
@ -66,7 +65,7 @@ public class TestGroupOption extends JavadocTester {
"-group", "Group abc*", "abc*",
"-group", "Empty group", "qwerty*",
"-group", "Group a*", "a*",
"pkg1", "pkg2", "pkg3", "abc1", "abc2", "abc3", "other", testSrc("C.java"));
"pkg1", "pkg2", "pkg3", "abc1", "abc2", "abc3", "other", testSrc("InUnnamedPackage.java"));
checkExit(Exit.OK);
checkOutput("overview-summary.html", true, "Group pkg*", "Group abc*", "Other Packages");