9:21 a.m.
Author: andrei_exadel
Date: 2008-10-14 10:21:20 -0400 (Tue, 14 Oct 2008)
New Revision: 10744
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/_templates/
trunk/test-applications/seleniumTest/richfaces/src/main/_templates/autoTestPageTemplate.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java
Log:
Ajax Command Link: nested params test
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/_templates/autoTestPageTemplate.xhtml
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/_templates/autoTestPageTemplate.xhtml
(rev 0)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/_templates/autoTestPageTemplate.xhtml 2008-10-14
14:21:20 UTC (rev 10744)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <rich:componentName id="componentId"
+ actionListener="#{autoTestBean.actionListener}"
+ immediate="#{autoTestBean.immediate}"
+ ajaxSingle="#{autoTestBean.ajaxSingle}"
+ reRender="#{autoTestBean.reRender}"
+ limitToList="#{autoTestBean.limitToList}"
+ bypassUpdates="#{autoTestBean.bypassUpdate}"
+ rendered="#{autoTestBean.rendered}"
+ oncomplete="#{autoTestBean.oncomplete}"
+ >
+ <f:param name="parameter1" value="value1" />
+ <f:actionListener type="org.ajax4jsf.autotest.bean.AutoTestListener"
/>
+ </rich:componentName>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
===================================================================
(Binary files differ)
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml
(rev 0)
+++
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml 2008-10-14
14:21:20 UTC (rev 10744)
@@ -0,0 +1,29 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <a4j:commandLink id="componentId"
+ actionListener="#{autoTestBean.actionListener}"
+ immediate="#{autoTestBean.immediate}"
+ ajaxSingle="#{autoTestBean.ajaxSingle}"
+ reRender="#{autoTestBean.reRender}"
+ limitToList="#{autoTestBean.limitToList}"
+ bypassUpdates="#{autoTestBean.bypassUpdate}"
+ rendered="#{autoTestBean.rendered}"
+ oncomplete="#{autoTestBean.oncomplete}"
+ value="Link"
+ >
+ <f:param name="parameter1" value="value1" />
+ <f:param name="parameter2" value="value2" />
+ <f:param name="parameter3" value="value3" />
+ <f:actionListener type="org.ajax4jsf.autotest.bean.AutoTestListener"
/>
+ </a4j:commandLink>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-14
13:57:39 UTC (rev 10743)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2008-10-14
14:21:20 UTC (rev 10744)
@@ -1001,6 +1001,7 @@
/**
* Control action that should force ajax request from the component.
+ * This method should wait for ajax completion
* This method should be overridden for auto test
*/
public void sendAjax() {
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2008-10-14
13:57:39 UTC (rev 10743)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2008-10-14
14:21:20 UTC (rev 10744)
@@ -1,12 +1,31 @@
package org.richfaces.testng;
+import java.util.HashMap;
+import java.util.Map;
+
import org.ajax4jsf.template.Template;
+import org.richfaces.AutoTester;
import org.richfaces.SeleniumTestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
public class AjaxCommandLinkTest extends SeleniumTestBase {
+
+ private static Map<String, String> parameter = new HashMap<String,
String>();
+ static {
+ parameter.put("parameter1", "value1");
+ parameter.put("parameter2", "value2");
+ parameter.put("parameter3", "value3");
+ }
+
+ @Test
+ public void testNestedParams (Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, null);
+
+ tester.testRequestParameters(parameter);
+ }
@Test
public void testAjaxCommandLinkComponent(Template template) {
@@ -105,5 +124,15 @@
public String getTestUrl() {
return "pages/ajaxCommandLink/ajaxLinkTest.xhtml";
}
-
+
+ @Override
+ public String getAutoTestUrl() {
+ return "pages/ajaxCommandLink/ajaxCommandLinkAutoTest.xhtml";
+ }
+
+ @Override
+ public void sendAjax() {
+ clickAjaxCommandAndWait(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID));
+ }
+
}