Author: andrei_exadel Date: 2009-01-12 11:37:26 -0500 (Mon, 12 Jan 2009) New Revision: 12226 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java Log: RF-5546 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 2009-01-12 15:32:50 UTC (rev 12225) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2009-01-12 16:37:26 UTC (rev 12226) @@ -39,13 +39,19 @@ private String content; private String switchType = "server"; + + private String selectedTab; public RichPanelTestBean() { - value = ""; - value2 = 0; - rendered = true; - content = "content"; + reset(); } + + public void reset() { + value = ""; + value2 = 0; + rendered = true; + content = "content"; + } /** * Gets value of switchType field. @@ -201,4 +207,20 @@ rendered = true; content = "content"; } + + /** + * @return the selectedTab + */ + public String getSelectedTab() { + return selectedTab; + } + + /** + * @param selectedTab the selectedTab to set + */ + public void setSelectedTab(String selectedTab) { + this.selectedTab = selectedTab; + } + + } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelTest.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-12 15:32:50 UTC (rev 12225) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-12 16:37:26 UTC (rev 12226) @@ -28,63 +28,47 @@ import com.thoughtworks.selenium.SeleniumException; public class TabPanelTest extends SeleniumTestBase { + + static final String RESET_METHOD = "#{panelBean.reset}"; @Test public void testRichTabPanelComponent(Template template) { - renderPage(template); + renderPage(template, RESET_METHOD); String parentId = getParentId() + "_form:"; String linkId = parentId + "tab2_lbl"; String tabId1 = parentId + "tab1"; String tabId2 = parentId + "tab2"; String tabId4 = parentId + "tab4"; String inputId = parentId + "_value"; - String outputId = parentId + "_value2"; + //String outputId = parentId + "_value2"; - writeStatus("Click on tab1"); + writeStatus("Click on tab2"); clickById(linkId); waitForAjaxCompletion(); AssertValueEquals(inputId, "tab2"); - AssertTextEquals(outputId, "2"); - Assert.assertTrue(isVisibleById(tabId2)); - Assert.assertFalse(isVisibleById(tabId4)); - try { - getTextById(tabId1); - Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); - } catch (SeleniumException se) { - - } - - writeStatus("Click on tab2"); + AssertTextEquals(tabId2, "Tab two"); + AssertVisible(tabId2); + AssertNotVisible(tabId4); + + writeStatus("Click on tab1"); linkId = parentId + "tab1_lbl"; clickCommandAndWait(linkId); AssertValueEquals(inputId, "tab1"); - AssertTextEquals(outputId, "1"); - Assert.assertTrue(isVisibleById(tabId1)); - Assert.assertFalse(isVisibleById(tabId4)); - try { - getTextById(tabId2); - Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); - } catch (SeleniumException se) { - - } - + AssertTextEquals(tabId1, "Tab one"); + AssertVisible(tabId1); + AssertNotVisible(tabId4); + writeStatus("Click on tab3"); linkId = parentId + "tab3_lbl"; clickById(linkId); AssertValueEquals(inputId, "tab1"); - Assert.assertTrue(isVisibleById(tabId1)); + AssertVisible(tabId1); writeStatus("Click on tab4"); linkId = parentId + "tab4_lbl"; clickById(linkId); - Assert.assertTrue(isVisibleById(tabId4)); - Assert.assertFalse(isVisibleById(tabId1)); - try { - getTextById(tabId2); - Assert.fail("Both of 'tab1' and 'tab2' tabs were rendered for tab panel."); - } catch (SeleniumException se) { - - } + AssertVisible(tabId4); + AssertNotVisible(tabId1); } @Override