提交 776e0c7b 编写于 作者: J Jesse Glick

Merge pull request #935 from Vlatombe/testing-listview2

Simplify assertions since webClient#getPage already throws an exception
...@@ -82,23 +82,17 @@ public class ListViewTest { ...@@ -82,23 +82,17 @@ public class ListViewTest {
checkLinkFromItemExistsAndIsValid(folder2, folder1, folder1, webClient); checkLinkFromItemExistsAndIsValid(folder2, folder1, folder1, webClient);
checkLinkFromViewExistsAndIsValid(job2, folder1, lv2, webClient); checkLinkFromViewExistsAndIsValid(job2, folder1, lv2, webClient);
} }
private void assertResourceExists(HtmlPage viewPage) {
assertEquals(200, viewPage.getWebResponse().getStatusCode());
}
private void checkLinkFromViewExistsAndIsValid(Item item, ItemGroup ig, View view, WebClient webClient) throws IOException, SAXException { private void checkLinkFromViewExistsAndIsValid(Item item, ItemGroup ig, View view, WebClient webClient) throws IOException, SAXException {
HtmlPage page = webClient.goTo(view.getUrl()); HtmlPage page = webClient.goTo(view.getUrl());
assertResourceExists(page);
HtmlAnchor link = page.getAnchorByText(Functions.getRelativeDisplayNameFrom(item, ig)); HtmlAnchor link = page.getAnchorByText(Functions.getRelativeDisplayNameFrom(item, ig));
assertResourceExists(webClient.getPage(view, link.getHrefAttribute())); webClient.getPage(view, link.getHrefAttribute());
} }
private void checkLinkFromItemExistsAndIsValid(Item item, ItemGroup ig, Item top, WebClient webClient) throws IOException, SAXException { private void checkLinkFromItemExistsAndIsValid(Item item, ItemGroup ig, Item top, WebClient webClient) throws IOException, SAXException {
HtmlPage page = webClient.goTo(top.getUrl()); HtmlPage page = webClient.goTo(top.getUrl());
assertResourceExists(page);
HtmlAnchor link = page.getAnchorByText(Functions.getRelativeDisplayNameFrom(item, ig)); HtmlAnchor link = page.getAnchorByText(Functions.getRelativeDisplayNameFrom(item, ig));
assertResourceExists(webClient.getPage(top, link.getHrefAttribute())); webClient.getPage(top, link.getHrefAttribute());
} }
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册