June 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22537 - modules/tests/metamer/trunk/application.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-06-30 10:08:03 -0400 (Thu, 30 Jun 2011) New Revision: 22537 Modified: modules/tests/metamer/trunk/application/pom.xml Log: jstl dependency updated Modified: modules/tests/metamer/trunk/application/pom.xml =================================================================== --- modules/tests/metamer/trunk/application/pom.xml 2011-06-30 08:38:31 UTC (rev 22536) +++ modules/tests/metamer/trunk/application/pom.xml 2011-06-30 14:08:03 UTC (rev 22537) @@ -77,8 +77,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>jstl-api</artifactId> </dependency> <dependency>

13 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r22536 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-30 04:38:31 -0400 (Thu, 30 Jun 2011) New Revision: 22536 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java Log: Fix wrong locator Wrong locator for output field caused failing test testAllInputsCorrect Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java 2011-06-30 08:38:04 UTC (rev 22535) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java 2011-06-30 08:38:31 UTC (rev 22536) @@ -58,10 +58,10 @@ private static final String STRING_SIZE_ID = "input3"; private static final String CUSTOM_STRING_ID = "input4"; - private static final String OUT_NOT_EMPTY_ID = "input1"; - private static final String OUT_REG_EXP_PATTERN_ID = "input2"; - private static final String OUT_STRING_SIZE_ID = "input3"; - private static final String OUT_CUSTOM_STRING_ID = "input4"; + private static final String OUT_NOT_EMPTY_ID = "output1"; + private static final String OUT_REG_EXP_PATTERN_ID = "output2"; + private static final String OUT_STRING_SIZE_ID = "output3"; + private static final String OUT_CUSTOM_STRING_ID = "output4"; private JQueryLocator selectFormat = jq("div[id$={0}Items]");

13 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r22535 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-30 04:38:04 -0400 (Thu, 30 Jun 2011) New Revision: 22535 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java Log: Add issue tracking to dynamic tab creating tests. These tests are failing due to reported issue. Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-29 14:33:06 UTC (rev 22534) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-30 08:38:04 UTC (rev 22535) @@ -31,6 +31,7 @@ import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.testng.annotations.Test; /** @@ -157,6 +158,7 @@ */ @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11081") public void testSwitchTypeNull() { verifyCreateTab(hCreateTabBtn); @@ -170,6 +172,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11081") public void testSwitchTypeAjax() { verifyCreateTab(hCreateTabBtn); @@ -197,6 +200,7 @@ } @Test + @IssueTracking("https://issues.jboss.org/browse/RF-11054") public void testSwitchTypeServer() { verifyCreateTab(hCreateTabBtn);

13 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r22534 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: richInplaceInput and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ppitonak(a)redhat.com Date: 2011-06-29 10:33:06 -0400 (Wed, 29 Jun 2011) New Revision: 22534 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestComponentWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestInplaceInputWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestInplaceSelectWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestSelectsWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java Log: added svn keyword Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestAutocompleteWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAutocomplete/TestComponentWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestInplaceInputWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestInplaceSelectWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestSelectsWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSliderWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinnerWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect ___________________________________________________________________ Added: svn:ignore + .TestSelectsWithJSR303.java.swp Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestSelectsWithJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel ___________________________________________________________________ Added: svn:ignore + .TestRichTabPanelAddPanel1.java.swp Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/AbstractValidatorsTest.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsCSV.java ___________________________________________________________________ Added: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richValidator/TestValidatorsJSR303.java ___________________________________________________________________ Added: svn:keywords + Revision

13 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r22533 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-22 17:18:32 -0400 (Wed, 22 Jun 2011) New Revision: 22533 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java Log: Fixed test for dynamicaly created tabs switching. The request for tab switch is really HTTP request when tabSwitchType is "server". Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-22 21:18:13 UTC (rev 22532) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-22 21:18:32 UTC (rev 22533) @@ -22,6 +22,7 @@ package org.richfaces.tests.metamer.ftest.richTabPanel; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; @@ -205,7 +206,7 @@ for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) { final int index = i; - guardNoRequest(selenium).click(inactiveHeadersFormat.format(index + 1)); + guardHttp(selenium).click(inactiveHeadersFormat.format(index + 1)); waitGui.failWith("Tab " + (index + 1) + " is not displayed.") .until(isDisplayed.locator(itemContentsFormat.format(index + 1))); }

13 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r22532 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-22 17:18:13 -0400 (Wed, 22 Jun 2011) New Revision: 22532 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java Log: Fix tests for tab activation. There was wrong condition for activeItem evaluation. When active tab is tab5, then change active tab to tab4 which is disabled, there tab1 get active instead of leave last (tab5) active Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-06-22 21:17:55 UTC (rev 22531) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-06-22 21:18:13 UTC (rev 22532) @@ -125,12 +125,12 @@ selenium.type(pjq("input[type=text][id$=activeItemInput]"), "tab4"); selenium.waitForPageToLoad(); - for (int i = 0; i < 5; i++) { + for (int i = 1; i < 5; i++) { displayed = selenium.isDisplayed(activeHeaders[i]); assertFalse(displayed, "Tab" + (i + 1) + "'s header should not be active."); } - for (int i = 0; i < 5; i++) { + for (int i = 1; i < 5; i++) { displayed = selenium.isDisplayed(items[i]); assertFalse(displayed, "Tab" + (i + 1) + "'s content should not be visible."); }

13 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r22531 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-22 17:17:55 -0400 (Wed, 22 Jun 2011) New Revision: 22531 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java Log: Fixed incorrect token 'X' added to phase logger. Many tests expects exact string in phase logger according to action performed. This token was breaking many tests. Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-06-13 15:23:08 UTC (rev 22530) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-06-22 21:17:55 UTC (rev 22531) @@ -404,7 +404,7 @@ * an event representing the activation of a user interface component */ public void itemChangeListener(ItemChangeEvent event) { - logToPage("* item changedX: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> " + logToPage("* item changed: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> " + (event.getNewItem() != null ? event.getNewItem().getId() : null)); }

13 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r22530 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-13 11:23:08 -0400 (Mon, 13 Jun 2011) New Revision: 22530 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java Log: Add test for remove dynamicaly created tab Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-13 07:14:29 UTC (rev 22529) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-13 15:23:08 UTC (rev 22530) @@ -27,6 +27,7 @@ import java.net.URL; +import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.testng.annotations.Test; @@ -57,11 +58,17 @@ private JQueryLocator switchTypeFormat = pjq("input[name$=switchTypeInput][value={0}]"); + private JQueryLocator tabCloseFormat = pjq("td[id$=tab{0}:header:inactive] span.rf-tab-lbl > a"); + @Override public URL getTestUrl() { return buildUrl(contextPath, "faces/components/richTabPanel/addTab2.xhtml"); } + /** + * Simple create new tab (without tab switch) + * @param addTabBtn + */ private void verifyCreateTab(JQueryLocator addTabBtn) { int baseTabsCount = selenium.getCount(tabsCount); @@ -70,9 +77,27 @@ for (int i = 1; i <= MAX_NEW_TAB_COUNT; ++i) { selenium.click(addTabBtn); waitGui.until(countEquals.count(baseTabsCount + i).locator(tabsCount)); - } + } } + /** + * Simple test to tab delete. Create 3 new tabs and then delete them. + * Without tab switch. + */ + private void verifyDeleteTab() { + verifyCreateTab(a4jCreateTabBtn); + + int baseTabsCount = selenium.getCount(tabsCount); + System.out.println(baseTabsCount); + for (int i = 0; i < MAX_NEW_TAB_COUNT; ++i) { + waitGui.until(elementPresent.locator(inactiveHeadersFormat.format( + STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - i))); + selenium.fireEvent(tabCloseFormat.format(STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - i), Event.CLICK); + System.out.println(selenium.getCount(tabsCount)); + waitGui.until(countEquals.count(baseTabsCount - 1 - i).locator(tabsCount)); + } + } + private void verifyContentOfNewTab(JQueryLocator addTabBtn) { verifyCreateTab(addTabBtn); @@ -108,6 +133,14 @@ } /** + * Delete newly created tabs + */ + @Test + public void testRemoveTab() { + verifyDeleteTab(); + } + + /** * Verify that all tabs displays correct content when switch tab */ @Test

13 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r22529 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-13 03:14:29 -0400 (Mon, 13 Jun 2011) New Revision: 22529 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java Log: Update selenium tests for dynamic tab creating. Now should tests fit current state: tests fails only on not working features. Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-06 22:02:56 UTC (rev 22528) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanelAddPanel1.java 2011-06-13 07:14:29 UTC (rev 22529) @@ -24,8 +24,6 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; import java.net.URL; @@ -40,79 +38,83 @@ * @version $Revision$ */ public class TestRichTabPanelAddPanel1 extends AbstractMetamerTest { - - private JQueryLocator panel = pjq("div[id$=tabPanel]"); - private JQueryLocator[] items = {pjq("div[id$=tab1]"), pjq("div[id$=tab2]"), pjq("div[id$=tab3]"), pjq("div[id$=tab4]"), - pjq("div[id$=tab5]")}; - private JQueryLocator[] itemContents = {pjq("div[id$=tab1] > div.rf-tab-cnt"), pjq("div[id$=tab2] > div.rf-tab-cnt"), - pjq("div[id$=tab3] > div.rf-tab-cnt"), pjq("div[id$=tab4] > div.rf-tab-cnt"), pjq("div[id$=tab5] > div.rf-tab-cnt"), - pjq("div[id$=tab6] > div.rf-tab-cnt"), pjq("div[id$=tab7] > div.rf-tab-cnt"), pjq("div[id$=tab8] > div.rf-tab-cnt")}; - private JQueryLocator[] activeHeaders = {pjq("td[id$=tab1:header:active]"), pjq("td[id$=tab2:header:active]"), - pjq("td[id$=tab3:header:active]"), pjq("td[id$=tab4:header:active]"), pjq("td[id$=tab5:header:active]")}; - private JQueryLocator[] inactiveHeaders = {pjq("td[id$=tab1:header:inactive]"), pjq("td[id$=tab2:header:inactive]"), - pjq("td[id$=tab3:header:inactive]"), pjq("td[id$=tab4:header:inactive]"), pjq("td[id$=tab5:header:inactive]"), - pjq("td[id$=tab6:header:inactive]"), pjq("td[id$=tab7:header:inactive]"), pjq("td[id$=tab8:header:inactive]") }; - private JQueryLocator[] disabledHeaders = {pjq("td[id$=tab1:header:disabled]"), pjq("td[id$=tab2:header:disabled]"), - pjq("td[id$=tab3:header:disabled]"), pjq("td[id$=tab4:header:disabled]"), pjq("td[id$=tab5:header:disabled]")}; + private static final String SWITCH_TYPE_CLIENT = "client"; + private static final String SWITCH_TYPE_SERVER = "server"; + private static final String SWITCH_TYPE_AJAX = "ajax"; + + private static final int MAX_NEW_TAB_COUNT = 3; + private static final int STATIC_TAB_COUNT = 5; + + private JQueryLocator itemContentsFormat = pjq("div[id$=tab{0}:content]"); + + private JQueryLocator inactiveHeadersFormat = pjq("td[id$=tab{0}:header:inactive]"); + private JQueryLocator hCreateTabBtn = pjq("input[id$=hCreateTabButton]"); - private JQueryLocator aa4jCreateTabBtn = pjq("input[id$=a4jCreateTabButton]"); + private JQueryLocator a4jCreateTabBtn = pjq("input[id$=a4jCreateTabButton]"); private JQueryLocator tabsCount = pjq("table.rf-tab-hdr-tabs td.rf-tab-hdr-inact"); - + + private JQueryLocator switchTypeFormat = pjq("input[name$=switchTypeInput][value={0}]"); + @Override public URL getTestUrl() { - return buildUrl(contextPath, "faces/components/richTabPanel/addTab.xhtml"); + return buildUrl(contextPath, "faces/components/richTabPanel/addTab2.xhtml"); } - - @Test - public void testInit() { - boolean displayed = selenium.isDisplayed(panel); - assertTrue(displayed, "Tab panel is not present on the page."); - - displayed = selenium.isDisplayed(activeHeaders[0]); - assertTrue(displayed, "Header of tab1 should be active."); - for (int i = 1; i < 5; i++) { - displayed = selenium.isDisplayed(activeHeaders[i]); - assertFalse(displayed, "Header of tab " + (i + 1) + " should not be active."); - } - - displayed = selenium.isDisplayed(inactiveHeaders[0]); - assertFalse(displayed, "Header of tab1 should not be inactive."); - displayed = selenium.isDisplayed(inactiveHeaders[1]); - assertTrue(displayed, "Header of tab2 should be inactive."); - - displayed = selenium.isDisplayed(disabledHeaders[3]); - assertTrue(displayed, "Header of tab4 should be disabled."); - for (int i = 0; i < 3; i++) { - displayed = selenium.isDisplayed(disabledHeaders[i]); - assertFalse(displayed, "Header of tab " + (i + 1) + " should not be disabled."); - } - - displayed = selenium.isDisplayed(itemContents[0]); - assertTrue(displayed, "Content of item1 should be visible."); - - for (int i = 1; i < 5; i++) { - displayed = selenium.isDisplayed(items[i]); - assertFalse(displayed, "Tab" + (i + 1) + "'s content should not be visible."); - } - } - @Test(dependsOnMethods = {"testInit"}) - public void testCreateTab() { - selenium.click(pjq("input[name$=switchTypeInput][value=client]")); - selenium.waitForPageToLoad(); + private void verifyCreateTab(JQueryLocator addTabBtn) { int baseTabsCount = selenium.getCount(tabsCount); // add 3 new tabs - for (int i=1; i<4; ++i){ - selenium.click(hCreateTabBtn); - selenium.waitForPageToLoad(); + for (int i = 1; i <= MAX_NEW_TAB_COUNT; ++i) { + selenium.click(addTabBtn); waitGui.until(countEquals.count(baseTabsCount + i).locator(tabsCount)); + } + } + + private void verifyContentOfNewTab(JQueryLocator addTabBtn) { + + verifyCreateTab(addTabBtn); + + // tab switch work at least with "client" option + selenium.click(switchTypeFormat.format(SWITCH_TYPE_CLIENT)); + + System.out.println("testSwitchTypeAjax: tab count: " + selenium.getCount(tabsCount)); + + for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) { + selenium.click(inactiveHeadersFormat.format(i + 1)); + waitGui.failWith("Tab " + (i + 1) + " doesn't display correct content.") + .until(textEquals.text("Content of dynamicaly created tab" + (i + 1)) + .locator(itemContentsFormat.format(i + 1))); } } + + /** + * Create new tab by clicking on h:commandButton + */ + @Test + public void testCreateTabJSF() { + verifyCreateTab(hCreateTabBtn); + } + + /** + * Create new tab by clicking on a4j:commandButton + */ + @Test + public void testCreateTabAjax() { + verifyCreateTab(a4jCreateTabBtn); + } + + /** + * Verify that all tabs displays correct content when switch tab + */ + @Test + public void testContentOfDynamicTab() { + verifyContentOfNewTab(hCreateTabBtn); + } + /* * Test plan: * 1. click on 'create tab' btn 3 time and verify that new tabs appeared @@ -120,32 +122,60 @@ * 3. verify a4j ajax btn to create new tabs */ + @Test public void testSwitchTypeNull() { - for (int i = 7; i >= 5; i--) { + + verifyCreateTab(hCreateTabBtn); + + for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) { final int index = i; - guardXhr(selenium).click(inactiveHeaders[index]); - waitGui.failWith("Tab " + (index + 1) + " is not displayed.").until(isDisplayed.locator(itemContents[index])); + guardXhr(selenium).click(inactiveHeadersFormat.format(index + 1)); + waitGui.failWith("Tab " + (index + 1) + " is not displayed.") + .until(isDisplayed.locator(itemContentsFormat.format(index + 1))); } } - @Test(dependsOnMethods = {"testCreateTab"}) + @Test public void testSwitchTypeAjax() { - selenium.click(pjq("input[name$=switchTypeInput][value=ajax]")); + + verifyCreateTab(hCreateTabBtn); + + selenium.click(switchTypeFormat.format(SWITCH_TYPE_AJAX)); selenium.waitForPageToLoad(); testSwitchTypeNull(); } - @Test(dependsOnMethods = {"testCreateTab"}) + @Test public void testSwitchTypeClient() { - selenium.click(pjq("input[name$=switchTypeInput][value=client]")); + + verifyCreateTab(hCreateTabBtn); + + selenium.click(switchTypeFormat.format(SWITCH_TYPE_CLIENT)); selenium.waitForPageToLoad(); - - for (int i = 7; i >= 5; i--) { + + for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) { final int index = i; - guardNoRequest(selenium).click(inactiveHeaders[index]); - waitGui.failWith("Tab " + (index + 1) + " is not displayed.").until(isDisplayed.locator(itemContents[index])); + guardNoRequest(selenium).click(inactiveHeadersFormat.format(index + 1)); + waitGui.failWith("Tab " + (index + 1) + " is not displayed.") + .until(isDisplayed.locator(itemContentsFormat.format(index + 1))); } } + + @Test + public void testSwitchTypeServer() { + + verifyCreateTab(hCreateTabBtn); + + selenium.click(switchTypeFormat.format(SWITCH_TYPE_SERVER)); + selenium.waitForPageToLoad(); + + for (int i = STATIC_TAB_COUNT + MAX_NEW_TAB_COUNT - 1; i >= STATIC_TAB_COUNT; i--) { + final int index = i; + guardNoRequest(selenium).click(inactiveHeadersFormat.format(index + 1)); + waitGui.failWith("Tab " + (index + 1) + " is not displayed.") + .until(isDisplayed.locator(itemContentsFormat.format(index + 1))); + } + } }

13 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r22528 - modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean.

by richfaces-svn-commits＠lists.jboss.org

Author: jjamrich Date: 2011-06-06 18:02:56 -0400 (Mon, 06 Jun 2011) New Revision: 22528 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java Log: Fix issue with itemChangeEvent listener During investigation issue on tabPanel appeared null events. Sanitized log for this cases. Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-06-06 22:02:38 UTC (rev 22527) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2011-06-06 22:02:56 UTC (rev 22528) @@ -404,8 +404,8 @@ * an event representing the activation of a user interface component */ public void itemChangeListener(ItemChangeEvent event) { - logToPage("* item changed: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> " - + event.getNewItem().getId()); + logToPage("* item changedX: " + (event.getOldItem() == null ? null : event.getOldItem().getId()) + " -> " + + (event.getNewItem() != null ? event.getNewItem().getId() : null)); } /**

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2011