[richfaces-svn-commits] JBoss Rich Faces SVN: r295 - in trunk/richfaces/separator/src/test/java/org/richfaces: component and 1 other directory.
Author: A.Skokov
Date: 2007-04-06 04:40:17 -0400 (Fri, 06 Apr 2007)
New Revision: 295
Removed:
trunk/richfaces/separator/src/test/java/org/richfaces/component/html/
trunk/richfaces/separator/src/test/java/org/richfaces/taglib/
Modified:
trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
Log:
test updated
Modified:
trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java
===================================================================
---
trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-04-06
08:39:42 UTC (rev 294)
+++
trunk/richfaces/separator/src/test/java/org/richfaces/component/SeparatorComponentTest.java 2007-04-06
08:40:17 UTC (rev 295)
@@ -23,9 +23,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import junit.framework.Assert;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.html.HtmlSeparator;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
@@ -37,7 +35,7 @@
*/
public class SeparatorComponentTest extends AbstractAjax4JsfTestCase {
- private HtmlSeparator ui;
+ private UISeparator ui;
private UIComponent form;
private UIOutput out1;
private UIOutput out2;
@@ -66,7 +64,7 @@
out1.setValue("output1");
form.getChildren().add(out1);
- ui = (HtmlSeparator)application.createComponent(HtmlSeparator.COMPONENT_TYPE);
+ ui =
(UISeparator)application.createComponent("org.richfaces.separator");
ui.setId("separator");
form.getChildren().add(ui);
@@ -87,36 +85,23 @@
}
/**
- * Test component default values
- *
- * @throws Exception
- */
- public void testDefaultValues() throws Exception {
- assertEquals("100%", ui.getWidth());
- assertEquals("6px", ui.getHeight());
- assertEquals("beveled", ui.getLineType());
- assertEquals("beveled", ui.getLineType());
- assertEquals("left", ui.getAlign());
- }
-
- /**
* 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());
HtmlElement div2 =
(HtmlElement)div1.getHtmlElementsByTagName("div").get(0);
String classAttr = div2.getAttributeValue("class");
- Assert.assertTrue(classAttr.contains("rich-separator"));
+ assertTrue(classAttr.contains("rich-separator"));
String styleAttr = div2.getAttributeValue("style");
-
Assert.assertTrue(styleAttr.contains("org.richfaces.renderkit.html.images.BevelSeparatorImage"));
+
assertTrue(styleAttr.contains("org.richfaces.renderkit.html.images.BevelSeparatorImage"));
}
}