Author: ppitonak(a)redhat.com Date: 2011-03-04 04:54:06 -0500 (Fri, 04 Mar 2011) New Revision: 22054 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHGraphicImage.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java Log: all tests for attribute disabled of a4j:ajax fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -94,13 +95,11 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); selenium.type(input, "RichFaces 4"); - guardXhr(selenium).click(command); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "", "Output1 should not change"); - assertEquals(selenium.getText(output2), "", "Output2 should not change"); + guardHttp(selenium).click(command); + + assertEquals(selenium.getText(output1), "RichFaces 4", "Output1 should not change"); + assertEquals(selenium.getText(output2), "RichFaces 4", "Output2 should not change"); } public void testExecute(JQueryLocator command) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -91,12 +92,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - guardXhr(selenium).addSelection(input, optionValue("Audi")); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output1 should not change"); - assertEquals(selenium.getText(output2), "[Ferrari, Lexus]", "Output2 should not change"); + guardNoRequest(selenium).addSelection(input, optionValue("Audi")); } public void testExecute(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -91,12 +92,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - guardXhr(selenium).select(input, optionValue("Audi")); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "Ferrari", "Output1 should not change"); - assertEquals(selenium.getText(output2), "Ferrari", "Output2 should not change"); + guardNoRequest(selenium).select(input, optionValue("Audi")); } public void testExecute(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -88,6 +89,7 @@ String reqTime = selenium.getText(time); typeToInput(input, "RichFaces 4"); + waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); String data = selenium.getEval(new JavaScript("window.data")); @@ -98,12 +100,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - typeToInput(input, "RichFaces 4"); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "", "Output1 should not change"); - assertEquals(selenium.getText(output2), "", "Output2 should not change"); + guardNoRequest(selenium).type(input, "RichFaces 4"); } public void testExecute(JQueryLocator input) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHGraphicImage.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHGraphicImage.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHGraphicImage.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardNoRequest; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import java.net.URL; @@ -67,7 +68,10 @@ @Test public void testDisabled() { - testDisabled(button); + selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); + selenium.waitForPageToLoad(); + + guardNoRequest(selenium).click(button); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -105,12 +106,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - guardXhr(selenium).click(input); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "false", "Output1 should not change"); - assertEquals(selenium.getText(output2), "false", "Output2 should not change"); + guardNoRequest(selenium).click(input); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -104,12 +105,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - guardXhr(selenium).click(input); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "[Ferrari, Lexus]", "Output1 should not change"); - assertEquals(selenium.getText(output2), "[Ferrari, Lexus]", "Output2 should not change"); + guardNoRequest(selenium).click(input); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java 2011-03-04 07:57:08 UTC (rev 22053) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java 2011-03-04 09:54:06 UTC (rev 22054) @@ -21,6 +21,7 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAjax; +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.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; @@ -104,12 +105,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - String reqTime = selenium.getText(time); - guardXhr(selenium).click(input); - waitGui.failWith("Page was not updated").waitForChange(reqTime, retrieveText.locator(time)); - - assertEquals(selenium.getText(output1), "Ferrari", "Output1 should not change"); - assertEquals(selenium.getText(output2), "Ferrari", "Output2 should not change"); + guardNoRequest(selenium).click(input); } @Test