Author: sergeyhalipov
Date: 2007-12-10 11:25:41 -0500 (Mon, 10 Dec 2007)
New Revision: 4664
Modified:
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
Log:
http://jira.jboss.com/jira/browse/RF-1178
Modified:
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
===================================================================
---
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-10
16:20:51 UTC (rev 4663)
+++
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-10
16:25:41 UTC (rev 4664)
@@ -67,7 +67,6 @@
javaScripts.add("scripts/LayoutManager.js");
javaScripts.add("scripts/Control.js");
javaScripts.add("scripts/OrderingList.js");
- javaScripts.add("scripts/extend/extend.js");
javaScripts.add("scripts/ListShuttle.js");
javaScripts.add("scripts/ListBase.js");
@@ -157,7 +156,6 @@
public void testCommonRendering() throws Exception{
HtmlPage view = renderView();
assertNotNull(view);
- System.out.println(view.asXml());
HtmlElement table =
view.getHtmlElementById(listShuttle.getClientId(facesContext));
assertNotNull(table);
@@ -169,7 +167,13 @@
HtmlElement tr = (HtmlElement) tbody.getFirstChild();
assertNotNull(tr);
+ String style = tr.getAttributeValue("style");
+ assertNotNull(style);
+ assertTrue(style.contains("display: none;"));
assertEquals("tr", tr.getTagName());
+
+ tr = (HtmlElement) tr.getNextSibling();
+ assertNotNull(tr);
assertNull(tr.getNextSibling());
int childCount = 0;
@@ -193,7 +197,7 @@
inputs = view.getDocumentElement().getHtmlElementsByAttribute("input",
"name", listShuttle.getClientId(facesContext));
assertNotNull(inputs);
- assertEquals(2, inputs.size());
+ assertEquals(4, inputs.size());
}
/**
@@ -231,7 +235,7 @@
assertTrue(found);
}
}
- assertEquals(foundCount, javaScripts.size());
+ assertEquals(javaScripts.size(), foundCount);
}
/**
@@ -265,8 +269,8 @@
List images =
view.getDocumentElement().getHtmlElementsByTagName("img");
assertNotNull(images);
- assertEquals(IMAGE_COUNT, images.size());
+ int foundImages = 0;
for (Iterator it = images.iterator(); it.hasNext(); ) {
HtmlElement img = (HtmlElement) it.next();
assertNotNull(img);
@@ -276,21 +280,31 @@
assertNotNull(page);
assertTrue(page.getWebResponse().getStatusCode() == HttpServletResponse.SC_OK);
- HtmlElement div = (HtmlElement) img.getParentNode();
- assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ if (uri.contains("spacer.gif")) {
+ continue;
+ }
+ foundImages++;
- div = (HtmlElement) div.getParentNode();
- assertNotNull(div);
- assertEquals("div", div.getNodeName());
+ HtmlElement element = (HtmlElement) img.getParentNode();
+ assertNotNull(element);
+ assertEquals("div", element.getNodeName());
- div = (HtmlElement) div.getParentNode();
- assertNotNull(div);
- assertEquals("div", div.getNodeName());
- String clazz = div.getAttributeValue("class");
+ element = (HtmlElement) element.getParentNode();
+ assertNotNull(element);
+ assertEquals("a", element.getNodeName());
+
+ element = (HtmlElement) element.getParentNode();
+ assertNotNull(element);
+ assertEquals("div", element.getNodeName());
+
+ element = (HtmlElement) element.getParentNode();
+ assertNotNull(element);
+ assertEquals("div", element.getNodeName());
+ String clazz = element.getAttributeValue("class");
assertNotNull(clazz);
assertTrue(clazz.contains("rich-shuttle-control"));
}
+ assertEquals(IMAGE_COUNT, foundImages);
}
/**