[richfaces-svn-commits] JBoss Rich Faces SVN: r298 - trunk/richfaces/tabPanel/src/test/java/org/richfaces/component.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Apr 6 04:42:42 EDT 2007
Author: A.Skokov
Date: 2007-04-06 04:42:42 -0400 (Fri, 06 Apr 2007)
New Revision: 298
Modified:
trunk/richfaces/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
Log:
test updated
Modified: trunk/richfaces/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
===================================================================
--- trunk/richfaces/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-04-06 08:42:02 UTC (rev 297)
+++ trunk/richfaces/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2007-04-06 08:42:42 UTC (rev 298)
@@ -24,7 +24,6 @@
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.HtmlTab;
@@ -52,9 +51,9 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/tabPanel.js");
}
- private HtmlTabPanel tabPanel;
- private HtmlTab tab1;
- private HtmlTab tab2;
+ private UITabPanel tabPanel;
+ private UITab tab1;
+ private UITab tab2;
private UIForm form;
/**
@@ -76,15 +75,15 @@
form.setId("form");
facesContext.getViewRoot().getChildren().add(form);
- tabPanel = (HtmlTabPanel)application.createComponent(HtmlTabPanel.COMPONENT_TYPE);
+ tabPanel = (HtmlTabPanel)application.createComponent("org.richfaces.TabPanel");
tabPanel.setId("tabPanel");
form.getChildren().add(tabPanel);
- tab1 = (HtmlTab)application.createComponent(HtmlTab.COMPONENT_TYPE);
+ tab1 = (HtmlTab)application.createComponent("org.richfaces.Tab");
tab1.setId("tab1");
tabPanel.getChildren().add(tab1);
- tab2 = (HtmlTab)application.createComponent(HtmlTab.COMPONENT_TYPE);
+ tab2 = (HtmlTab)application.createComponent("org.richfaces.Tab");
tab2.setId("tab2");
tabPanel.getChildren().add(tab2);
}
@@ -101,80 +100,67 @@
}
/**
- * Test component default values
- *
- * @throws Exception
- */
- public void testDefaultValues() throws Exception {
- Assert.assertEquals("server", tabPanel.getSwitchType());
- Assert.assertEquals("left", tabPanel.getHeaderAlignment());
- Assert.assertEquals("1px", tabPanel.getHeaderSpacing());
-
- Assert.assertEquals(tab1.getId(), tab1.getName());
- Assert.assertEquals(tab2.getId(), tab2.getName());
- }
- /**
* Test component rendering
*
* @throws Exception
*/
public void testRender() throws Exception {
HtmlPage page = renderView();
- Assert.assertNotNull(page);
+ assertNotNull(page);
System.out.println(page.asXml());
- HtmlElement table = page.getHtmlElementById(form.getId() + ":" + tabPanel.getId());
- Assert.assertNotNull(table);
- Assert.assertEquals("table", table.getNodeName());
+ HtmlElement table = page.getHtmlElementById(tabPanel.getClientId(facesContext));
+ assertNotNull(table);
+ assertEquals("table", table.getNodeName());
String classAttr = table.getAttributeValue("class");
- Assert.assertTrue(classAttr.contains("rich-tabpanel"));
+ assertTrue(classAttr.contains("rich-tabpanel"));
- HtmlElement cell1 = page.getHtmlElementById(form.getId() + ":" + tab1.getId() + "_cell");
- Assert.assertNotNull(cell1);
- Assert.assertEquals("td", cell1.getNodeName());
+ HtmlElement cell1 = page.getHtmlElementById(tab1.getClientId(facesContext) + "_cell");
+ assertNotNull(cell1);
+ assertEquals("td", cell1.getNodeName());
String classAttr1 = cell1.getAttributeValue("class");
- Assert.assertTrue(classAttr1.contains("dr-tbpnl-tbcell-act"));
- Assert.assertTrue(classAttr1.contains("rich-tabhdr-cell-active"));
+ assertTrue(classAttr1.contains("dr-tbpnl-tbcell-act"));
+ assertTrue(classAttr1.contains("rich-tabhdr-cell-active"));
- HtmlElement label1 = page.getHtmlElementById(form.getId() + ":" + tab1.getId() + "_lbl");
- Assert.assertNotNull(label1);
- Assert.assertEquals("td", label1.getNodeName());
+ HtmlElement label1 = page.getHtmlElementById(tab1.getClientId(facesContext) + "_lbl");
+ assertNotNull(label1);
+ assertEquals("td", label1.getNodeName());
assertEquals("RichFaces.overTab(this);", label1.getAttributeValue("onmouseover"));
assertEquals("RichFaces.outTab(this);", label1.getAttributeValue("onmouseout"));
String classAttrL1 = label1.getAttributeValue("class");
- Assert.assertTrue(classAttrL1.contains("dr-tbpnl-tb"));
- Assert.assertTrue(classAttrL1.contains("rich-tab-header"));
- Assert.assertTrue(classAttrL1.contains("dr-tbpnl-tb-act"));
- Assert.assertTrue(classAttrL1.contains("rich-tab-active"));
+ assertTrue(classAttrL1.contains("dr-tbpnl-tb"));
+ assertTrue(classAttrL1.contains("rich-tab-header"));
+ assertTrue(classAttrL1.contains("dr-tbpnl-tb-act"));
+ assertTrue(classAttrL1.contains("rich-tab-active"));
- HtmlElement cell2 = page.getHtmlElementById(form.getId() + ":" + tab2.getId() + "_cell");
- Assert.assertNotNull(cell2);
- Assert.assertEquals("td", cell2.getNodeName());
+ HtmlElement cell2 = page.getHtmlElementById(tab2.getClientId(facesContext) + "_cell");
+ assertNotNull(cell2);
+ assertEquals("td", cell2.getNodeName());
String classAttr2 = cell2.getAttributeValue("class");
- Assert.assertTrue(classAttr2.contains("dr-tbpnl-tbcell-inact"));
- Assert.assertTrue(classAttr2.contains("rich-tabhdr-cell-inactive"));
+ assertTrue(classAttr2.contains("dr-tbpnl-tbcell-inact"));
+ assertTrue(classAttr2.contains("rich-tabhdr-cell-inactive"));
- HtmlElement label2 = page.getHtmlElementById(form.getId() + ":" + tab2.getId() + "_lbl");
- Assert.assertNotNull(label2);
- Assert.assertEquals("td", label2.getNodeName());
+ HtmlElement label2 = page.getHtmlElementById(tab2.getClientId(facesContext) + "_lbl");
+ assertNotNull(label2);
+ assertEquals("td", label2.getNodeName());
assertEquals("RichFaces.overTab(this);", label1.getAttributeValue("onmouseover"));
assertEquals("RichFaces.outTab(this);", label1.getAttributeValue("onmouseout"));
String classAttrL2 = label2.getAttributeValue("class");
- Assert.assertTrue(classAttrL2.contains("dr-tbpnl-tb"));
- Assert.assertTrue(classAttrL2.contains("rich-tab-header"));
- Assert.assertTrue(classAttrL2.contains("dr-tbpnl-tb-inact"));
- Assert.assertTrue(classAttrL2.contains("rich-tab-inactive"));
+ assertTrue(classAttrL2.contains("dr-tbpnl-tb"));
+ assertTrue(classAttrL2.contains("rich-tab-header"));
+ assertTrue(classAttrL2.contains("dr-tbpnl-tb-inact"));
+ assertTrue(classAttrL2.contains("rich-tab-inactive"));
- HtmlElement tab = page.getHtmlElementById(form.getId() + ":" + tab1.getId());
- Assert.assertNotNull(tab);
- Assert.assertEquals("td", tab.getNodeName());
+ HtmlElement tab = page.getHtmlElementById(tab1.getClientId(facesContext));
+ assertNotNull(tab);
+ assertEquals("td", tab.getNodeName());
}
/**
@@ -184,11 +170,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/tabPanel.xcss"));
+ assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/tabPanel.xcss"));
}
/**
@@ -198,7 +184,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();
More information about the richfaces-svn-commits
mailing list