Author: jjamrich Date: 2011-09-22 09:39:31 -0400 (Thu, 22 Sep 2011) New Revision: 22733 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/BasicAttributes.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/a4jMediaOutput/TestAttributes.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/hCommandButton/TestHCommandButton.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/richAccordionItem/TestRichAccordionItem.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.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/richDropDownMenu/TestRichDropDownMenu.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessage/AbstractRichMessageTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarStatic.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.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 modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java Log: RFPL-1439: change test for @styleClass in AbstractMetamerTest to set it by unified way Refactored all affected tests Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -36,10 +36,10 @@ import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.jboss.test.selenium.utils.text.SimplifiedFormat.format; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.basicAttributes; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.basicAttributes; import java.net.URL; import java.util.Arrays; @@ -68,7 +68,6 @@ import org.richfaces.tests.metamer.TemplatesList; import org.richfaces.tests.metamer.ftest.annotations.Inject; import org.richfaces.tests.metamer.ftest.annotations.Templates; -import org.richfaces.tests.metamer.ftest.attributes.Attributes; import org.testng.SkipException; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -257,23 +256,38 @@ } /** - * A helper method for testing attribute "class". It sets "metamer-ftest-class" to the input field and checks that - * it was changed on the page. + * A helper method for testing attribute "class" or similar. + * It sets "metamer-ftest-class" to the input field and checks that it was changed on the page. * * @param element * locator of tested element * @param attribute * name of the attribute that will be set (e.g. styleClass, headerClass, itemContentClass) */ - protected void testStyleClass(ExtendedLocator<JQueryLocator> element, String attribute) { + protected void testStyleClass(ExtendedLocator<JQueryLocator> element, BasicAttributes attribute) { final String styleClass = "metamer-ftest-class"; - selenium.type(ref(attributesRoot, "input[id$=" + attribute + "Input]"), styleClass); - selenium.waitForPageToLoad(); + basicAttributes.set(attribute, styleClass); + JQueryLocator elementWhichHasntThatClass = jq(element.getRawLocator() + ":not(.{0})").format(styleClass); assertTrue(selenium.isElementPresent(element)); assertFalse(selenium.isElementPresent(elementWhichHasntThatClass)); } + + /** + * A helper method for testing attribute "class". + * It sets "metamer-ftest-class" to the input field and checks that it was changed on the page. + * This method is wrapping + * {@link #testStyleClass(ExtendedLocator, BasicAttributes)} + * + * @param element + * locator of tested element + * @param attribute + * name of the attribute that will be set (e.g. styleClass, headerClass, itemContentClass) + */ + protected void testStyleClass(ExtendedLocator<JQueryLocator> element) { + testStyleClass(element, BasicAttributes.styleClass); + } public void testRequestEventsBefore(String... events) { for (String event : events) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/BasicAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/BasicAttributes.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/BasicAttributes.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -31,11 +31,49 @@ * @version $Revision$ */ public enum BasicAttributes implements AttributeEnum { + buttonClass, + bodyClass, + contentClass, + controlsClass, + decreaseClass, dir, + disabledClass, + finishClass, + groupClass, + groupDisabledClass, + handleClass, + headerDisabledClass, + headerClass, + headerInactiveClass, headerStyle, + headerActiveClass, + iconClass, + increaseClass, + initialClass, + inputClass, inputStyle, + itemActiveHeaderClass, + itemClass, + itemContentClass, + itemDisabledClass, + itemDisabledHeaderClass, + itemHeaderClass, + itemInactiveHeaderClass, + itemStyle, + labelClass, lang, + leftIconClass, + listClass, + nodeClass, + progressClass, + remainingClass, + rightIconClass, + rowClass, style, styleClass, - title + title, + tooltipClass, + topGroupClass, + topItemClass, + trackClass, } 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 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandButton/TestA4JCommandButton.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -387,7 +387,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-9307") public void testStyleClass() { - testStyleClass(button, "styleClass"); + testStyleClass(button); } @Test 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 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -411,7 +411,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-9307") public void testStyleClass() { - testStyleClass(link, "styleClass"); + testStyleClass(link); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestAttributes.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jMediaOutput/TestAttributes.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -185,7 +185,7 @@ @Test public void testStyleClass() { - testStyleClass(MEDIA_OUTPUT, "styleClass"); + testStyleClass(MEDIA_OUTPUT); } @Test 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 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jOutputPanel/TestA4JOutputPanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -178,7 +178,7 @@ @Test public void testStyleClass() { - testStyleClass(outputDiv, "styleClass"); + testStyleClass(outputDiv); } @Test 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 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/hCommandButton/TestHCommandButton.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -247,7 +247,7 @@ @Test public void testStyleClass() { - testStyleClass(button, "styleClass"); + testStyleClass(button); } @Test 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-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordion/TestRichAccordion.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,15 +25,13 @@ 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; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; -import java.util.HashMap; -import java.util.Map; import javax.faces.event.PhaseId; @@ -205,7 +203,7 @@ @Test public void testItemActiveHeaderClass() { - testStyleClass(activeHeaders[0], "itemActiveHeaderClass"); + testStyleClass(activeHeaders[0], itemActiveHeaderClass); } @Test @@ -241,12 +239,12 @@ @Test public void testItemContentClass() { - testStyleClass(itemContents[2], "itemContentClass"); + testStyleClass(itemContents[2], itemContentClass); } @Test public void testItemDisabledHeaderClass() { - testStyleClass(disabledHeaders[3], "itemDisabledHeaderClass"); + testStyleClass(disabledHeaders[3], itemDisabledHeaderClass); } @Test @@ -269,12 +267,12 @@ @Test public void testItemHeaderClass() { - testStyleClass(itemHeaders[2], "itemHeaderClass"); + testStyleClass(itemHeaders[2], itemHeaderClass); } @Test public void testItemInactiveHeaderClass() { - testStyleClass(inactiveHeaders[1], "itemInactiveHeaderClass"); + testStyleClass(inactiveHeaders[1], itemInactiveHeaderClass); } @Test @@ -394,7 +392,7 @@ @Test public void testStyleClass() { - testStyleClass(accordion, "styleClass"); + testStyleClass(accordion); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richAccordionItem/TestRichAccordionItem.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,24 +25,18 @@ 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; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import org.jboss.test.selenium.css.CssProperty; - import org.jboss.test.selenium.dom.Event; import org.jboss.test.selenium.encapsulated.JavaScript; -import org.jboss.test.selenium.locator.Attribute; import org.jboss.test.selenium.locator.JQueryLocator; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.BasicAttributes; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.richfaces.tests.metamer.ftest.checker.IconsChecker; @@ -97,7 +91,7 @@ @Test public void testContentClass() { - testStyleClass(itemContents[0], "contentClass"); + testStyleClass(itemContents[0], contentClass); } @Test @@ -127,7 +121,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-10297") public void testHeaderActiveClass() { - testStyleClass(activeHeaders[0], "headerActiveClass"); + testStyleClass(activeHeaders[0], headerActiveClass); assertFalse(selenium.belongsClass(activeHeaders[1], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); assertFalse(selenium.belongsClass(activeHeaders[2], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); assertFalse(selenium.belongsClass(activeHeaders[3], "metamer-ftest-class"), "headerActiveClass should be set only on first item"); @@ -135,7 +129,7 @@ @Test public void testHeaderClass() { - testStyleClass(itemHeaders[0], "headerClass"); + testStyleClass(itemHeaders[0], headerClass); assertFalse(selenium.belongsClass(itemHeaders[1], "metamer-ftest-class"), "headerClass should be set only on first item"); assertFalse(selenium.belongsClass(itemHeaders[2], "metamer-ftest-class"), "headerClass should be set only on first item"); assertFalse(selenium.belongsClass(itemHeaders[3], "metamer-ftest-class"), "headerClass should be set only on first item"); @@ -147,13 +141,13 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(disabledHeaders[0], "headerDisabledClass"); + testStyleClass(disabledHeaders[0], headerDisabledClass); } @Test @IssueTracking("https://issues.jboss.org/browse/RF-10297") public void testHeaderInactiveClass() { - testStyleClass(inactiveHeaders[0], "headerInactiveClass"); + testStyleClass(inactiveHeaders[0], headerInactiveClass); assertFalse(selenium.belongsClass(inactiveHeaders[1], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); assertFalse(selenium.belongsClass(inactiveHeaders[2], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); assertFalse(selenium.belongsClass(inactiveHeaders[3], "metamer-ftest-class"), "headerInactiveClass should be set only on first item"); @@ -161,7 +155,7 @@ @Test public void testHeaderStyle() { - testStyle(itemHeaders[0], BasicAttributes.headerStyle); + testStyle(itemHeaders[0], headerStyle); } @Test @@ -376,7 +370,7 @@ @Test public void testStyleClass() { - testStyleClass(item1, "styleClass"); + testStyleClass(item1); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestRichCalendarAttributes.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -28,6 +28,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; import java.text.ParseException; @@ -45,7 +46,6 @@ import org.jboss.test.selenium.locator.AttributeLocator; import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.EventFiredCondition; -import org.richfaces.tests.metamer.ftest.BasicAttributes; import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.testng.annotations.Test; @@ -161,7 +161,7 @@ @Test public void testButtonClass() { - testStyleClass(image, "buttonClass"); + testStyleClass(image, buttonClass); } @Test @@ -169,7 +169,7 @@ selenium.type(pjq("input[type=text][id$=buttonLabelInput]"), "label"); selenium.waitForPageToLoad(); - testStyleClass(button, "buttonClass"); + testStyleClass(button, buttonClass); } @Test @@ -177,7 +177,7 @@ selenium.click(pjq("input[name$=buttonIconInput][value*=heart]")); selenium.waitForPageToLoad(); - testStyleClass(image, "buttonClass"); + testStyleClass(image, buttonClass); } @Test @@ -407,7 +407,7 @@ @Test public void testInputClass() { - testStyleClass(input, "inputClass"); + testStyleClass(input, inputClass); } @Test @@ -422,7 +422,7 @@ @Test public void testInputStyle() { - testStyle(input, BasicAttributes.inputStyle); + testStyle(input, inputStyle); } @Test @@ -869,7 +869,7 @@ @Test public void testStyleClass() { - testStyleClass(calendar, "styleClass"); + testStyleClass(calendar); } @Test 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-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCollapsiblePanel/TestRichCollapsiblePanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -30,6 +30,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; @@ -76,7 +77,7 @@ @Test public void testBodyClass() { - testStyleClass(content, "bodyClass"); + testStyleClass(content, bodyClass); } @Test @@ -110,7 +111,7 @@ @Test public void testHeaderClass() { - testStyleClass(header, "headerClass"); + testStyleClass(header, headerClass); } @Test @@ -255,7 +256,7 @@ @Test public void testStyleClass() { - testStyleClass(panel, "styleClass"); + testStyleClass(panel); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropDownMenu/TestRichDropDownMenu.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -318,7 +318,7 @@ @Test public void testStyleClass() { - testStyleClass(fileMenu, "styleClass"); + testStyleClass(fileMenu); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richFileUpload/TestRichFileUpload.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -153,7 +153,7 @@ @Test public void testStyleClass() { - testStyleClass(fileUpload, "styleClass"); + testStyleClass(fileUpload); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceInput/TestRichInplaceInput.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,6 +25,7 @@ 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.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.disabledClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -146,7 +147,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(inplaceInput, "disabledClass"); + testStyleClass(inplaceInput, disabledClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInplaceSelect/TestRichInplaceSelect.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -28,6 +28,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.disabledClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.listClass; import java.net.URL; @@ -158,7 +160,7 @@ selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(select, "disabledClass"); + testStyleClass(select, disabledClass); } @Test @@ -234,7 +236,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-9845") public void testListClass() { - testStyleClass(popup, "listClass"); + testStyleClass(popup, listClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSlider/TestRichSlider.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -28,6 +28,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; import java.text.ParseException; @@ -141,7 +142,7 @@ selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(left, "decreaseClass"); + testStyleClass(left, decreaseClass); } @Test @@ -208,7 +209,7 @@ @Test public void testHandleClass() { - testStyleClass(handle, "handleClass"); + testStyleClass(handle, handleClass); } @Test @@ -241,7 +242,7 @@ selenium.click(pjq("input[type=radio][name$=showArrowsInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(right, "increaseClass"); + testStyleClass(right, increaseClass); } @Test @@ -259,7 +260,7 @@ @Test public void testInputClass() { - testStyleClass(input, "inputClass"); + testStyleClass(input, inputClass); } @Test @@ -612,7 +613,7 @@ @Test public void testStyleClass() { - testStyleClass(slider, "styleClass"); + testStyleClass(slider); } @Test @@ -635,12 +636,12 @@ selenium.click(pjq("input[type=radio][name$=showTooltipInput][value=true]")); selenium.waitForPageToLoad(); - testStyleClass(tooltip, "tooltipClass"); + testStyleClass(tooltip, tooltipClass); } @Test public void testTrackClass() { - testStyleClass(track, "trackClass"); + testStyleClass(track, trackClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richInputNumberSpinner/TestRichSpinner.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardXhr; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.inputClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -188,7 +189,7 @@ @Test public void testInputClass() { - testStyleClass(input, "inputClass"); + testStyleClass(input, inputClass); } @Test @@ -473,7 +474,7 @@ @Test public void testStyleClass() { - testStyleClass(spinner, "styleClass"); + testStyleClass(spinner); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richList/TestSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -23,6 +23,7 @@ import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.testng.Assert.assertEquals; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.rowClass; import java.net.URL; @@ -58,13 +59,13 @@ @Test public void testStyleClassAttribute() { - testStyleClass(list.getRoot(), "styleClass"); + testStyleClass(list.getRoot()); } @Test public void testRowClassesAttribute() { - testStyleClass(list.getRow(1), "rowClass"); - testStyleClass(list.getRow(rows), "rowClass"); + testStyleClass(list.getRow(1), rowClass); + testStyleClass(list.getRow(rows), rowClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -273,7 +273,7 @@ @Test public void testStyleClass() { - testStyleClass(group, "styleClass"); + testStyleClass(group); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -400,7 +400,7 @@ @Test public void testStyleClass() { - testStyleClass(menuItem1, "styleClass"); + testStyleClass(menuItem1); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessage/AbstractRichMessageTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessage/AbstractRichMessageTest.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMessage/AbstractRichMessageTest.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -23,7 +23,7 @@ import static org.jboss.test.selenium.guard.request.RequestTypeGuardFactory.guardHttp; import static org.jboss.test.selenium.locator.LocatorFactory.jq; -import static org.jboss.test.selenium.locator.reference.ReferencedLocator.ref; +import static org.richfaces.tests.metamer.ftest.attributes.AttributeList.basicAttributes; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -35,6 +35,7 @@ import org.jboss.test.selenium.locator.JQueryLocator; import org.jboss.test.selenium.waiting.EventFiredCondition; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; +import org.richfaces.tests.metamer.ftest.BasicAttributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,11 +133,11 @@ * name of the attribute that will be set (e.g. styleClass, headerClass, itemContentClass) */ @Override - protected void testStyleClass(ExtendedLocator<JQueryLocator> element, String attribute) { + protected void testStyleClass(ExtendedLocator<JQueryLocator> element, BasicAttributes attribute) { final String styleClass = "metamer-ftest-class"; - selenium.type(ref(attributesRoot, "input[id$=" + attribute + "Input]"), styleClass); - selenium.waitForPageToLoad(); - + + basicAttributes.set(attribute, styleClass); + generateValidationMessages(false); JQueryLocator elementWhichHasntThatClass = jq(element.getRawLocator() + ":not(.{0})").format(styleClass); @@ -254,7 +255,9 @@ public void testStyleClass() { // attribute styleClass is propagated as class attribute in target HTML element - testStyleClass(getTestElemLocator(), RichMessageAttributes.STYLE_CLASS.toString()); + // testStyleClass(getTestElemLocator(), RichMessageAttributes.STYLE_CLASS.toString()); + // TODO: for RFPL-1439 use default mechanism to set attributes + testStyleClass(getTestElemLocator(), BasicAttributes.styleClass); } public void testOnClick() { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanel/TestRichPanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,6 +25,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.bodyClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.headerClass; import java.net.URL; @@ -79,7 +81,7 @@ @Test @Use(field = "panel", value = "bodies") public void testBodyClass() { - testStyleClass(panel, "bodyClass"); + testStyleClass(panel, bodyClass); } @Test @@ -93,7 +95,7 @@ @Test public void testHeaderClass() { - testStyleClass(headers[0], "headerClass"); + testStyleClass(headers[0], headerClass); } @Test @@ -174,7 +176,7 @@ @Test @Use(field = "panel", value = "panels") public void testStyleClass() { - testStyleClass(panel, "styleClass"); + testStyleClass(panel); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenu/TestPanelMenuSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -24,6 +24,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import org.jboss.test.selenium.css.CssProperty; import org.richfaces.PanelMenuMode; @@ -74,25 +75,25 @@ @Test public void testGroupClass() { attributes.setGroupMode(PanelMenuMode.client); - super.testStyleClass(group24, "groupClass"); + super.testStyleClass(group24, groupClass); } @Test public void testGroupDisabledClass() { attributes.setGroupMode(PanelMenuMode.client); - super.testStyleClass(group26, "groupDisabledClass"); + super.testStyleClass(group26, groupDisabledClass); } @Test public void testItemClass() { attributes.setGroupMode(PanelMenuMode.client); - super.testStyleClass(item22, "itemClass"); + super.testStyleClass(item22, itemClass); } @Test public void testItemDisabledClass() { attributes.setGroupMode(PanelMenuMode.client); - super.testStyleClass(item25, "itemDisabledClass"); + super.testStyleClass(item25, itemDisabledClass); } @Test @@ -110,17 +111,17 @@ @Test public void testStyleClass() { - super.testStyleClass(menu, "styleClass"); + super.testStyleClass(menu); } @Test public void testTopGroupClass() { - super.testStyleClass(group1, "topGroupClass"); + super.testStyleClass(group1, topGroupClass); } @Test public void testTopItemClass() { - super.testStyleClass(item3, "topItemClass"); + super.testStyleClass(item3, topItemClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuGroup/TestPanelMenuGroupSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -1,6 +1,7 @@ package org.richfaces.tests.metamer.ftest.richPanelMenuGroup; import static org.jboss.test.selenium.locator.LocatorFactory.jq; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.disabledClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -59,7 +60,7 @@ @Test public void testDisabledClass() { attributes.setDisabled(true); - super.testStyleClass(topGroup, "disabledClass"); + super.testStyleClass(topGroup, disabledClass); } @Test @@ -177,7 +178,7 @@ @Test @RegressionTest("https://issues.jboss.org/browse/RF-10485") public void testStyleClass() { - super.testStyleClass(topGroup, "styleClass"); + super.testStyleClass(topGroup); } private void verifyStandardIcons(ElementLocator<JQueryLocator> input, ElementLocator<JQueryLocator> icon, ElementLocator<JQueryLocator> image, String classSuffix) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPanelMenuItem/TestPanelMenuItemSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -2,6 +2,9 @@ import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.disabledClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.leftIconClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.rightIconClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -14,7 +17,6 @@ import org.jboss.test.selenium.request.RequestType; import org.richfaces.PanelMenuMode; import org.richfaces.tests.metamer.ftest.AbstractMetamerTest; -import org.richfaces.tests.metamer.ftest.annotations.IssueTracking; import org.richfaces.tests.metamer.ftest.annotations.RegressionTest; import org.richfaces.tests.metamer.ftest.checker.IconsChecker; import org.richfaces.tests.metamer.ftest.model.PanelMenu; @@ -83,7 +85,7 @@ @Test public void testDisabledClass() { attributes.setDisabled(true); - super.testStyleClass(item, "disabledClass"); + super.testStyleClass(item, disabledClass); } @Test @@ -108,7 +110,7 @@ @Test public void testLeftIconClass() { - super.testStyleClass(leftIcon, "leftIconClass"); + super.testStyleClass(leftIcon, leftIconClass); } @Test @@ -156,7 +158,7 @@ @Test @RegressionTest("https://issues.jboss.org/browse/RF-10519") public void testRightIconClass() { - super.testStyleClass(rightIcon, "rightIconClass"); + super.testStyleClass(rightIcon, rightIconClass); } @Test @@ -199,7 +201,7 @@ @Test public void testStyleClass() { - super.testStyleClass(item, "styleClass"); + super.testStyleClass(item); } private void verifyStandardIcons(ElementLocator<JQueryLocator> input, ElementLocator<JQueryLocator> icon, ElementLocator<JQueryLocator> image, String classSuffix) { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPickList/TestPickList.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -659,7 +659,7 @@ @Test public void testStyleClass() { - testStyleClass(pickListTop, "styleClass"); + testStyleClass(pickListTop); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richPopupPanel/TestRichPopupPanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -23,6 +23,8 @@ import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.controlsClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.headerClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -183,7 +185,7 @@ @Test public void testControlsClass() { - testStyleClass(pjq("div[id$=popupPanel_header_controls]"), "controlsClass"); + testStyleClass(pjq("div[id$=popupPanel_header_controls]"), controlsClass); } @Test @@ -218,7 +220,7 @@ @Test public void testHeaderClass() { - testStyleClass(header, "headerClass"); + testStyleClass(header, headerClass); } @Test @@ -476,7 +478,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-10245") public void testStyleClass() { - testStyleClass(panelContainer, "styleClass"); + testStyleClass(panelContainer); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarStatic.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarStatic.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richProgressBar/TestProgressBarStatic.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,6 +25,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; @@ -112,12 +113,12 @@ @Test public void testFinishClass() { - testStyleClass(pjq("div.rf-pb-fin"), "finishClass"); + testStyleClass(pjq("div.rf-pb-fin"), finishClass); } @Test public void testInitialClass() { - testStyleClass(pjq("div.rf-pb-init"), "initialClass"); + testStyleClass(pjq("div.rf-pb-init"), initialClass); } @Test @@ -160,12 +161,12 @@ @Test public void testProgressClass() { - testStyleClass(progress, "progressClass"); + testStyleClass(progress, progressClass); } @Test public void testRemainingClass() { - testStyleClass(remain, "remainingClass"); + testStyleClass(remain, remainingClass); } @Test @@ -175,7 +176,7 @@ @Test public void testStyleClass() { - testStyleClass(progressBar, "styleClass"); + testStyleClass(progressBar); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richSelect/TestRichSelect.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -25,6 +25,7 @@ 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.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.listClass; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -233,7 +234,7 @@ @Test @IssueTracking("https://issues.jboss.org/browse/RF-9735") public void testListClass() { - testStyleClass(popup, "listClass"); + testStyleClass(popup, listClass); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTab/TestRichTab.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -346,7 +346,7 @@ @Test public void testStyleClass() { - testStyleClass(tab, "styleClass"); + testStyleClass(tab); } @Test 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-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTabPanel/TestRichTabPanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -285,7 +285,7 @@ @Test public void testStyleClass() { - testStyleClass(panel, "styleClass"); + testStyleClass(panel); } @Test 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-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanel/TestRichTogglePanel.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -314,7 +314,7 @@ @Test public void testStyleClass() { - testStyleClass(panel, "styleClass"); + testStyleClass(panel); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTogglePanelItem/TestRichTogglePanelItem.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -189,7 +189,7 @@ @Test public void testStyleClass() { - testStyleClass(item1, "styleClass"); + testStyleClass(item1); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbar/TestRichToolbar.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -24,6 +24,8 @@ import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.itemClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.itemStyle; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -90,7 +92,7 @@ @Test @Use(field = "item", value = "items") public void testItemClass() { - testStyleClass(item, "itemClass"); + testStyleClass(item, itemClass); } @Test @@ -152,7 +154,7 @@ @Test @Use(field = "item", value = "items") public void testItemStyle() { - testStyle(item, "itemStyle"); + testStyle(item, itemStyle); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richToolbarGroup/TestRichToolbarGroup.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -24,6 +24,8 @@ import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.locator.option.OptionLocatorFactory.optionLabel; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.itemClass; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.itemStyle; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -89,7 +91,7 @@ @Use(field = "item", value = "items") @RegressionTest("https://issues.jboss.org/browse/RF-9976") public void testItemClass() { - testStyleClass(item, "itemClass"); + testStyleClass(item, itemClass); } @Test @@ -158,7 +160,7 @@ @Use(field = "item", value = "items") @RegressionTest("https://issues.jboss.org/browse/RF-9976") public void testItemStyle() { - testStyle(item, "itemStyle"); + testStyle(item, itemStyle); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTooltip/TestTooltipSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -354,7 +354,7 @@ @Test public void testStyleClass() { - super.testStyleClass(tooltip, "styleClass"); + super.testStyleClass(tooltip); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTree/TestTreeSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -41,6 +41,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.richfaces.tests.metamer.ftest.BasicAttributes.*; import java.net.URL; @@ -129,25 +130,25 @@ @Test public void testHandleClass() { expandAll(); - super.testStyleClass(tree.getAnyNode().getHandle(), "handleClass"); + super.testStyleClass(tree.getAnyNode().getHandle(), handleClass); } @Test public void testIconClass() { expandAll(); - super.testStyleClass(tree.getAnyNode().getIcon(), "iconClass"); + super.testStyleClass(tree.getAnyNode().getIcon(), iconClass); } @Test public void testLabelClass() { expandAll(); - super.testStyleClass(tree.getAnyNode().getLabel(), "labelClass"); + super.testStyleClass(tree.getAnyNode().getLabel(), labelClass); } @Test public void testNodeClass() { expandAll(); - super.testStyleClass(tree.getAnyNode().getTreeNode(), "nodeClass"); + super.testStyleClass(tree.getAnyNode().getTreeNode(), nodeClass); } @Test @@ -282,7 +283,7 @@ @Test public void testStyleClass() { - this.testStyleClass(tree, "styleClass"); + this.testStyleClass(tree); } @Test Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-09-22 13:36:17 UTC (rev 22732) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeNode/TestTreeNodeSimple.java 2011-09-22 13:39:31 UTC (rev 22733) @@ -264,7 +264,7 @@ @Test public void testStyleClass() { - super.testStyleClass(treeNode.getTreeNode(), "styleClass"); + super.testStyleClass(treeNode.getTreeNode()); } @Test