diff -r b6d89903c867 -r a08610368936 langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Wed Sep 18 17:13:26 2013 -0700
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Wed Sep 18 22:47:06 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8006124 8009684 8016921 8023700
+ * @bug 8006124 8009684 8016921 8023700 8024096
* @summary Test javadoc support for profiles.
* @author Bhavesh Patel, Evgeniya Stepanova
* @library ../lib/
@@ -187,26 +187,6 @@
}
};
private static final String[][] PACKAGES_NEGATED_TEST = {
- {PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
- "All Packages"
- },
- {PACKAGE_BUG_ID + FS + "compact2-frame.html",
- ""
- + "All PackagesAll Profiles"
- },
- {PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
- ""
- + "compact2 - pkg2"
- },
- {PACKAGE_BUG_ID + FS + "compact2-summary.html",
- "
Profile compact2
"
- },
- {PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
- "compact3
"
- },
{PACKAGE_BUG_ID + FS + "overview-frame.html",
"All Profiles"
@@ -222,6 +202,13 @@
""
}
};
+ private static final String[] PACKAGES_NEGATED_FILE_TEST = {
+ PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
+ PACKAGE_BUG_ID + FS + "compact2-frame.html",
+ PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
+ PACKAGE_BUG_ID + FS + "compact2-summary.html",
+ PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html"
+ };
/**
* The entry point of the test.
@@ -231,7 +218,7 @@
public static void main(String[] args) {
TestProfiles tester = new TestProfiles();
run(tester, ARGS1, PROFILES_TEST, PROFILES_NEGATED_TEST);
- run(tester, ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST);
+ run(tester, ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST, NO_FILE_TEST, PACKAGES_NEGATED_FILE_TEST);
tester.printSummary();
}