1.1 --- a/test/com/sun/javadoc/testUseOption/TestUseOption.java Fri Oct 05 14:13:47 2012 -0700 1.2 +++ b/test/com/sun/javadoc/testUseOption/TestUseOption.java Fri Oct 05 14:16:32 2012 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2002, 2012, 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 4496290 4985072 7006178 1.15 + * @bug 4496290 4985072 7006178 7068595 1.16 * @summary A simple test to determine if -use works. 1.17 * @author jamieh 1.18 * @library ../lib/ 1.19 @@ -34,7 +34,7 @@ 1.20 1.21 public class TestUseOption extends JavadocTester { 1.22 1.23 - private static final String BUG_ID = "4496290-4985072-7006178"; 1.24 + private static final String BUG_ID = "4496290-4985072-7006178-7068595"; 1.25 1.26 //Input for string search tests. 1.27 private static final String[] TEST2 = { 1.28 @@ -64,6 +64,13 @@ 1.29 } 1.30 }; 1.31 1.32 + private static final String[][] TEST4 = { 1.33 + {BUG_ID + "-4" + FS + "pkg2" + FS + "class-use" + FS + "C3.html", "<a href=" + 1.34 + "\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">" + 1.35 + "Frames</a></li>" 1.36 + } 1.37 + }; 1.38 + 1.39 private static final String[] ARGS = new String[] { 1.40 "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" 1.41 }; 1.42 @@ -76,6 +83,10 @@ 1.43 "-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, "-use", SRC_DIR + FS + "C.java", SRC_DIR + FS + "UsedInC.java" 1.44 }; 1.45 1.46 + private static final String[] ARGS4 = new String[] { 1.47 + "-d", BUG_ID + "-4", "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" 1.48 + }; 1.49 + 1.50 /** 1.51 * The entry point of the test. 1.52 * @param args the array of command line arguments. 1.53 @@ -108,6 +119,7 @@ 1.54 } 1.55 tester.printSummary(); 1.56 run(tester, ARGS3, TEST3, NO_TEST); 1.57 + run(tester, ARGS4, TEST4, NO_TEST); 1.58 tester.printSummary(); 1.59 } 1.60