[richfaces-svn-commits] JBoss Rich Faces SVN: r9689 - in trunk/test-applications/seleniumTest/src: main/webapp/pages/dataTable and 1 other directories.

Author: andrei_exadel Date: 2008-07-18 10:27:54 -0400 (Fri, 18 Jul 2008) New Revision: 9689 Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java Log: fix datatable test Modified: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java =================================================================== --- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java 2008-07-18 13:17:21 UTC (rev 9688) +++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/bean/DataTableBean.java 2008-07-18 14:27:54 UTC (rev 9689) @@ -34,6 +34,14 @@ init(); } + public void reset(ActionEvent event) { + rows = 20; + column = 3; + begin = 1; + end = 10; + init(); + } + public String getDate() { return new Date().toLocaleString(); } Modified: trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-07-18 13:17:21 UTC (rev 9688) +++ trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-07-18 14:27:54 UTC (rev 9689) @@ -65,7 +65,8 @@ </rich:columns> </rich:dataTable> <br/> - <a4j:commandLink value="Submit" id="submit" reRender="table, date"></a4j:commandLink> + <a4j:commandLink value="Submit" id="submit" reRender="table, date"></a4j:commandLink><br/> + <a4j:commandLink value="Reset" id="reset" actionListener="#{dataTableBean.reset}"></a4j:commandLink> </h:form> </ui:define> Modified: trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java =================================================================== --- trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java 2008-07-18 13:17:21 UTC (rev 9688) +++ trunk/test-applications/seleniumTest/src/test/java/org/richfaces/testng/DataTableTest.java 2008-07-18 14:27:54 UTC (rev 9689) @@ -1,5 +1,7 @@ package org.richfaces.testng; +import javax.faces.event.ActionEvent; + import org.ajax4jsf.template.Template; import org.richfaces.SeleniumTestBase; import org.testng.Assert; @@ -17,6 +19,9 @@ String parentId = getParentId() + "_form:"; String dataTableId = parentId + "table"; + + reset(parentId + "reset"); + reRenderForm(); writeStatus("Check columns count equals to 3 "); assertColumnsCount(3, dataTableId); @@ -47,7 +52,7 @@ insertInputValue(dataTableId, 19, getColumnId(dataTableId, 2), "777"); writeStatus("Rerender table"); - clickById("_form:submit"); + clickById(getParentId() + "_form:submit"); waitForAjaxCompletion(); writeStatus("Check values entered "); @@ -83,7 +88,7 @@ assertInputValue(dataTableId, 19, columnsId, "9"); writeStatus("Set columns count == 5, rows count == 10"); - changeColumnCount(10, 5, 0, 100); + changeColumnCount(getParentId(), 10, 5, 0, 100); writeStatus("Check columns count equals to 5 "); assertColumnsCount(5, dataTableId); @@ -132,14 +137,18 @@ assertInputValue(dataTableId, 2, columnsId, "2"); assertInputValue(dataTableId, 9, columnsId, "9"); - changeColumnCount(2, 5, 2, 2); + changeColumnCount(getParentId(),2, 5, 2, 2); assertColumnsCount(1, dataTableId); assertRowsCount(4, dataTableId); - changeColumnCount(10, 5, 10, 0); + changeColumnCount(getParentId(), 10, 5, 10, 0); assertRowsCount(0, dataTableId); } + + public void reset(String id) { + clickAjaxCommandAndWait(id); + } private String getColumnId(String tableId, int i) { String script = "$('" + tableId + "').rows[0].cells[" + String.valueOf(i) + "].id"; @@ -149,16 +158,16 @@ return id; } - private void changeColumnCount(int rows, int columns, int begin, int end) { - String script = "$('_controls:rows').value='" + String.valueOf(rows) + "';"; + private void changeColumnCount(String parentId, int rows, int columns, int begin, int end) { + String script = "$('"+parentId+"_controls:rows').value='" + String.valueOf(rows) + "';"; runScript(script); - script = "$('_controls:column').value='" + String.valueOf(columns) + "';"; + script = "$('"+parentId+"_controls:column').value='" + String.valueOf(columns) + "';"; runScript(script); - script = "$('_controls:begin').value='" + String.valueOf(begin) + "';"; + script = "$('"+parentId+"_controls:begin').value='" + String.valueOf(begin) + "';"; runScript(script); - script = "$('_controls:end').value='" + String.valueOf(end) + "';"; + script = "$('"+parentId+"_controls:end').value='" + String.valueOf(end) + "';"; runScript(script); - clickById("_controls:apply"); + clickById(parentId +"_controls:apply"); waitForAjaxCompletion(); }