Author: ppitonak(a)redhat.com Date: 2012-01-04 06:25:38 -0500 (Wed, 04 Jan 2012) New Revision: 23122 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestDateEditor.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java Log: tests for rich:menuGroup and rich:calendar fixed Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestDateEditor.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestDateEditor.java 2012-01-03 16:54:55 UTC (rev 23121) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richCalendar/TestDateEditor.java 2012-01-04 11:25:38 UTC (rev 23122) @@ -67,8 +67,8 @@ } for (int i = 0; i < 10; i++) { - assertTrue(selenium.isElementPresent(dateEditorYears.format(i)), "Date editor doesn't contain label for year " + (2007 + i)); - assertEquals(selenium.getText(dateEditorYears.format(i)), Integer.toString(2007 + i), "Label of year"); + assertTrue(selenium.isElementPresent(dateEditorYears.format(i)), "Date editor doesn't contain label for year " + (2008 + i)); + assertEquals(selenium.getText(dateEditorYears.format(i)), Integer.toString(2008 + i), "Label of year"); if (currentYear.equals(selenium.getText(dateEditorYears.format(i)))) { assertTrue(selenium.belongsClass(dateEditorYears.format(i), "rf-cal-edtr-btn-sel"), "Current year should be selected."); 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 2012-01-03 16:54:55 UTC (rev 23121) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuGroup/TestRichMenuGroup.java 2012-01-04 11:25:38 UTC (rev 23122) @@ -54,8 +54,8 @@ private JQueryLocator fileMenuList = pjq("div[id$=menu1_list]"); private JQueryLocator group = pjq("div[id$=menuGroup4]"); private JQueryLocator groupList = pjq("div[id$=menuGroup4_list]"); - private JQueryLocator icon = group.getDescendant(jq("> span.rf-ddm-itm-ic img")); - private JQueryLocator emptyIcon = group.getDescendant(jq("> span.rf-ddm-itm-ic > div.rf-ddm-emptyIcon")); + private JQueryLocator icon = group.getDescendant(jq("> div.rf-ddm-itm-ic img")); + private JQueryLocator emptyIcon = group.getDescendant(jq("> div.rf-ddm-itm-ic > div.rf-ddm-emptyIcon")); private JQueryLocator label = group.getDescendant(jq("span.rf-ddm-itm-lbl")); private JQueryLocator menuItem41 = pjq("div[id$=menuItem41]");