Author: abelevich Date: 2008-11-28 05:51:27 -0500 (Fri, 28 Nov 2008) New Revision: 11423 Modified: trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java trunk/ui/inplaceSelect/src/test/java/org/richfaces/renderkit/InplaceSelectRenderTest.java Log: extend test Modified: trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java =================================================================== --- trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2008-11-28 10:50:13 UTC (rev 11422) +++ trunk/ui/inplaceSelect/src/test/java/org/richfaces/component/InplaceSelectComponentTest.java 2008-11-28 10:51:27 UTC (rev 11423) @@ -36,16 +36,21 @@ import org.apache.commons.lang.StringUtils; import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlLink; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; +/** + * @author Anton Belevich + * + */ public class InplaceSelectComponentTest extends AbstractAjax4JsfTestCase { UIForm form; UIInplaceSelect iselect; - List selectItems = new ArrayList(); + List <SelectItem> selectItems = new ArrayList<SelectItem>(); - private static Set javaScripts = new HashSet(); + private static Set <String> javaScripts = new HashSet <String>(); static { javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); @@ -111,7 +116,7 @@ public void testComboBoxStyles() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List links = page.getDocumentElement().getHtmlElementsByTagName("link"); + List <HtmlLink> links = page.getDocumentHtmlElement().getHtmlElementsByTagName("link"); if(links.size()==0){fail();} for (int i = 0; i < links.size(); i++) { HtmlElement link = (HtmlElement) links.get(i); @@ -123,20 +128,20 @@ public void testComboBoxScripts() throws Exception { HtmlPage page = renderView(); assertNotNull(page); - List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); + List <HtmlScript> scripts = page.getDocumentHtmlElement().getHtmlElementsByTagName("script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { + for (Iterator <HtmlScript> it = scripts.iterator(); it.hasNext();) { HtmlScript item = (HtmlScript) it.next(); String srcAttr = item.getSrcAttribute(); - if (item.getFirstChild() != null) { - String scriptBodyString = item.getFirstChild().toString(); + if (item.getFirstDomChild() != null) { + String scriptBodyString = item.getFirstDomChild().toString(); assertTrue(scriptBodyString.contains("Richfaces.InplaceSelectList")); assertTrue(scriptBodyString.contains("Richfaces.InplaceSelect")); assertTrue(scriptBodyString.contains("inplaceSelectUserStyles")); } if (StringUtils.isNotBlank(srcAttr)) { boolean found = false; - for (Iterator srcIt = javaScripts.iterator(); srcIt.hasNext();) { + for (Iterator <String> srcIt = javaScripts.iterator(); srcIt.hasNext();) { String src = (String) srcIt.next(); found = srcAttr.contains(src); if (found) { Modified: trunk/ui/inplaceSelect/src/test/java/org/richfaces/renderkit/InplaceSelectRenderTest.java =================================================================== --- trunk/ui/inplaceSelect/src/test/java/org/richfaces/renderkit/InplaceSelectRenderTest.java 2008-11-28 10:50:13 UTC (rev 11422) +++ trunk/ui/inplaceSelect/src/test/java/org/richfaces/renderkit/InplaceSelectRenderTest.java 2008-11-28 10:51:27 UTC (rev 11423) @@ -21,6 +21,8 @@ package org.richfaces.renderkit; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; import java.util.List; import javax.faces.component.UISelectItem; @@ -28,17 +30,24 @@ import javax.faces.model.SelectItem; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.MockValueExpression; import org.richfaces.component.UIInplaceSelect; -import org.richfaces.renderkit.html.InplaceSelectRenderer; +import org.w3c.dom.Node; +import com.gargoylesoftware.htmlunit.html.DomNode; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; +/** + * @author Anton Belevich + * + */ public class InplaceSelectRenderTest extends AbstractAjax4JsfTestCase { private UIInplaceSelect iselect; - private InplaceSelectRenderer renderer; - List selectItems = new ArrayList(); + + List <String> states = Arrays.asList("Kansas City", "Las Vegas", "Oklahoma City", "New Jersey", "Detroit", "Toronto", "Cleveland", "Indianapolis", "Indianapolis", "New York"); + List <SelectItem> selectItems = new ArrayList <SelectItem>(); public InplaceSelectRenderTest(String name) { super(name); @@ -46,9 +55,8 @@ public void setUp() throws Exception { super.setUp(); - renderer = new InplaceSelectRenderer(); iselect = (UIInplaceSelect)application.createComponent("org.richfaces.InplaceSelect"); - iselect.setValue("New York"); + selectItems.add(new SelectItem("Kansas City")); selectItems.add(new SelectItem("Las Vegas")); selectItems.add(new SelectItem("Oklahoma City")); @@ -66,26 +74,34 @@ UISelectItem item4 = new UISelectItem(); item4.setValue(new SelectItem("New York")); - + + UISelectItems items = new UISelectItems(); + items.setValueExpression("value",new MockValueExpression(selectItems)); + + iselect.getChildren().add(items); iselect.getChildren().add(item1); iselect.getChildren().add(item2); iselect.getChildren().add(item3); iselect.getChildren().add(item4); - UISelectItems items = new UISelectItems(); - items.setValue(selectItems); - iselect.getChildren().add(items); - iselect.setValue("New York"); - facesContext.getViewRoot().getChildren().add(iselect); } public void testRender() throws Exception{ - HtmlPage page = renderView(); assertNotNull(page); - HtmlElement elem = page.getHtmlElementById(iselect.getClientId(facesContext)); + String clientId = iselect.getClientId(facesContext); + HtmlElement elem = page.getHtmlElementById(clientId); assertNotNull(elem); assertEquals(elem.getTagName(), "span"); + HtmlElement list = page.getHtmlElementById(clientId + "list"); +// test is list rendered correctly... + for (Iterator<HtmlElement> items = list.getChildIterator(); items.hasNext();) { + HtmlElement span = items.next(); + assertEquals("span", span.getNodeName().toLowerCase()); + DomNode node = span.getFirstDomChild(); + assertEquals(Node.TEXT_NODE, node.getNodeType()); + assertTrue(states.contains(node.getNodeValue())); + } } }