1.1 --- a/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Fri Aug 30 15:59:33 2013 -0700
1.2 +++ b/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Fri Aug 30 16:16:28 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 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,32 +23,33 @@
1.11
1.12 /*
1.13 * @test
1.14 - * @bug 4638723
1.15 + * @bug 4638723 8015882
1.16 * @summary Test to ensure that the refactored version of the standard
1.17 * doclet still works with Taglets that implement the 1.4.0 interface.
1.18 * @author jamieh
1.19 * @library ../lib/
1.20 - * @compile ../lib/JavadocTester.java
1.21 - * @compile TestLegacyTaglet.java
1.22 - * @compile ToDoTaglet.java
1.23 - * @compile UnderlineTaglet.java
1.24 + * @compile ../lib/JavadocTester.java TestLegacyTaglet.java ToDoTaglet.java UnderlineTaglet.java Check.java
1.25 * @run main TestLegacyTaglet
1.26 */
1.27
1.28 public class TestLegacyTaglet extends JavadocTester {
1.29
1.30 - private static final String BUG_ID = "4638723";
1.31 + private static final String BUG_ID = "4638723-8015882";
1.32
1.33 private static final String[] ARGS =
1.34 new String[] {"-d", BUG_ID, "-sourcepath", SRC_DIR,
1.35 - "-tagletpath", SRC_DIR, "-taglet", "ToDoTaglet",
1.36 + "-tagletpath", SRC_DIR, "-taglet", "ToDoTaglet", "-taglet", "Check",
1.37 "-taglet", "UnderlineTaglet", SRC_DIR + FS + "C.java"};
1.38
1.39 private static final String[][] TEST = new String[][] {
1.40 {BUG_ID + FS + "C.html", "This is an <u>underline</u>"},
1.41 {BUG_ID + FS + "C.html",
1.42 "<DT><B>To Do:</B><DD><table cellpadding=2 cellspacing=0><tr>" +
1.43 - "<td bgcolor=\"yellow\">Finish this class.</td></tr></table></DD>"}};
1.44 + "<td bgcolor=\"yellow\">Finish this class.</td></tr></table></DD>"},
1.45 + {BUG_ID + FS + "C.html",
1.46 + "<DT><B>To Do:</B><DD><table cellpadding=2 cellspacing=0><tr>" +
1.47 + "<td bgcolor=\"yellow\">Tag in Method.</td></tr></table></DD>"}
1.48 + };
1.49
1.50 private static final String[][] NEGATED_TEST = NO_TEST;
1.51
1.52 @@ -59,6 +60,9 @@
1.53 public static void main(String[] args) {
1.54 TestLegacyTaglet tester = new TestLegacyTaglet();
1.55 run(tester, ARGS, TEST, NEGATED_TEST);
1.56 + if (tester.getErrorOutput().contains("NullPointerException")) {
1.57 + throw new AssertionError("javadoc threw NullPointerException");
1.58 + }
1.59 tester.printSummary();
1.60 }
1.61
