Author: konstantin.mishin
Date: 2009-01-29 11:21:20 -0500 (Thu, 29 Jan 2009)
New Revision: 12495
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java
Log:
RF-5681
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java 2009-01-29
16:09:10 UTC (rev 12494)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/DataGridBean.java 2009-01-29
16:21:20 UTC (rev 12495)
@@ -55,6 +55,7 @@
private int elements;
private String trace;
private Set<Integer> ajaxKeys;
+ private Boolean rendered;
public DataGridBean() {
init();
@@ -73,6 +74,7 @@
ajaxKeys.add(i);
}
}
+ rendered = true;
}
public void submit(ActionEvent event) {
@@ -123,4 +125,12 @@
public Set<Integer> getAjaxKeys() {
return ajaxKeys;
}
+
+ public void setRendered(Boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public Boolean getRendered() {
+ return rendered;
+ }
}
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-29
16:09:10 UTC (rev 12494)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dataGrid/dataGrid.xhtml 2009-01-29
16:21:20 UTC (rev 12495)
@@ -11,37 +11,36 @@
<h:form id="attrForm">
<h:outputText value="elements" />
<h:inputText id="elements" value="#{dataGrid.elements}">
- <a4j:support event="onchange" reRender="dataGrid"/>
+ <a4j:support event="onchange" reRender="panelGroup"/>
</h:inputText>
- <!--h:outputText value="includedNode" />
- <h:selectBooleanCheckbox id="includedNode"
value="#{treeNodesAdaptor.includedNode}">
- <a4j:support event="onchange" reRender="tree"/>
+ <h:outputText value="rendered" />
+ <h:selectBooleanCheckbox id="rendered"
value="#{dataGrid.rendered}">
+ <a4j:support event="onchange" reRender="panelGroup"/>
</h:selectBooleanCheckbox>
- <h:outputText value="includedRoot" />
- <h:selectBooleanCheckbox id="includedRoot"
value="#{treeNodesAdaptor.includedRoot}">
- <a4j:support event="onchange" reRender="tree"/>
- </h:selectBooleanCheckbox-->
</h:form>
<h:form id="mainForm">
- <rich:dataGrid id="dataGrid" value="#{dataGrid.model}"
var="element"
- elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}"
- stateVar="stateVar" rowKeyVar="rowKeyVar"
- componentState="#{componentState}">
- <h:panelGroup>
- <h:outputText id="rowKeyVar" value="#{rowKeyVar}
"></h:outputText>
- <h:outputText id="first" value="#{stateVar.range.firstRow}
"></h:outputText>
- <h:outputText id="rows" value="#{stateVar.range.rows}
"></h:outputText>
- <h:outputText id="firstState"
value="#{componentState.range.firstRow} "></h:outputText>
- <h:outputText id="rowsState" value="#{componentState.range.rows}
"></h:outputText>
- <h:outputText value="#{element.cell1}"></h:outputText>
- <h:inputText id="inputText" value="#{element.cell2}"
validator="#{dataGrid.validate}"></h:inputText>
- <h:outputText value="#{element.cell3}"></h:outputText>
- <h:commandButton id="submit" value="submit"
actionListener="#{dataGrid.submit}"></h:commandButton>
- <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit"
actionListener="#{dataGrid.submit}"></a4j:commandButton>
- <a4j:commandButton id="ajaxSingleSubmit"
value="ajaxSingleSubmit" actionListener="#{dataGrid.submit}"
ajaxSingle="true"></a4j:commandButton>
- </h:panelGroup>
- </rich:dataGrid>
- <a4j:commandButton id="reRender" value="reRender"
reRender="inputText"
actionListener="#{dataGrid.reRender}"></a4j:commandButton>
+ <h:panelGroup id="panelGroup">
+ <rich:dataGrid id="dataGrid" value="#{dataGrid.model}"
var="element"
+ elements="#{dataGrid.elements}" ajaxKeys="#{dataGrid.ajaxKeys}"
+ stateVar="stateVar" rowKeyVar="rowKeyVar"
+ componentState="#{componentState}"
+ rendered="#{dataGrid.rendered}">
+ <h:panelGroup>
+ <h:outputText id="rowKeyVar" value="#{rowKeyVar}
"></h:outputText>
+ <h:outputText id="first" value="#{stateVar.range.firstRow}
"></h:outputText>
+ <h:outputText id="rows" value="#{stateVar.range.rows}
"></h:outputText>
+ <h:outputText id="firstState"
value="#{componentState.range.firstRow} "></h:outputText>
+ <h:outputText id="rowsState" value="#{componentState.range.rows}
"></h:outputText>
+ <h:outputText value="#{element.cell1}"></h:outputText>
+ <h:inputText id="inputText" value="#{element.cell2}"
validator="#{dataGrid.validate}"></h:inputText>
+ <h:outputText value="#{element.cell3}"></h:outputText>
+ <h:commandButton id="submit" value="submit"
actionListener="#{dataGrid.submit}"></h:commandButton>
+ <a4j:commandButton id="ajaxSubmit" value="ajaxSubmit"
actionListener="#{dataGrid.submit}"></a4j:commandButton>
+ <a4j:commandButton id="ajaxSingleSubmit"
value="ajaxSingleSubmit" actionListener="#{dataGrid.submit}"
ajaxSingle="true"></a4j:commandButton>
+ </h:panelGroup>
+ </rich:dataGrid>
+ <a4j:commandButton id="reRender" value="reRender"
reRender="inputText"
actionListener="#{dataGrid.reRender}"></a4j:commandButton>
+ </h:panelGroup>
</h:form>
<a4j:outputPanel ajaxRendered="true">
<h:outputText id="outputText"
value="#{dataGrid.trace}"></h:outputText>
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-29
16:09:10 UTC (rev 12494)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DataGridTest.java 2009-01-29
16:21:20 UTC (rev 12495)
@@ -11,6 +11,8 @@
private String elements;
+ private String rendered;
+
private String dataGrid;
private String reRender;
@@ -23,6 +25,7 @@
renderPage(null, template, "#{dataGrid.init}");
String attrForm = getParentId() + "attrForm";
elements = attrForm + ":elements";
+ rendered = attrForm + ":rendered";
String mainForm = getParentId() + "mainForm";
dataGrid = mainForm + ":dataGrid";
reRender = mainForm + ":reRender";
@@ -109,6 +112,17 @@
Assert.assertEquals(selenium.getText(dataGrid + ":2:rowsState"),
"0", "Attribute 'componentState' works wrong.");
}
+ /**
+ * component with rendered = false is not present on the page
+ */
+ @Test
+ public void testRendered(Template template) {
+ init(template);
+ Assert.assertTrue(selenium.isElementPresent(dataGrid));
+ clickAjaxCommandAndWait(rendered);
+ Assert.assertFalse(selenium.isElementPresent(dataGrid));
+ }
+
private void chekStructure(int ... notEqualRows) {
String dataTableRowLocator = "id('"+ dataTable +
"')/tbody/tr";
int count = selenium.getXpathCount(dataTableRowLocator).intValue();
Show replies by date