Author: ppitonak(a)redhat.com Date: 2010-10-14 04:33:01 -0400 (Thu, 14 Oct 2010) New Revision: 19564 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerConsoleStatusTestListener.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerProperties.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerSeleniumLoggingTestListener.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerTestInfo.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java 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/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 modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/IntervalAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestInterval.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/PushAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/SimpleModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/StatusAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/StatusFacets.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Inject.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Templates.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Uses.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AssertingDataScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataGrid.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java 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/richComponentControl/ComponentControlDataScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractScrollerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerInTableFooter.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richJQuery/RichJQueryAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richJQuery/TestSimple.java Log: * keyword "Revision" added to the properties of all Java files * tests fixed to work with new version of boolean attributes Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -35,8 +35,6 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.richfaces.tests.metamer.ftest.AbstractMetamerTest.pjq; import static org.jboss.test.selenium.locator.reference.ReferencedLocator.referenceInferred; -import static org.jboss.test.selenium.waiting.WaitFactory.waitGui; -import static org.jboss.test.selenium.waiting.WaitFactory.elementPresent; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> @@ -45,10 +43,9 @@ public class AbstractComponentAttributes { protected AjaxSelenium selenium = AjaxSeleniumProxy.getInstance(); - LocatorReference<ExtendedLocator<JQueryLocator>> root = new LocatorReference<ExtendedLocator<JQueryLocator>>( - pjq("")); - ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, "input[id$={0}Input]"); + pjq("")); + ReferencedLocator<JQueryLocator> propertyLocator = referenceInferred(root, "input[id*={0}Input]{1}"); public AbstractComponentAttributes() { } @@ -63,10 +60,15 @@ } protected void setProperty(String propertyName, Object value) { - final ElementLocator<?> locator = propertyLocator.format(propertyName); + ElementLocator<?> locator = propertyLocator.format(propertyName); final AttributeLocator<?> typeLocator = locator.getAttribute(Attribute.TYPE); - String inputType = selenium.getAttribute(typeLocator); + String inputType = null; + if (selenium.getCount(propertyLocator.format(propertyName)) > 1) { + inputType = "radio"; + } else { + inputType = selenium.getAttribute(typeLocator); + } if (value == null) { value = ""; @@ -77,8 +79,10 @@ applyText(locator, valueAsString); } else if ("checkbox".equals(inputType)) { boolean checked = Boolean.valueOf(valueAsString); - applyCheckbox(locator, checked); + } else if ("radio".equals(inputType)) { + locator = propertyLocator.format(propertyName, "[value=" + ("".equals(value) ? "null" : value) + "]"); + guardHttp(selenium).click(locator); } } Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractComponentAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerConsoleStatusTestListener.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerProperties.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerSeleniumLoggingTestListener.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerTestInfo.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jActionListener/TestA4JActionListener.java ___________________________________________________________________ Name: svn:keywords + Revision 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -57,7 +57,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); selenium.type(input, "RichFaces 4"); @@ -91,7 +91,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); selenium.type(input, "RichFaces 4"); @@ -107,9 +107,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); selenium.type(input, "RichFaces 4"); @@ -121,7 +121,7 @@ } public void testLimitRender(JQueryLocator command) { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectMany.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -57,7 +57,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).addSelection(input, optionValue("Audi")); @@ -89,7 +89,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).addSelection(input, optionValue("Audi")); @@ -104,9 +104,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).addSelection(input, optionValue("Audi")); @@ -117,7 +117,7 @@ } public void testLimitRender(JQueryLocator input) { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestSelectOne.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -57,7 +57,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).select(input, optionValue("Audi")); @@ -89,7 +89,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).select(input, optionValue("Audi")); @@ -104,9 +104,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).select(input, optionValue("Audi")); @@ -117,7 +117,7 @@ } public void testLimitRender(JQueryLocator input) { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestTextInput.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -63,7 +63,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); typeToInput(input, "RichFaces 4"); @@ -95,7 +95,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); typeToInput(input, "RichFaces 4"); @@ -110,9 +110,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); typeToInput(input, "RichFaces 4"); @@ -123,7 +123,7 @@ } public void testLimitRender(JQueryLocator input) { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectBooleanCheckbox.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -68,7 +68,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -102,7 +102,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -118,9 +118,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -132,7 +132,7 @@ @Test public void testLimitRender() { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectManyCheckbox.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -68,7 +68,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -102,7 +102,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -118,9 +118,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -132,7 +132,7 @@ @Test public void testLimitRender() { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHSelectOneRadio.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -66,7 +66,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -100,7 +100,7 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -116,9 +116,9 @@ JQueryLocator time = jq("span[id$=requestTime]"); String timeValue = selenium.getText(time); - selenium.click(pjq("input[type=checkbox][id$=bypassUpdatesInput]")); + selenium.click(pjq("input[type=radio][name$=bypassUpdatesInput][value=true]")); selenium.waitForPageToLoad(); - selenium.click(pjq("input[type=checkbox][id$=immediateInput]")); + selenium.click(pjq("input[type=radio][name$=immediateInput][value=true]")); selenium.waitForPageToLoad(); guardXhr(selenium).click(input); @@ -130,7 +130,7 @@ @Test public void testLimitRender() { - selenium.click(pjq("input[type=checkbox][id$=limitRenderInput]")); + selenium.click(pjq("input[type=radio][name$=limitRenderInput][value=true]")); selenium.waitForPageToLoad(); JQueryLocator time = jq("span[id$=requestTime]"); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/AttachQueueAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -21,24 +21,16 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.a4jAttachQueue; -import static org.jboss.test.selenium.dom.Event.KEYPRESS; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; -import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; import java.net.URL; import org.jboss.cheiron.halt.XHRHalter; -import org.jboss.cheiron.halt.XHRState; -import org.jboss.test.selenium.waiting.retrievers.Retriever; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.a4jQueue.QueueAttributes; import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel; import org.richfaces.tests.metamer.ftest.a4jQueue.QueueModel.Input; -import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; -import org.richfaces.tests.metamer.ftest.annotations.Use; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAttachQueue/TestNestedAttachQueue.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -157,10 +157,10 @@ @Test public void testDisabled() { - JQueryLocator disabledChecbox = pjq("input[id$=disabledInput]"); + JQueryLocator disabledCheckbox = pjq("input[type=radio][name$=disabledInput][value=true]"); AttributeLocator<?> disabledAttribute = button.getAttribute(new Attribute("disabled")); - selenium.click(disabledChecbox); + selenium.click(disabledCheckbox); selenium.waitForPageToLoad(TIMEOUT); String isDisabled = selenium.getAttribute(disabledAttribute); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -157,10 +157,10 @@ @Test public void testDisabled() { - JQueryLocator disabledChecbox = pjq("input[id$=disabledInput]"); + JQueryLocator disabledCheckbox = pjq("input[type=radio][name$=disabledInput][value=true]"); JQueryLocator newLink = pjq("span[id$=a4jCommandLink]"); - selenium.click(disabledChecbox); + selenium.click(disabledCheckbox); selenium.waitForPageToLoad(TIMEOUT); assertFalse(selenium.isElementPresent(link), link.getAsString() Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jJSFunction/TestJSFunctionSimple.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -127,7 +127,7 @@ public void testBypassUpdates() { String time1Value = selenium.getText(time1); - JQueryLocator input = pjq("input[type=checkbox][id$=bypassUpdatesInput]"); + JQueryLocator input = pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"); selenium.click(input); selenium.waitForPageToLoad(); @@ -145,7 +145,7 @@ public void testImmediate() { String time1Value = selenium.getText(time1); - JQueryLocator input = pjq("input[type=checkbox][id$=immediateInput]"); + JQueryLocator input = pjq("input[type=radio][name$=immediateInput][value=true]"); selenium.click(input); selenium.waitForPageToLoad(); @@ -158,7 +158,7 @@ @Test public void testLimitRender() { // set limitRender=true - JQueryLocator limitRenderInput = pjq("input[type=checkbox][id$=limitRenderInput]"); + JQueryLocator limitRenderInput = pjq("input[type=radio][name$=limitRenderInput][value=true]"); selenium.click(limitRenderInput); selenium.waitForPageToLoad(); @@ -233,7 +233,7 @@ @Test public void testRendered() { - selenium.click(pjq("input[type=checkbox][id$=renderedInput]")); + selenium.click(pjq("input[type=radio][name$=renderedInput][value=false]")); selenium.waitForPageToLoad(); // get all values Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -104,7 +104,7 @@ @Test public void testRendered() { - JQueryLocator renderedInput = pjq("input[id$=renderedInput]"); + JQueryLocator renderedInput = pjq("input[type=radio][name$=renderedInput][value=false]"); selenium.click(renderedInput); selenium.waitForPageToLoad(TIMEOUT); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jLog/TestA4JLog.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -109,10 +109,10 @@ @Test public void testAjaxRendered() { - JQueryLocator ajaxRenderedCheckbox = pjq("input[id$=ajaxRenderedInput]"); + JQueryLocator ajaxRenderedInput = pjq("input[type=radio][name$=ajaxRenderedInput][value=false]"); JQueryLocator reRenderAllImage = jq("div.header img[id$=reRenderAllImage]"); - selenium.click(ajaxRenderedCheckbox); + selenium.click(ajaxRenderedInput); selenium.waitForPageToLoad(TIMEOUT); selenium.click(increaseCounterButton); @@ -198,16 +198,17 @@ @Test public void testRendered() { - JQueryLocator renderedInput = pjq("input[id$=renderedInput]"); + JQueryLocator renderedInputFalse = pjq("input[type=radio][name$=renderedInput][value=false]"); + JQueryLocator renderedInputTrue = pjq("input[type=radio][name$=renderedInput][value=true]"); - selenium.click(renderedInput); + selenium.click(renderedInputFalse); selenium.waitForPageToLoad(TIMEOUT); assertFalse(selenium.isElementPresent(outputDiv), "Panel should not be rendered."); selenium.click(increaseCounterButton); selenium.click(increaseCounterButton); - selenium.click(renderedInput); + selenium.click(renderedInputTrue); selenium.waitForPageToLoad(TIMEOUT); assertTrue(selenium.isElementPresent(outputDiv), "Panel should be rendered."); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/IntervalAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestInterval.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestInterval.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestInterval.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -25,10 +25,8 @@ import java.net.URL; import org.apache.commons.httpclient.HttpException; -import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.AttributeLocator; -import org.jboss.test.selenium.locator.IdLocator; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; import org.richfaces.tests.metamer.ftest.annotations.Inject; @@ -38,11 +36,9 @@ import org.testng.annotations.Test; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; -import static org.jboss.test.selenium.locator.LocatorFactory.*; import static org.testng.Assert.*; import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; import static org.jboss.test.selenium.utils.PrimitiveUtils.*; -import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.*; /** * Tests the a4j:poll component. Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPoll/TestInterval.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/AbstractPushTest.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/PushAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestCounter.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jPush/TestInterval.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/QueueModel.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestFormQueue.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/NestedRegionModel.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRegion/TestNestedRegion.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -42,7 +42,7 @@ setProperty("first", first); } - public void setRendered(boolean rendered) { + public void setRendered(String rendered) { setProperty("rendered", rendered); } Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/RepeatAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/SimpleModel.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestMatrix.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -76,7 +76,7 @@ @Test public void testRenderedAttribute() { - attributes.setRendered(false); + attributes.setRendered("false"); assertEquals(model.isRendered(), false); } Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jRepeat/TestSimple.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/AbstracStatusTest.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/StatusAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/StatusFacets.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestFacets.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestInstantAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestReferencedUsage.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jStatus/TestSimple.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Inject.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/IssueTracking.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Templates.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Use.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/annotations/Uses.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -156,7 +156,7 @@ @Test public void testDisabled() { - JQueryLocator disabledChecbox = pjq("input[id$=disabledInput]"); + JQueryLocator disabledChecbox = pjq("input[type=radio][name$=disabledInput][value=true]"); AttributeLocator<?> disabledAttribute = button.getAttribute(new Attribute("disabled")); selenium.click(disabledChecbox); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AbstractModel.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/AssertingDataScroller.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataGrid.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataScroller.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/model/DataTable.java ___________________________________________________________________ Name: svn:keywords + Revision 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 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -130,7 +130,7 @@ @Test public void testBypassUpdates() { - JQueryLocator input = pjq("input[type=checkbox][id$=bypassUpdatesInput]"); + JQueryLocator input = pjq("input[type=radio][name$=bypassUpdatesInput][value=true]"); selenium.click(input); selenium.waitForPageToLoad(); @@ -153,7 +153,7 @@ result = selenium.getEval(new JavaScript("window.RichFaces.$('" + accordionId + "').prevItem('item1')")); assertEquals(result, "null", "Result of function prevItem('item1')"); - JQueryLocator input = pjq("input[type=checkbox][id$=cycledSwitchingInput]"); + JQueryLocator input = pjq("input[type=radio][name$=cycledSwitchingInput][value=true]"); selenium.click(input); selenium.waitForPageToLoad(); @@ -209,7 +209,7 @@ @Test public void testImmediate() { - JQueryLocator input = pjq("input[type=checkbox][id$=immediateInput]"); + JQueryLocator input = pjq("input[type=radio][name$=immediateInput][value=true]"); selenium.click(input); selenium.waitForPageToLoad(); @@ -319,7 +319,7 @@ @Test public void testRendered() { - JQueryLocator input = pjq("input[type=checkbox][id$=renderedInput]"); + JQueryLocator input = pjq("input[type=radio][name$=renderedInput][value=false]"); selenium.click(input); selenium.waitForPageToLoad(); Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/ComponentControlDataScroller.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richComponentControl/TestDataScroller.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractDataGridTest.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractScrollerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractScrollerTest.java 2010-10-13 23:44:25 UTC (rev 19563) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractScrollerTest.java 2010-10-14 08:33:01 UTC (rev 19564) @@ -29,11 +29,9 @@ import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Use; -import org.richfaces.tests.metamer.ftest.annotations.Uses; import org.richfaces.tests.metamer.ftest.model.DataScroller; import org.richfaces.tests.metamer.ftest.richDataScroller.PaginationTester; import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; /** * @author <a href="mailto:lfryc@redhat.com">Lukas Fryc</a> Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/AbstractScrollerTest.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerInTableFooter.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestScrollerOutsideTable.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataGrid/TestSimple.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/AbstractScrollerTest.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/PaginationTester.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerInTableFooter.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDataScroller/TestScrollerOutsideTable.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richExtendedDataTable/TestScroller.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richJQuery/RichJQueryAttributes.java ___________________________________________________________________ Name: svn:keywords + Revision Property changes on: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richJQuery/TestSimple.java ___________________________________________________________________ Name: svn:keywords + Revision