1.1 --- a/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Wed Sep 18 17:13:26 2013 -0700
1.2 +++ b/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Wed Sep 18 22:47:06 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2002, 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 @@ -25,7 +25,7 @@
1.11
1.12 /*
1.13 * @test
1.14 - * @bug 4258405 4973606
1.15 + * @bug 4258405 4973606 8024096
1.16 * @summary This test verifies that the doc-file directory does not
1.17 * get overwritten when the sourcepath is equal to the destination
1.18 * directory.
1.19 @@ -47,25 +47,17 @@
1.20 };
1.21 private static final String[][] NEGATED_TEST1 = NO_TEST;
1.22
1.23 - private static final String[][] TEST2 = {
1.24 - {BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used1" +
1.25 + private static final String[] FILE_TEST2 = {
1.26 + BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used1" +
1.27 FS + "testfile.txt",
1.28 - "passed"
1.29 - },
1.30 - {BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used2" +
1.31 + BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used2" +
1.32 + FS + "testfile.txt"
1.33 + };
1.34 + private static final String[] FILE_NEGATED_TEST2 = {
1.35 + BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded1" +
1.36 FS + "testfile.txt",
1.37 - "passed"
1.38 - },
1.39 - };
1.40 - private static final String[][] NEGATED_TEST2 = {
1.41 - {BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded1" +
1.42 - FS + "testfile.txt",
1.43 - "passed"
1.44 - },
1.45 - {BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded2" +
1.46 - FS + "testfile.txt",
1.47 - "passed"
1.48 - },
1.49 + BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded2" +
1.50 + FS + "testfile.txt"
1.51 };
1.52
1.53 private static final String[][] TEST0 = {
1.54 @@ -106,7 +98,7 @@
1.55 run(tester, ARGS0, TEST0, NEGATED_TEST0);
1.56 copyDir(SRC_DIR + FS + "pkg", BUG_ID + "-1");
1.57 run(tester, ARGS1, TEST1, NEGATED_TEST1);
1.58 - run(tester, ARGS2, TEST2, NEGATED_TEST2);
1.59 + run(tester, ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2);
1.60 tester.printSummary();
1.61 }
1.62
