1.1 --- a/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 15:03:34 2013 -0700 1.2 +++ b/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Oct 18 16:34:42 2013 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -23,7 +23,7 @@ 1.11 1.12 /* 1.13 * @test 1.14 - * @bug 4632553 4973607 1.15 + * @bug 4632553 4973607 8026567 1.16 * @summary No need to include type name (class, interface, etc.) before 1.17 * every single type in class tree. 1.18 * Make sure class tree includes heirarchy for enums and annotation 1.19 @@ -49,12 +49,12 @@ 1.20 private static final String[][] TEST = { 1.21 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 1.22 "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" " + 1.23 - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a>"}, 1.24 + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>"}, 1.25 1.26 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 1.27 "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>" + NL + 1.28 "<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" " + 1.29 - "title=\"annotation in pkg\"><span class=\"strong\">AnnotationType</span></a> " + 1.30 + "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> " + 1.31 "(implements java.lang.annotation.Annotation)</li>" + NL + "</ul>"}, 1.32 1.33 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 1.34 @@ -63,14 +63,14 @@ 1.35 "<li type=\"circle\">java.lang.Enum<E> (implements java.lang." + 1.36 "Comparable<T>, java.io.Serializable)" + NL + "<ul>" + NL + 1.37 "<li type=\"circle\">pkg.<a href=\"../pkg/Coin.html\" " + 1.38 - "title=\"enum in pkg\"><span class=\"strong\">Coin</span></a></li>" + NL + 1.39 + "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>" + NL + 1.40 "</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>" 1.41 }, 1.42 }; 1.43 private static final String[][] NEGATED_TEST = { 1.44 {BUG_ID + FS + "pkg" + FS + "package-tree.html", 1.45 "<li type=\"circle\">class pkg.<a href=\"../pkg/ParentClass.html\" " + 1.46 - "title=\"class in pkg\"><span class=\"strong\">ParentClass</span></a></li>"} 1.47 + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>"} 1.48 }; 1.49 1.50 /**