Author: lfryc(a)redhat.com Date: 2011-01-19 04:50:52 -0500 (Wed, 19 Jan 2011) New Revision: 21071 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml Log: rich:tree - sample cleaning before automation Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-01-19 09:49:59 UTC (rev 21070) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-01-19 09:50:52 UTC (rev 21071) @@ -80,21 +80,13 @@ attributes.get("toggleType").setValue("ajax"); attributes.get("selectionType").setValue("ajax"); - // FIXME attributes not in taglib - attributes.setAttribute("iconLeaf", null); - attributes.setAttribute("iconExpanded", null); - attributes.setAttribute("iconCollapsed", null); - attributes.setAttribute("handleClass", null); - attributes.setAttribute("iconClass", null); - attributes.setAttribute("labelClass", null); - attributes.setAttribute("nodeClass", null); - attributes.setAttribute("execute", null); - attributes.setAttribute("render", null); - attributes.setAttribute("toggleNodeEvent", null); - - // hidden attributes + // attributes which needs to be tested another way attributes.remove("selectionChangeListener"); attributes.remove("toggleListener"); + attributes.remove("value"); + attributes.remove("var"); + attributes.remove("rowKeyVar"); + attributes.remove("stateVar"); for (CompactDiscXmlDescriptor descriptor : model.getCompactDiscs()) { createCompactDisc(descriptor); Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2011-01-19 09:49:59 UTC (rev 21070) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeNodeBean.java 2011-01-19 09:50:52 UTC (rev 21071) @@ -54,17 +54,10 @@ for (int i = 0; i < attributes.length; i++) { attributes[i] = Attributes.getComponentAttributesFromFacesConfig(UITreeNode.class, getClass()); - - attributes[i].get("rendered").setValue(true); - - // FIXME attributes not in taglib - attributes[i].setAttribute("iconLeaf", null); - attributes[i].setAttribute("iconExpanded", null); - attributes[i].setAttribute("iconCollapsed", null); - attributes[i].setAttribute("handleClass", null); - attributes[i].setAttribute("iconClass", null); - attributes[i].setAttribute("labelClass", null); + + // attributes which needs to be tested another way + attributes[i].remove("type"); } } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-01-19 09:49:59 UTC (rev 21070) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-01-19 09:50:52 UTC (rev 21071) @@ -244,7 +244,7 @@ <metamer:attributes value="#{richTreeBean.attributes}" id="attributes" /> </fieldset> <fieldset> - <legend>rich:treeNode type="company"</legend> + <legend>rich:treeNode type="country"</legend> <metamer:attributes value="#{richTreeNodeBean.attributes[0]}" id="treeNode1Attributes" /> </fieldset> <fieldset>