[richfaces-svn-commits] JBoss Rich Faces SVN: r15539 - in branches/community/3.3.X/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.

Author: konstantin.mishin Date: 2009-09-11 08:25:14 -0400 (Fri, 11 Sep 2009) New Revision: 15539 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/pages/pickList/layoutTest.xhtml branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColorPickerTest.java branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java Log: RFPL-143 Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/main/webapp/pages/pickList/layoutTest.xhtml =================================================================== (Binary files differ) Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColorPickerTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColorPickerTest.java 2009-09-11 10:15:05 UTC (rev 15538) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ColorPickerTest.java 2009-09-11 12:25:14 UTC (rev 15539) @@ -40,7 +40,7 @@ // private String message; private void init(Template template) { - renderPage(null, template, "#{comboBean.init}"); + renderPage(null, template, "#{colorPickerBean.init}"); String mainForm = getParentId() + "autoTestForm"; colorPicker = mainForm + ":componentId"; @@ -159,7 +159,7 @@ Assert.assertTrue(isVisible(hexInputId), "Hex Input must be presented"); Assert.assertEquals("#" + selenium.getValue(hexInputId), expectedValue); - final String xPathButtonOk = "xpath=id('" + colorPickerList + "')//button[@name='submit']"; + final String xPathButtonOk = "xpath=id('" + colorPickerList + "')//button[@class='rich-color-picker-submit']"; Assert.assertTrue(isVisible(xPathButtonOk), "Button Cancel must be presented"); selenium.click(xPathButtonOk); Modified: branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java =================================================================== --- branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java 2009-09-11 10:15:05 UTC (rev 15538) +++ branches/community/3.3.X/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/PickListTest.java 2009-09-11 12:25:14 UTC (rev 15539) @@ -65,12 +65,12 @@ writeStatus("Check move controls customized labels"); - AssertTextEquals(copyElemId, "MOVE"); + AssertTextEquals(pickListId + "dis" + COPY_BTN, "MOVE"); AssertTextEquals(copyAllElemId, "MOVE ALL"); - AssertTextEquals(removeElemId, "TAKE AWAY"); + AssertTextEquals(pickListId + "dis" + REMOVE_BTN, "TAKE AWAY"); AssertTextEquals(removeAllElemId, "TAKE ALL AWAY"); - String destListId = parentId + PICK_LIST + "tlTbody"; + String destListId = parentId + PICK_LIST + "tltbody"; String srcListId = parentId + PICK_LIST + "tbody"; writeStatus("Check initial disposition"); @@ -341,9 +341,9 @@ String pickListId = getParentId() + "_form:" + PICK_LIST; - String copyElemId = pickListId + COPY_BTN; + String copyElemId = pickListId + "dis" + COPY_BTN; String copyAllElemId = pickListId + COPY_ALL_BTN; - String removeElemId = pickListId + REMOVE_BTN; + String removeElemId = pickListId + "dis" + REMOVE_BTN; String removeAllElemId = pickListId + REMOVE_ALL_BTN; writeStatus("This test page forces German locale. Check all labels are in German"); @@ -383,7 +383,7 @@ writeStatus("Check styleClass/style attributes"); String pickListId = getAutoTester(this).getClientId(AutoTester.COMPONENT_ID); - assertStyleAttributeContains(pickListId, "font-size: 13px", "Style attribute was not output to client"); + assertStyleAttributeContains(pickListId, "font-weight: bold;", "Style attribute was not output to client"); assertClassAttributeContains(pickListId, "noclass", "Class attribute was not output to client"); writeStatus("Check listClass attributes");