Author: dsvyatobatsko Date: 2008-10-10 10:52:46 -0400 (Fri, 10 Oct 2008) New Revision: 10719 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java Log: PanelMenu: test selectedChild attribute is read on rendering and updated on form submit Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2008-10-10 12:49:06 UTC (rev 10718) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2008-10-10 14:52:46 UTC (rev 10719) @@ -34,14 +34,11 @@ private String itemAction; - private String selectedChild; - private boolean rendered; public RichPanelTestBean() { value = ""; value2 = 0; - selectedChild = "Group1"; rendered = true; } @@ -97,22 +94,6 @@ } /** - * Gets value of selectedChild field. - * @return value of selectedChild field - */ - public String getSelectedChild() { - return selectedChild; - } - - /** - * Set a new value for selectedChild field. - * @param selectedChild a new value for selectedChild field - */ - public void setSelectedChild(String selectedChild) { - this.selectedChild = selectedChild; - } - - /** * Gets value of rendered field. * @return value of rendered field */ @@ -152,16 +133,6 @@ return null; } - public void switchSelectedChild() { - if("Group1".equals(selectedChild)) { - selectedChild = "Group2"; - } else if("Group2".equals(selectedChild)) { - selectedChild = "Group3"; - } else { - selectedChild = "Group1"; - } - } - public void hide() { rendered = false; } @@ -172,7 +143,6 @@ panelValue = null; panelValue2 = null; itemAction = ""; - selectedChild = "Group1"; rendered = true; } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/panelMenu/panelMenuTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java 2008-10-10 12:49:06 UTC (rev 10718) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PanelMenuTest.java 2008-10-10 14:52:46 UTC (rev 10719) @@ -9,6 +9,8 @@ private final static String RESET_METHOD_NAME = "#{panelBean.cleanValues}"; + private final static String[] ITEM_HIGHLIGHTS = {"dr-pmenu-selected-item", "rich-pmenu-selected-element"}; + @Test public void testPanelMenuClientAPI(Template template) { renderPage(template, RESET_METHOD_NAME); @@ -304,6 +306,31 @@ assertClassNames(menuItemId, new String[] { "itemClass" }, "itemClass attribute was not output to client", true); } + @Test + public void testSelectedChildAttributeIsReadOnRenderingAndUpdatedOnFormSubmit(Template template) { + renderPage(template, RESET_METHOD_NAME); + + writeStatus("Check selectedChild attribute is read on rendering and updated on form submit"); + + String parentId = getParentId() + "row__form3:"; + assertClassNames(parentId + "pGroup2_selected", ITEM_HIGHLIGHTS, "Group 2 must be highlighted", true); + + writeStatus("Click group 1"); + String group1 = parentId + "pGroup1_selected"; + clickById(group1); + assertClassNames(group1, ITEM_HIGHLIGHTS, "Group 1 must be highlighted", true); + + writeStatus("Click group 1.1"); + String group11 = parentId + "pGroup11_selected"; + clickById(group11); + assertClassNames(group11, ITEM_HIGHLIGHTS, "Group 1.1 must be highlighted", true); + + writeStatus("Click item 1.1 Submit is being initiated"); + String item11 = parentId + "pItem11_selected"; + clickCommandAndWait(item11); + assertClassNames(item11, ITEM_HIGHLIGHTS, "Item 1.1 must be highlighted", true); + } + /** * Test an icon. *