Author: A.Skokov Date: 2007-04-06 04:41:03 -0400 (Fri, 06 Apr 2007) New Revision: 296 Modified: trunk/richfaces/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java Log: test updated Modified: trunk/richfaces/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java =================================================================== --- trunk/richfaces/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-04-06 08:40:17 UTC (rev 295) +++ trunk/richfaces/simpleTogglePanel/src/test/java/org/richfaces/component/SimpleTogglePanelComponentTest.java 2007-04-06 08:41:03 UTC (rev 296) @@ -24,10 +24,8 @@ import com.gargoylesoftware.htmlunit.html.HtmlElement; import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; -import junit.framework.Assert; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; -import org.richfaces.component.html.HtmlSimpleTogglePanel; import javax.faces.component.UIForm; import javax.faces.component.html.HtmlForm; @@ -52,7 +50,7 @@ javaScripts.add("org/richfaces/renderkit/html/scripts/simpleTogglePanel.js"); } - private HtmlSimpleTogglePanel ui; + private UISimpleTogglePanel ui; private UIForm form; /** @@ -74,7 +72,7 @@ form.setId("form"); facesContext.getViewRoot().getChildren().add(form); - ui = (HtmlSimpleTogglePanel)application.createComponent(HtmlSimpleTogglePanel.COMPONENT_TYPE); + ui = (UISimpleTogglePanel)application.createComponent("org.richfaces.SimpleTogglePanel"); ui.setId("simpleTogglePanel"); form.getChildren().add(ui); @@ -90,47 +88,38 @@ } /** - * Test component default values - * - * @throws Exception - */ - public void testDefaultValues() throws Exception { - assertEquals("100%", ui.getWidth()); - assertEquals(true, ui.isOpened()); - } - /** * Test component rendering * * @throws Exception */ public void testRender() throws Exception { HtmlPage page = renderView(); - Assert.assertNotNull(page); + assertNotNull(page); System.out.println(page.asXml()); - HtmlElement div1 = page.getHtmlElementById(form.getId() + ":" + ui.getId()); - Assert.assertNotNull(div1); - Assert.assertEquals("div", div1.getNodeName()); + HtmlElement div1 = page.getHtmlElementById(ui.getClientId(facesContext)); + assertNotNull(div1); + assertEquals("div", div1.getNodeName()); String classAttr1 = div1.getAttributeValue("class"); - Assert.assertTrue(classAttr1.contains("dr-stglpnl")); - Assert.assertTrue(classAttr1.contains("rich-stglpanel")); + assertTrue(classAttr1.contains("dr-stglpnl")); + assertTrue(classAttr1.contains("rich-stglpanel")); - HtmlElement div2 = page.getHtmlElementById(form.getId() + ":" + ui.getId() + "_header"); - Assert.assertNotNull(div2); - Assert.assertEquals("div", div2.getNodeName()); + HtmlElement div2 = page.getHtmlElementById(ui.getClientId(facesContext) + "_header"); + assertNotNull(div2); + assertEquals("div", div2.getNodeName()); String classAttr2 = div2.getAttributeValue("class"); - Assert.assertTrue(classAttr2.contains("dr-stglpnl-h")); - Assert.assertTrue(classAttr2.contains("rich-stglpanel-header")); + assertTrue(classAttr2.contains("dr-stglpnl-h")); + assertTrue(classAttr2.contains("rich-stglpanel-header")); - HtmlElement div3 = page.getHtmlElementById(form.getId() + ":" + ui.getId() + "_switch"); - Assert.assertNotNull(div3); - Assert.assertEquals("div", div3.getNodeName()); + HtmlElement div3 = page.getHtmlElementById(ui.getClientId(facesContext) + "_switch"); + assertNotNull(div3); + assertEquals("div", div3.getNodeName()); - HtmlElement div4 = page.getHtmlElementById(form.getId() + ":" + ui.getId() + "_body"); - Assert.assertNotNull(div4); - Assert.assertEquals("div", div4.getNodeName()); + HtmlElement div4 = page.getHtmlElementById(ui.getClientId(facesContext) + "_body"); + assertNotNull(div4); + assertEquals("div", div4.getNodeName()); } /** @@ -140,11 +129,11 @@ */ public void testRenderStyle() throws Exception { HtmlPage page = renderView(); - Assert.assertNotNull(page); + assertNotNull(page); List links = page.getDocumentElement().getHtmlElementsByTagName("link"); - Assert.assertEquals(1, links.size()); + assertEquals(1, links.size()); HtmlElement link = (HtmlElement) links.get(0); - Assert.assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/simpleTogglePanel.xcss")); + assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/simpleTogglePanel.xcss")); } /** @@ -154,7 +143,7 @@ */ public void testRenderScript() throws Exception { HtmlPage page = renderView(); - Assert.assertNotNull(page); + assertNotNull(page); List scripts = page.getDocumentElement().getHtmlElementsByTagName("script"); for (Iterator it = scripts.iterator(); it.hasNext();) { HtmlScript item = (HtmlScript) it.next();