Author: dmorozov Date: 2008-11-27 14:28:11 -0500 (Thu, 27 Nov 2008) New Revision: 11418 Modified: trunk/ui/pickList/src/test/java/org/richfaces/component/PickListComponentTest.java trunk/ui/pickList/src/test/java/org/richfaces/renderkit/PickListRendererTest.java Log: extend and fix tests Modified: trunk/ui/pickList/src/test/java/org/richfaces/component/PickListComponentTest.java =================================================================== --- trunk/ui/pickList/src/test/java/org/richfaces/component/PickListComponentTest.java 2008-11-27 18:07:04 UTC (rev 11417) +++ trunk/ui/pickList/src/test/java/org/richfaces/component/PickListComponentTest.java 2008-11-27 19:28:11 UTC (rev 11418) @@ -21,7 +21,6 @@ package org.richfaces.component; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -29,7 +28,6 @@ import javax.faces.component.UIForm; import javax.faces.component.UISelectItem; -import javax.faces.component.UISelectItems; import javax.faces.component.html.HtmlForm; import javax.faces.model.SelectItem; @@ -39,18 +37,18 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; +/** + * @author Anton Belevich + * + */ public class PickListComponentTest extends AbstractAjax4JsfTestCase{ UIForm form; UIPickList pickList; - String [] selected = new String [] {"District of Columbia,Illinois,Maryland,New Hampshire,New Jersey"}; - - private static Set javaScripts = new HashSet(); - - List selectItems = new ArrayList(); - + private static Set <String> javaScripts = new HashSet<String>(); + static { javaScripts.add("org.ajax4jsf.javascript.PrototypeScript"); javaScripts.add("org/richfaces/renderkit/html/scripts/utils.js"); @@ -75,17 +73,9 @@ form = new HtmlForm(); form.setId("form"); facesContext.getViewRoot().getChildren().add(form); - + pickList = (UIPickList)application.createComponent("org.richfaces.PickList"); - pickList.setValue(selected); - selectItems.add(new SelectItem("District of Columbia")); - selectItems.add(new SelectItem("Illinois")); - selectItems.add(new SelectItem("Maryland")); - selectItems.add(new SelectItem("Nevada")); - selectItems.add(new SelectItem("New Hampshire")); - selectItems.add(new SelectItem("New Jersey")); - UISelectItem item1 = new UISelectItem(); item1.setValue(new SelectItem("Oregon")); @@ -102,9 +92,7 @@ pickList.getChildren().add(item2); pickList.getChildren().add(item3); pickList.getChildren().add(item4); - - UISelectItems items = new UISelectItems(); - items.setValue(selectItems); + form.getChildren().add(pickList); } @@ -117,18 +105,18 @@ HtmlPage page = renderView(); assertNotNull(page); - List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); - for (Iterator it = scripts.iterator(); it.hasNext();) { + List <HtmlScript>scripts = page.getDocumentHtmlElement().getHtmlElementsByTagName("script"); + 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().getNodeValue(); assert(scriptBodyString.contains("Richfaces.PickList")); } 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) { @@ -140,15 +128,10 @@ } } + public void tearDown() throws Exception { - // TODO Auto-generated method stub form = null; pickList = null; super.tearDown(); } - - public void testComponent() { - assertTrue( true ); - } - } Modified: trunk/ui/pickList/src/test/java/org/richfaces/renderkit/PickListRendererTest.java =================================================================== --- trunk/ui/pickList/src/test/java/org/richfaces/renderkit/PickListRendererTest.java 2008-11-27 18:07:04 UTC (rev 11417) +++ trunk/ui/pickList/src/test/java/org/richfaces/renderkit/PickListRendererTest.java 2008-11-27 19:28:11 UTC (rev 11418) @@ -21,11 +21,11 @@ package org.richfaces.renderkit; -import java.util.ArrayList; -import java.util.HashSet; +import java.util.Arrays; import java.util.List; -import java.util.Set; +import javax.faces.component.UICommand; +import javax.faces.component.UIComponent; import javax.faces.component.UIForm; import javax.faces.component.UISelectItem; import javax.faces.component.UISelectItems; @@ -33,8 +33,8 @@ import javax.faces.model.SelectItem; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; +import org.ajax4jsf.tests.MockValueExpression; import org.richfaces.component.UIPickList; -import org.richfaces.renderkit.html.PickListRendererGen; import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; @@ -48,53 +48,22 @@ private UIForm form; private UIPickList pickList; private UIPickList pickList2; - private String [] selected = new String [] {"District of Columbia,Illinois,Maryland,New Hampshire,New Jersey"}; - private List selectedList = new ArrayList(); - private static Set javaScripts = new HashSet(); - private PickListRendererGen renderer; - - List selectItems = new ArrayList(); - - - static { - javaScripts.add("a4j_3_2_0-SNAPSHOTorg.ajax4jsf.javascript.PrototypeScript"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/ShuttleUtils.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/SelectItem.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/PickListSI.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/LayoutManager.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/Control.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/ListBase.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/OrderingList.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/ListShuttle.js"); - javaScripts.add("a4j_3_2_0-SNAPSHOTscripts/PickList.js"); - } - + private String [] selected = new String [] {"District of Columbia, Illinois, Maryland, New Hampshire, New Jersey"}; + private List <String> selectedList = Arrays.asList(selected); + private List <SelectItem> selectItems = Arrays.asList(new SelectItem("New Mexico"), new SelectItem("Texas"), new SelectItem("Florida")); + + public PickListRendererTest(String name) { super(name); - selectedList.add("District of Columbia"); - selectedList.add("Illinois"); - selectedList.add("Maryland"); - selectedList.add("New Hampshire"); - selectedList.add("New Jersey"); + } public void setUp() throws Exception { super.setUp(); - renderer = new PickListRendererGen(); form = new HtmlForm(); form.setId("form"); facesContext.getViewRoot().getChildren().add(form); - pickList = (UIPickList)application.createComponent("org.richfaces.PickList"); - pickList.setValue(selected); - - selectItems.add(new SelectItem("District of Columbia")); - selectItems.add(new SelectItem("Illinois")); - selectItems.add(new SelectItem("Maryland")); - selectItems.add(new SelectItem("Nevada")); - selectItems.add(new SelectItem("New Hampshire")); - selectItems.add(new SelectItem("New Jersey")); - UISelectItem item1 = new UISelectItem(); item1.setValue(new SelectItem("Oregon")); @@ -106,45 +75,41 @@ UISelectItem item4 = new UISelectItem(); item4.setValue(new SelectItem("South Carolina")); - + + UISelectItems items = new UISelectItems(); + items.setValue(selectItems); + + pickList = (UIPickList)application.createComponent("org.richfaces.PickList"); + pickList.setValueExpression("value", new MockValueExpression(selected) ); + pickList.getChildren().add(item1); pickList.getChildren().add(item2); pickList.getChildren().add(item3); pickList.getChildren().add(item4); - - UISelectItems items = new UISelectItems(); - items.setValue(selectItems); + pickList.getChildren().add(items); form.getChildren().add(pickList); pickList2 = (UIPickList)application.createComponent("org.richfaces.PickList"); - pickList2.setValue(selectedList); - pickList2.getChildren().add(item1); + pickList2.setValueExpression("value", new MockValueExpression(selectedList) ); + pickList2.getChildren().add(item1); pickList2.getChildren().add(item2); pickList2.getChildren().add(item3); pickList2.getChildren().add(item4); + pickList2.getChildren().add(items); + form.getChildren().add(pickList2); } - public void testRender(){ - - try { - HtmlPage page = renderView(); - assertNotNull(page); - HtmlElement elem = page.getHtmlElementById(pickList.getClientId(facesContext)); - assertNotNull(elem); - assertEquals(elem.getTagName(), "table"); - renderer.doEncodeEnd(writer, facesContext, pickList); - - HtmlElement elem2 = page.getHtmlElementById(pickList2.getClientId(facesContext)); - assertNotNull(elem2); - assertEquals(elem.getTagName(), "table"); - renderer.doEncodeEnd(writer, facesContext, pickList); - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - fail(); - } + public void testRender() throws Exception{ + HtmlPage page = renderView(); + assertNotNull(page); + HtmlElement elem = page.getHtmlElementById(pickList.getClientId(facesContext)); + assertNotNull(elem); + assertEquals(elem.getTagName(), "table"); + // TODO: extend mockup check test + HtmlElement elem2 = page.getHtmlElementById(pickList2.getClientId(facesContext)); + assertNotNull(elem2); + assertEquals(elem.getTagName(), "table"); }