test/jdk/javadoc/doclet/testOrdering/TestOrdering.java
Print this page
*** 68,77 ****
--- 68,79 ----
checkExit(Exit.OK);
checkClassUseOrdering("pkg1/class-use/UsedClass.html");
checkOrder("pkg1/class-use/UsedClass.html", expectedClassUseMethodOrdering);
checkOrder("pkg1/class-use/UsedClass.html", expectedClassUseWithTypeParams);
checkOrder("pkg1/class-use/UsedClass.html", expectedInnerClassContructors);
+ checkOrder("pkg1/ImplementsOrdering.html", expectedImplementsOrdering);
+ checkOrder("pkg1/OverrideOrdering.html", expectedOverrideOrdering);
}
enum ListOrder { NONE, REVERSE, SHUFFLE };
/*
* By default we do not shuffle the input list, in order to keep the list deterministic,
*** 120,129 ****
--- 122,132 ----
javadoc(cmdArgs.toArray(new String[cmdArgs.size()]));
checkExit(Exit.OK);
checkOrder("index-all.html", composeTestVectors());
checkOrder("add0/add/package-tree.html", expectedPackageTreeOrdering);
checkOrder("overview-tree.html", expectedOverviewOrdering);
+ checkOrder("overview-frame.html", expectedOverviewFrameOrdering);
}
@Test
void testIndexTypeClustering() {
javadoc("-d", "out-3",
*** 134,143 ****
--- 137,172 ----
"e",
"something");
checkOrder("index-all.html", typeTestVectors);
checkExit(Exit.OK);
}
+
+ @Test
+ void testMethodDetailOrdering() {
+ javadoc("-d", "out-4",
+ "-sourcepath", testSrc(new File(".").getPath()),
+ "order"
+ );
+ checkOrder("order/MethodOrder.html", methodSourceOrderVectors);
+ checkExit(Exit.OK);
+ }
+
+ String[] methodSourceOrderVectors = {
+ "<pre>public void d()</pre>\n" +
+ "<div class=\"block\">Method d.\n" +
+ " Second line.</div>",
+ "<pre>public void b()</pre>\n" +
+ "<div class=\"block\">Method b.\n" +
+ " Second line.</div>",
+ "<pre>public void c()</pre>\n" +
+ "<div class=\"block\">Method c.\n" +
+ " Second line.</div>",
+ "<pre>public void a()</pre>\n" +
+ "<div class=\"block\">Method a.\n" +
+ " Second line.</div>"
+ };
+
String[] typeTestVectors = {
"something</a> - package something</dt>",
"something</span></a> - Class in",
"something</span></a> - Enum in",
"something</span></a> - Interface in",
*** 148,183 ****
"something()</a></span> - Method in class a.<a href=\"a/something.html\"",
"something()</a></span> - Method in class something.<a href=\"something/J.html\""
};
String[] composeTestVectors() {
List<String> testList = new ArrayList<>();
!
! for (String x : expectedMethodOrdering) {
! testList.add(x);
for (int i = 0; i < MAX_PACKAGES; i++) {
String wpkg = "add" + i;
! testList.add(wpkg + "/" + x);
String dpkg = wpkg;
for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
dpkg = dpkg + "/" + "add";
! testList.add(dpkg + "/" + x);
}
}
}
! for (String x : expectedEnumOrdering) {
! testList.add(x.replace("REPLACE_ME", "<Unnamed>"));
for (int i = 0; i < MAX_PACKAGES; i++) {
String wpkg = "add" + i;
! testList.add(wpkg + "/" + x.replace("REPLACE_ME", wpkg));
String dpkg = wpkg;
for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
dpkg = dpkg + "/" + "add";
! testList.add(dpkg + "/" + x.replace("REPLACE_ME", pathToPackage(dpkg)));
}
}
}
- testList.addAll(Arrays.asList(expectedFieldOrdering));
return testList.toArray(new String[testList.size()]);
}
void checkExecutableMemberOrdering(String usePage) {
String contents = readFile(usePage);
// check constructors
--- 177,213 ----
"something()</a></span> - Method in class a.<a href=\"a/something.html\"",
"something()</a></span> - Method in class something.<a href=\"something/J.html\""
};
String[] composeTestVectors() {
List<String> testList = new ArrayList<>();
! for (String x : expectedEnumOrdering) {
! testList.add(x.replace("REPLACE_ME", "<Unnamed>"));
for (int i = 0; i < MAX_PACKAGES; i++) {
String wpkg = "add" + i;
! testList.add(wpkg + "/" + x.replace("REPLACE_ME", wpkg));
String dpkg = wpkg;
for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
dpkg = dpkg + "/" + "add";
! testList.add(dpkg + "/" + x.replace("REPLACE_ME", pathToPackage(dpkg)));
}
}
}
!
! testList.addAll(Arrays.asList(expectedFieldOrdering));
!
! for (String x : expectedMethodOrdering) {
! testList.add(x);
for (int i = 0; i < MAX_PACKAGES; i++) {
String wpkg = "add" + i;
! testList.add(wpkg + "/" + x);
String dpkg = wpkg;
for (int j = 1; j < MAX_SUBPACKAGES_DEPTH; j++) {
dpkg = dpkg + "/" + "add";
! testList.add(dpkg + "/" + x);
}
}
}
return testList.toArray(new String[testList.size()]);
}
void checkExecutableMemberOrdering(String usePage) {
String contents = readFile(usePage);
// check constructors
*** 295,304 ****
--- 325,338 ----
"../../pkg1/MethodOrder.html#m-double-double-",
"../../pkg1/MethodOrder.html#m-double-java.lang.Double-",
"../../pkg1/MethodOrder.html#m-int-",
"../../pkg1/MethodOrder.html#m-int-int-",
"../../pkg1/MethodOrder.html#m-int-java.lang.Integer-",
+ "../../pkg1/MethodOrder.html#m-long-",
+ "../../pkg1/MethodOrder.html#m-long-long-",
+ "../../pkg1/MethodOrder.html#m-long-java.lang.Long-",
+ "../../pkg1/MethodOrder.html#m-long-java.lang.Long...-",
"../../pkg1/MethodOrder.html#m-java.lang.Double-",
"../../pkg1/MethodOrder.html#m-java.lang.Double-double-",
"../../pkg1/MethodOrder.html#m-java.lang.Double-java.lang.Double-",
"../../pkg1/MethodOrder.html#m-java.lang.Integer-",
"../../pkg1/MethodOrder.html#m-java.lang.Integer-int-",
*** 422,427 ****
--- 456,489 ----
"<a href=\"add3/Add.ADD.html\" title=\"enum in add3\">",
"<a href=\"add3/add/Add.ADD.html\" title=\"enum in add3.add\">",
"<a href=\"add3/add/add/Add.ADD.html\" title=\"enum in add3.add.add\">",
"<a href=\"add3/add/add/add/Add.ADD.html\" title=\"enum in add3.add.add.add\">",
};
+ final static String expectedOverviewFrameOrdering[] = {
+ "<a href=\"package-frame.html\" target=\"packageFrame\"><unnamed package></a>",
+ "<a href=\"add0/package-frame.html\" target=\"packageFrame\">add0</a>",
+ "<a href=\"add0/add/package-frame.html\" target=\"packageFrame\">add0.add</a>",
+ "<a href=\"add0/add/add/package-frame.html\" target=\"packageFrame\">add0.add.add</a>",
+ "<a href=\"add0/add/add/add/package-frame.html\" target=\"packageFrame\">add0.add.add.add</a>",
+ "<a href=\"add1/package-frame.html\" target=\"packageFrame\">add1</a>",
+ "<a href=\"add1/add/package-frame.html\" target=\"packageFrame\">add1.add</a>",
+ "<a href=\"add1/add/add/package-frame.html\" target=\"packageFrame\">add1.add.add</a>",
+ "<a href=\"add1/add/add/add/package-frame.html\" target=\"packageFrame\">add1.add.add.add</a>",
+ "<a href=\"add2/package-frame.html\" target=\"packageFrame\">add2</a>",
+ "<a href=\"add2/add/package-frame.html\" target=\"packageFrame\">add2.add</a>",
+ "<a href=\"add2/add/add/package-frame.html\" target=\"packageFrame\">add2.add.add</a>",
+ "<a href=\"add2/add/add/add/package-frame.html\" target=\"packageFrame\">add2.add.add.add</a>",
+ "<a href=\"add3/package-frame.html\" target=\"packageFrame\">add3</a>",
+ "<a href=\"add3/add/package-frame.html\" target=\"packageFrame\">add3.add</a>",
+ "<a href=\"add3/add/add/package-frame.html\" target=\"packageFrame\">add3.add.add</a>",
+ "<a href=\"add3/add/add/add/package-frame.html\" target=\"packageFrame\">add3.add.add.add</a></li>"
+ };
+ final static String expectedImplementsOrdering[] = {
+ "<dd><code>close</code> in interface <code>java.lang.AutoCloseable</code></dd>",
+ "<dd><code>close</code> in interface <code>java.nio.channels.Channel</code></dd>",
+ "<dd><code>close</code> in interface <code>java.io.Closeable</code></dd>"
+ };
+ final static String expectedOverrideOrdering[] = {
+ "<dd><code>iterator</code> in interface <code>java.util.Collection<",
+ "<dd><code>iterator</code> in interface <code>java.lang.Iterable<"
+ };
}