Author: ppitonak(a)redhat.com
Date: 2011-10-19 04:40:18 -0400 (Wed, 19 Oct 2011)
New Revision: 22821
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
Log:
testStyle and testStyleClass fixed for tree/tree node
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19
07:05:14 UTC (rev 22820)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-10-19
08:40:18 UTC (rev 22821)
@@ -63,6 +63,8 @@
import org.jboss.cheiron.halt.XHRHalter;
import org.jboss.test.selenium.dom.Event;
+import org.jboss.test.selenium.locator.Attribute;
+import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.locator.ExtendedLocator;
import org.jboss.test.selenium.locator.JQueryLocator;
@@ -287,12 +289,20 @@
@Test
public void testStyle() {
- this.testStyle(tree);
+ final String value = "background-color: yellow; font-size: 1.5em;";
+ selenium.type(jq("input[id$=attributes:styleInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAttribute(Attribute.STYLE);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute
style should contain \"" + value + "\"");
}
@Test
public void testStyleClass() {
- this.testStyleClass(tree);
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=attributes:styleClassInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr = tree.getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute
class should contain \"" + value + "\"");
}
@Test
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-10-19
07:05:14 UTC (rev 22820)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-10-19
08:40:18 UTC (rev 22821)
@@ -36,6 +36,7 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import static
org.richfaces.tests.metamer.ftest.attributes.AttributeList.basicAttributes;
import static org.richfaces.tests.metamer.ftest.richTreeNode.TreeNodeAttributes.*;
import java.net.URL;
@@ -44,6 +45,7 @@
import org.jboss.test.selenium.dom.Event;
import org.jboss.test.selenium.geometry.Point;
+import org.jboss.test.selenium.locator.Attribute;
import org.jboss.test.selenium.locator.AttributeLocator;
import org.jboss.test.selenium.locator.ElementLocator;
import org.jboss.test.selenium.waiting.EventFiredCondition;
@@ -70,29 +72,29 @@
private static final String IMAGE_URL = "/resources/images/loading.gif";
Attributes<TreeAttributes> attributesTree = new
Attributes<TreeAttributes>(jq("span[id$=attributes:panel]"));
- Attributes<TreeNodeAttributes> attributes = new
Attributes<TreeNodeAttributes>(jq("span[id$=treeNode1Attributes:panel]"));
- Attributes<TreeNodeAttributes> attributesLeaf = new
Attributes<TreeNodeAttributes>(jq("span[id$=treeNode3Attributes:panel]"));
+ Attributes<TreeNodeAttributes> attributes = new
Attributes<TreeNodeAttributes>(
+ jq("span[id$=treeNode1Attributes:panel]"));
+ Attributes<TreeNodeAttributes> attributesLeaf = new
Attributes<TreeNodeAttributes>(
+ jq("span[id$=treeNode3Attributes:panel]"));
TreeModel tree = new TreeModel(pjq("div.rf-tr[id$=richTree]"));
TreeNodeModel treeNode = tree.getNode(1);
TreeNodeModel subTreeNode = treeNode.getNode(1);
TreeNodeModel leaf = subTreeNode.getNode(1);
-
+
ElementLocator<?> iconImage = treeNode.getIcon();
AttributeLocator<?> imageSrc = iconImage.getAttribute(SRC);
AttributeRetriever retrieveImageSrc = retrieveAttribute.attributeLocator(imageSrc);
-
@Inject
@Use(empty = true)
Event event = CLICK;
- Event[] events = new Event[] {CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOUT,
- MOUSEOVER, MOUSEUP };
+ Event[] events = new Event[] { CLICK, DBLCLICK, MOUSEDOWN, MOUSEMOVE, MOUSEOUT,
MOUSEOVER, MOUSEUP };
@Inject
@Use(empty = true)
SwitchType toggleType;
- SwitchType[] toggleTypes = new SwitchType[] {SwitchType.ajax, SwitchType.server };
+ SwitchType[] toggleTypes = new SwitchType[] { SwitchType.ajax, SwitchType.server };
@BeforeMethod
public void init() {
@@ -261,12 +263,20 @@
@Test
public void testStyle() {
- super.testStyle(treeNode.getTreeNode());
+ final String value = "background-color: yellow; font-size: 1.5em;";
+ selenium.type(jq("input[id$=treeNode1Attributes:styleInput]"), value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr =
treeNode.getTreeNode().getAttribute(Attribute.STYLE);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute
style should contain \"" + value + "\"");
}
@Test
public void testStyleClass() {
- super.testStyleClass(treeNode.getTreeNode());
+ final String value = "metamer-ftest-class";
+ selenium.type(jq("input[id$=treeNode1Attributes:styleClassInput]"),
value);
+ selenium.waitForPageToLoad();
+ AttributeLocator<?> styleAttr =
treeNode.getTreeNode().getAttribute(Attribute.CLASS);
+ assertTrue(selenium.getAttribute(styleAttr).contains(value), "Attribute
class should contain \"" + value + "\"");
}
@Test
Show replies by date