Author: ppitonak(a)redhat.com Date: 2011-02-16 12:42:52 -0500 (Wed, 16 Feb 2011) New Revision: 21710 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 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/richTogglePanel/TestRichTogglePanel.java Log: removed hidden attributes from panels removed tests for hidden attributes Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichAccordionBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -62,12 +62,6 @@ // will be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); - } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsiblePanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -63,9 +63,6 @@ // will be tested in another way attributes.remove("converter"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbegin", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTabPanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -61,11 +61,6 @@ // will be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTogglePanelBean.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -62,11 +62,6 @@ // will to be tested in another way attributes.remove("converter"); attributes.remove("itemChangeListener"); - - // TODO remove as soon as it is added to taglib RF-10310 - attributes.setAttribute("onbeforedomupdate", null); - attributes.setAttribute("onbegin", null); - attributes.setAttribute("oncomplete", null); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,9 +44,7 @@ activeItem="#{richAccordionBean.attributes['activeItem'].value}" bypassUpdates="#{richAccordionBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}" - data="#{richAccordionBean.attributes['data'].value}" dir="#{richAccordionBean.attributes['dir'].value}" - execute="#{richAccordionBean.attributes['execute'].value}" height="#{richAccordionBean.attributes['height'].value}" immediate="#{richAccordionBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" @@ -62,12 +60,8 @@ itemInactiveLeftIcon="#{richAccordionBean.attributes['itemInactiveLeftIcon'].value}" itemInactiveRightIcon="#{richAccordionBean.attributes['itemInactiveRightIcon'].value}" lang="#{richAccordionBean.attributes['lang'].value}" - limitRender="#{richAccordionBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richAccordionBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richAccordionBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richAccordionBean.attributes['onbegin'].value}" onclick="#{richAccordionBean.attributes['onclick'].value}" - oncomplete="#{richAccordionBean.attributes['oncomplete'].value}" ondblclick="#{richAccordionBean.attributes['ondblclick'].value}" onitemchange="#{richAccordionBean.attributes['onitemchange'].value}" onmousedown="#{richAccordionBean.attributes['onmousedown'].value}" @@ -75,9 +69,7 @@ onmouseout="#{richAccordionBean.attributes['onmouseout'].value}" onmouseover="#{richAccordionBean.attributes['onmouseover'].value}" onmouseup="#{richAccordionBean.attributes['onmouseup'].value}" - render="#{richAccordionBean.attributes['render'].value}" rendered="#{richAccordionBean.attributes['rendered'].value}" - status="#{richAccordionBean.attributes['status'].value}" style="#{richAccordionBean.attributes['style'].value}" styleClass="#{richAccordionBean.attributes['styleClass'].value}" switchType="#{richAccordionBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/facets.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -45,9 +45,7 @@ <rich:collapsiblePanel id="collapsiblePanel" bodyClass="#{richCollapsiblePanelBean.attributes['bodyClass'].value}" bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" - data="#{richCollapsiblePanelBean.attributes['data'].value}" dir="#{richCollapsiblePanelBean.attributes['dir'].value}" - execute="#{richCollapsiblePanelBean.attributes['execute'].value}" expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" @@ -55,12 +53,8 @@ lang="#{richCollapsiblePanelBean.attributes['lang'].value}" leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" - limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" - onbegin="#{richCollapsiblePanelBean.attributes['onbegin'].value}" onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}" - oncomplete="#{richCollapsiblePanelBean.attributes['oncomplete'].value}" ondblclick="#{richCollapsiblePanelBean.attributes['ondblclick'].value}" onmousedown="#{richCollapsiblePanelBean.attributes['onmousedown'].value}" onmousemove="#{richCollapsiblePanelBean.attributes['onmousemove'].value}" @@ -68,11 +62,9 @@ onmouseover="#{richCollapsiblePanelBean.attributes['onmouseover'].value}" onmouseup="#{richCollapsiblePanelBean.attributes['onmouseup'].value}" onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" - render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" - status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,9 +44,7 @@ <rich:collapsiblePanel id="collapsiblePanel" bodyClass="#{richCollapsiblePanelBean.attributes['bodyClass'].value}" bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" - data="#{richCollapsiblePanelBean.attributes['data'].value}" dir="#{richCollapsiblePanelBean.attributes['dir'].value}" - execute="#{richCollapsiblePanelBean.attributes['execute'].value}" expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" headerClass="#{richCollapsiblePanelBean.attributes['headerClass'].value}" @@ -54,12 +52,8 @@ lang="#{richCollapsiblePanelBean.attributes['lang'].value}" leftCollapsedIcon="#{richCollapsiblePanelBean.attributes['leftCollapsedIcon'].value}" leftExpandedIcon="#{richCollapsiblePanelBean.attributes['leftExpandedIcon'].value}" - limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richCollapsiblePanelBean.attributes['onbeforedomupdate'].value}" onbeforeswitch="#{richCollapsiblePanelBean.attributes['onbeforeswitch'].value}" - onbegin="#{richCollapsiblePanelBean.attributes['onbegin'].value}" onclick="#{richCollapsiblePanelBean.attributes['onclick'].value}" - oncomplete="#{richCollapsiblePanelBean.attributes['oncomplete'].value}" ondblclick="#{richCollapsiblePanelBean.attributes['ondblclick'].value}" onmousedown="#{richCollapsiblePanelBean.attributes['onmousedown'].value}" onmousemove="#{richCollapsiblePanelBean.attributes['onmousemove'].value}" @@ -67,11 +61,9 @@ onmouseover="#{richCollapsiblePanelBean.attributes['onmouseover'].value}" onmouseup="#{richCollapsiblePanelBean.attributes['onmouseup'].value}" onswitch="#{richCollapsiblePanelBean.attributes['onswitch'].value}" - render="#{richCollapsiblePanelBean.attributes['render'].value}" rendered="#{richCollapsiblePanelBean.attributes['rendered'].value}" rightCollapsedIcon="#{richCollapsiblePanelBean.attributes['rightCollapsedIcon'].value}" rightExpandedIcon="#{richCollapsiblePanelBean.attributes['rightExpandedIcon'].value}" - status="#{richCollapsiblePanelBean.attributes['status'].value}" style="#{richCollapsiblePanelBean.attributes['style'].value}" styleClass="#{richCollapsiblePanelBean.attributes['styleClass'].value}" switchType="#{richCollapsiblePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -44,20 +44,14 @@ activeItem="#{richTabPanelBean.attributes['activeItem'].value}" bypassUpdates="#{richTabPanelBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}" - data="#{richTabPanelBean.attributes['data'].value}" dir="#{richTabPanelBean.attributes['dir'].value}" - execute="#{richTabPanelBean.attributes['execute'].value}" headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}" headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}" immediate="#{richTabPanelBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" lang="#{richTabPanelBean.attributes['lang'].value}" - limitRender="#{richTabPanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richTabPanelBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richTabPanelBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richTabPanelBean.attributes['onbegin'].value}" onclick="#{richTabPanelBean.attributes['onclick'].value}" - oncomplete="#{richTabPanelBean.attributes['oncomplete'].value}" ondblclick="#{richTabPanelBean.attributes['ondblclick'].value}" onitemchange="#{richTabPanelBean.attributes['onitemchange'].value}" onmousedown="#{richTabPanelBean.attributes['onmousedown'].value}" @@ -65,9 +59,7 @@ onmouseout="#{richTabPanelBean.attributes['onmouseout'].value}" onmouseover="#{richTabPanelBean.attributes['onmouseover'].value}" onmouseup="#{richTabPanelBean.attributes['onmouseup'].value}" - render="#{richTabPanelBean.attributes['render'].value}" rendered="#{richTabPanelBean.attributes['rendered'].value}" - status="#{richTabPanelBean.attributes['status'].value}" style="#{richTabPanelBean.attributes['style'].value}" styleClass="#{richTabPanelBean.attributes['styleClass'].value}" switchType="#{richTabPanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2011-02-16 17:42:52 UTC (rev 21710) @@ -82,18 +82,12 @@ activeItem="#{richTogglePanelBean.attributes['activeItem'].value}" bypassUpdates="#{richTogglePanelBean.attributes['bypassUpdates'].value}" cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}" - data="#{richTogglePanelBean.attributes['data'].value}" dir="#{richTogglePanelBean.attributes['dir'].value}" - execute="#{richTogglePanelBean.attributes['execute'].value}" immediate="#{richTogglePanelBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" lang="#{richTogglePanelBean.attributes['lang'].value}" - limitRender="#{richTogglePanelBean.attributes['limitRender'].value}" - onbeforedomupdate="#{richTogglePanelBean.attributes['onbeforedomupdate'].value}" onbeforeitemchange="#{richTogglePanelBean.attributes['onbeforeitemchange'].value}" - onbegin="#{richTogglePanelBean.attributes['onbegin'].value}" onclick="#{richTogglePanelBean.attributes['onclick'].value}" - oncomplete="#{richTogglePanelBean.attributes['oncomplete'].value}" ondblclick="#{richTogglePanelBean.attributes['ondblclick'].value}" onitemchange="#{richTogglePanelBean.attributes['onitemchange'].value}" onmousedown="#{richTogglePanelBean.attributes['onmousedown'].value}" @@ -101,9 +95,7 @@ onmouseout="#{richTogglePanelBean.attributes['onmouseout'].value}" onmouseover="#{richTogglePanelBean.attributes['onmouseover'].value}" onmouseup="#{richTogglePanelBean.attributes['onmouseup'].value}" - render="#{richTogglePanelBean.attributes['render'].value}" rendered="#{richTogglePanelBean.attributes['rendered'].value}" - status="#{richTogglePanelBean.attributes['status'].value}" style="#{richTogglePanelBean.attributes['style'].value}" styleClass="#{richTogglePanelBean.attributes['styleClass'].value}" switchType="#{richTogglePanelBean.attributes['switchType'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -173,45 +173,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(itemHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { testDir(accordion); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(itemHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test public void testHeight() { AttributeLocator<?> attribute = accordion.getAttribute(new Attribute("style")); @@ -345,43 +311,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9934") - public void testLimitRender() { - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String newTime = selenium.getText(time); - assertNotSame(newTime, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testItemchangeEvents() { selenium.type(pjq("input[type=text][id$=onbeforeitemchangeInput]"), "metamerEvents += \"beforeitemchange \""); selenium.waitForPageToLoad(); @@ -458,16 +387,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -476,16 +395,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(itemHeaders[1]); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(accordion, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -96,47 +96,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { testDir(panel); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "input executeChecker"); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10312") public void testExpanded() { verifyBeforeClick(); @@ -211,47 +175,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9535") - public void testLimitRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "@this"); - selenium.waitForPageToLoad(); - - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String reqTime = selenium.getText(time); - - guardXhr(selenium).click(header); - waitGui.failWith("Panel should be collapsed.").until(isDisplayed.locator(headerColps)); - - String newTime = selenium.getText(time); - assertTrue(newTime.equals(reqTime), "Panel with ajaxRendered=true should not be rerendered (old and new time should be same)."); - } - - @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(header); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testOnbeforeswitchOnswitch() { selenium.type(pjq("input[type=text][id$=onbeforeswitchInput]"), "metamerEvents += \"beforeswitch \""); selenium.waitForPageToLoad(); @@ -306,16 +229,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(header); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -348,16 +261,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(header); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); } 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-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -179,47 +179,11 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10521") - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { super.testDir(panel); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10443") - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -248,47 +212,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9535") - public void testLimitRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "@this"); - selenium.waitForPageToLoad(); - - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Tab 2 is not displayed.").until(isDisplayed.locator(itemContents[1])); - - String newTimeValue = selenium.getText(time); - assertNotSame(newTimeValue, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10310 https://issues.jboss.org/browse/RF-10521") - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - guardXhr(selenium).click(inactiveHeaders[2]); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(itemContents[2])); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testOnbeforeitemchange() { selenium.type(pjq("input[id$=onbeforeitemchangeInput]"), "metamerEvents += \"onbeforeitemchange \""); selenium.waitForPageToLoad(TIMEOUT); @@ -367,17 +290,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10441") - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -386,16 +298,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(inactiveHeaders[1]); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 17:32:02 UTC (rev 21709) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-02-16 17:42:52 UTC (rev 21710) @@ -210,45 +210,11 @@ } @Test - @RegressionTest("https://issues.jboss.org/browse/RF-10061") - public void testData() { - selenium.type(pjq("input[type=text][id$=dataInput]"), "RichFaces 4"); - selenium.waitForPageToLoad(); - - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "data = event.data"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(tc3); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(item3)); - - String data = selenium.getEval(new JavaScript("window.data")); - assertEquals(data, "RichFaces 4", "Data sent with ajax request"); - } - - @Test public void testDir() { super.testDir(panel); } @Test - public void testExecute() { - selenium.type(pjq("input[type=text][id$=executeInput]"), "@this executeChecker"); - selenium.waitForPageToLoad(); - - guardXhr(selenium).click(tc3); - waitGui.failWith("Item 3 is not displayed.").until(isDisplayed.locator(item3)); - - JQueryLocator logItems = jq("ul.phases-list li:eq({0})"); - for (int i = 0; i < 6; i++) { - if ("* executeChecker".equals(selenium.getText(logItems.format(i)))) { - return; - } - } - - fail("Attribute execute does not work"); - } - - @Test @IssueTracking("https://issues.jboss.org/browse/RF-10054") public void testImmediate() { selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); @@ -275,21 +241,6 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-9881") - public void testLimitRender() { - selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); - selenium.waitForPageToLoad(); - - String timeValue = selenium.getText(time); - - guardXhr(selenium).click(tc2); - waitGui.failWith("Item 2 is not displayed.").until(isDisplayed.locator(item2)); - - String newTimeValue = selenium.getText(time); - assertEquals(newTimeValue, timeValue, "Panel with ajaxRendered=true should not be rerendered."); - } - - @Test public void testOnbeforeitemchange() { selenium.type(pjq("input[id$=onbeforeitemchangeInput]"), "metamerEvents += \"onbeforeitemchange \""); selenium.waitForPageToLoad(); @@ -301,29 +252,6 @@ } @Test - public void testAjaxEvents() { - selenium.type(pjq("input[type=text][id$=onbeginInput]"), "metamerEvents += \"begin \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=onbeforedomupdateInput]"), "metamerEvents += \"beforedomupdate \""); - selenium.waitForPageToLoad(); - selenium.type(pjq("input[type=text][id$=oncompleteInput]"), "metamerEvents += \"complete \""); - selenium.waitForPageToLoad(); - - selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); - - String reqTime = selenium.getText(time); - guardXhr(selenium).click(tc2); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - String[] events = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); - - assertEquals(events.length, 3, "3 events should be fired."); - assertEquals(events[0], "begin", "Attribute onbegin doesn't work"); - assertEquals(events[1], "beforedomupdate", "Attribute onbeforedomupdate doesn't work"); - assertEquals(events[2], "complete", "Attribute oncomplete doesn't work"); - } - - @Test public void testItemchangeEvents() { selenium.type(pjq("input[type=text][id$=onbeforeitemchangeInput]"), "metamerEvents += \"beforeitemchange \""); selenium.waitForPageToLoad(); @@ -389,16 +317,6 @@ } @Test - public void testRender() { - selenium.type(pjq("input[type=text][id$=renderInput]"), "renderChecker"); - selenium.waitForPageToLoad(); - - String renderCheckerTime = selenium.getText(renderChecker); - guardXhr(selenium).click(tc2); - waitGui.failWith("Attribute render doesn't work").waitForChange(renderCheckerTime, retrieveText.locator(renderChecker)); - } - - @Test public void testRendered() { selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); @@ -407,16 +325,6 @@ } @Test - public void testStatus() { - selenium.type(pjq("input[type=text][id$=statusInput]"), "statusChecker"); - selenium.waitForPageToLoad(); - - String statusCheckerTime = selenium.getText(statusChecker); - guardXhr(selenium).click(tc2); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); - } - - @Test public void testStyle() { testStyle(panel, "style"); }