Author: andrei_exadel Date: 2009-01-23 07:45:58 -0500 (Fri, 23 Jan 2009) New Revision: 12380 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java Log: RF-5814, RF-5811 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-01-23 10:04:27 UTC (rev 12379) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-01-23 12:45:58 UTC (rev 12380) @@ -45,7 +45,7 @@ public static final String INPUT_TEXT = "Text"; public static final String STATUS_ID = "_auto_status"; - + public static final String UPDATE_MODEL_STATUS = "UpdateModel"; public static final String PROCESS_INPUT_UPDATE_MODEL = "ProcessInputUpdateModel"; @@ -487,7 +487,7 @@ } public String getProcess() { - return "_auto_process_input"; + return (processSet) ? "_auto_process_input" : "_auto_input"; } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml 2009-01-23 10:04:27 UTC (rev 12379) +++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dropDownMenu/dropDownMenuAutoTest.xhtml 2009-01-23 12:45:58 UTC (rev 12380) @@ -17,11 +17,13 @@ immediate="#{autoTestBean.immediate}" ajaxSingle="#{autoTestBean.ajaxSingle}" value="New" + process="#{autoTestBean.process}" action="#{ddmenuBean.doNew}" - actionListener="#{autoTestBean.actionListener}"> + actionListener="#{autoTestBean.actionListener}" + oncomplete="#{autoTestBean.oncomplete}"> <h:inputText id="inputRequired" value="#{ddmenuBean.input}" style="display: none" required="true"></h:inputText> + <f:param name="parameter1" value="value1" /> </rich:menuItem> - <f:param name="parameter1" value="value1" /> </rich:dropDownMenu> </ui:define> </ui:composition> Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-01-23 10:04:27 UTC (rev 12379) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-01-23 12:45:58 UTC (rev 12380) @@ -149,6 +149,21 @@ } + public void testAjaxSingleWithProcesExternalValidation(boolean checkListener) { + reset(); + setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE); + clickLoad(); + + setExtrenalValidationFailed(); + base.sendAjax(); + + if (checkListener) { + checkActionListener(false); + } + checkUpdateModel(false); + + } + public void testAjaxSingle(boolean checkListener) { reset(); setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE);