Author: andrei_exadel Date: 2008-11-20 07:01:53 -0500 (Thu, 20 Nov 2008) New Revision: 11263 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/IndexBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/validation/OrderOfDay.java trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GraphValidatorTest.java Log: RF-4969 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/IndexBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/IndexBean.java 2008-11-20 11:37:14 UTC (rev 11262) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/IndexBean.java 2008-11-20 12:01:53 UTC (rev 11263) @@ -100,7 +100,8 @@ list.add(new ComponentItem("<rich:dragSupport>", "dnd/dndTest.xhtml")); list.add(new ComponentItem("<rich:dropSupport>", "dnd/dndTest.xhtml")); list.add(new ComponentItem("<rich:effect>", "effect/effectTest.xhtml")); - + list.add(new ComponentItem("<rich:graphValidator>", "graphValidator/graphValidatorTest.xhtml")); + sortList(); } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/validation/OrderOfDay.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/validation/OrderOfDay.java 2008-11-20 11:37:14 UTC (rev 11262) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/validation/OrderOfDay.java 2008-11-20 12:01:53 UTC (rev 11263) @@ -38,5 +38,11 @@ } return retVal; } + + @NotNull + @Max(value = 10, message = "Are you sure you have power for this??!!") + public Integer getSportTime() { + return activities.get(0).getTime(); + } } Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GraphValidatorTest.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GraphValidatorTest.java 2008-11-20 11:37:14 UTC (rev 11262) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/GraphValidatorTest.java 2008-11-20 12:01:53 UTC (rev 11263) @@ -81,6 +81,8 @@ String parentId = getParentId() + "_form1:"; String firstCompErrMsg = parentId + "table:0:time" + ERR_MSG_POSTFIX; + String compErrMsg3 = parentId + "table:2:time" + ERR_MSG_POSTFIX; + String saveBtn = parentId + SAVE_BTN; String allMessages = parentId + ALL_MSGS; @@ -90,17 +92,36 @@ AssertTextEquals(allMessages, "Invalid values: Please fill at least one entry"); writeStatus("Check bean properties are validated at validation phase. Type time of sport activity greater than allowed"); - spinnerManualInput("13"); + spinnerManualInput("13", 0); clickAjaxCommandAndWait(saveBtn); assertPresent(firstCompErrMsg); writeStatus("Correct the input and save data again"); - spinnerManualInput("11"); + spinnerManualInput("9", 0); clickAjaxCommandAndWait(saveBtn); assertNotPresent(firstCompErrMsg); - AssertTextEquals(allMessages, "Changes Stored Successfully"); + + spinnerManualInput("17", 0); + spinnerManualInput("10", 1); + spinnerManualInput("17", 2); + spinnerManualInput("10", 3); + clickAjaxCommandAndWait(saveBtn); + assertPresent(firstCompErrMsg); + assertPresent(compErrMsg3); + + spinnerManualInput("11", 0); + spinnerManualInput("10", 1); + spinnerManualInput("10", 2); + spinnerManualInput("10", 3); + clickAjaxCommandAndWait(saveBtn); + AssertTextEquals(allMessages, "Invalid values: Only 24h in a day!Invalid values: Are you sure you have power for this??!!", "All properties validation phase has been skipped "); + + spinnerManualInput("9", 0); + clickAjaxCommandAndWait(saveBtn); + AssertTextEquals(allMessages, "Invalid values: Only 24h in a day!", "All properties validation phase has been skipped "); + } private void assertPresent(String id) { @@ -111,8 +132,8 @@ AssertTextEquals(id, "", "Message [" + id + "] must be empty on the page"); } - private void spinnerManualInput(String value) { - type("xpath=//table[@id='" + getParentId() + "_form1:table:0:time']/tbody/tr/td/input", value); + private void spinnerManualInput(String value, int n) { + type("xpath=//table[@id='" + getParentId() + "_form1:table:"+n+":time']/tbody/tr/td/input", value); } @Override