Author: abelevich
Date: 2009-03-27 06:42:38 -0400 (Fri, 27 Mar 2009)
New Revision: 13246
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceSelectTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplacesTest.java
Log:
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java 2009-03-27
10:30:55 UTC (rev 13245)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceInputTest.java 2009-03-27
10:42:38 UTC (rev 13246)
@@ -37,8 +37,6 @@
private static final String INPLACE_INPUT_FIELD_POSTFIX = "tempValue";
- private final static String EVENT_TEST_RESULT_FAILED_TEXT = "No";
-
private final static String EVENT_TEST_RESULT_PASSED_TEXT = "Passed";
private static final String INPLACE_INPUT_PAGE = "inplaceInputTest.xhtml";
@@ -47,10 +45,17 @@
private static final String DEFAULTLABEL_AND_SPACES_PAGE_ID_PREFIX =
"_dfas";
+ private static final String PROCESSING_INVALID_VALUE_PAGE =
"testProcessingInvalidValue.xhtml";
+
+ private static final String PROCESSING_INVALID_VALUE_ID_PREFIX = "_tpiv";
+
+ private final static String INPLACE_INPUT_RESET_METHOD =
"#{inplaceInputBean.reset}";
+
+
@Test
public void testInplaceInputComponentLayout(Template template) {
setTestUrl(INPLACE_INPUT_PAGE);
- renderPage(template);
+ renderPage(template, INPLACE_INPUT_RESET_METHOD);
writeStatus("Check component layout");
String inplaceInputS = getParentId() + "_form:" +
INPLACE_INPUT_SIMPLE;
@@ -69,21 +74,20 @@
@Test
public void testInplaceInputClientAPI(Template template) {
setTestUrl(INPLACE_INPUT_PAGE);
- renderPage(template);
+ renderPage(template,INPLACE_INPUT_RESET_METHOD);
writeStatus("Check component client API");
}
@Test
public void testInplaceInputEvents(Template template) {
setTestUrl(INPLACE_INPUT_PAGE);
- renderPage(template);
+ renderPage(template, INPLACE_INPUT_RESET_METHOD);
writeStatus("Check component event triggering");
String inplaceInputS = getParentId() + "_form:" +
INPLACE_INPUT_SIMPLE;
String inplaceInputD = getParentId() + "_form:" +
INPLACE_INPUT_DECORATED;
String inplaceInputDOk = getParentId() + "_form:" +
INPLACE_INPUT_DECORATED_OK;
- String inplaceInputDCancel = getParentId() + "_form:" +
INPLACE_INPUT_DECORATED_CANCEL;
writeStatus("Click first component being tested");
@@ -101,6 +105,7 @@
selenium.doubleClick(inplaceInputD);
AssertTextEquals(inplaceInputD + "_edit",
EVENT_TEST_RESULT_PASSED_TEXT, "oneditactivated event is not fired");
+
type(inplaceInputSInput, "Hello");
writeStatus("Stop editing second component being tested");
@@ -113,7 +118,7 @@
@Test
public void testInplaceInputKeyAttributes(Template template) {
setTestUrl(INPLACE_INPUT_PAGE);
- renderPage(template);
+ renderPage(template, INPLACE_INPUT_RESET_METHOD);
String inplaceInputS = getParentId() + "_form:" +
INPLACE_INPUT_SIMPLE;
String inplaceInputD = getParentId() + "_form:" +
INPLACE_INPUT_DECORATED;
@@ -137,7 +142,7 @@
@Test
public void testInplaceInputComponentCore(Template template) {
setTestUrl(INPLACE_INPUT_PAGE);
- renderPage(template);
+ renderPage(template, INPLACE_INPUT_RESET_METHOD);
String inplaceInputD = getParentId() + "_form:" +
INPLACE_INPUT_DECORATED;
String inplaceInputDInput = inplaceInputD + INPLACE_INPUT_FIELD_POSTFIX;
@@ -187,9 +192,27 @@
CommonUtils.getFailedTestMessage(iid));
typeAndCheck(iid, " ", "defaultLabel");
- //typeAndCheck(iid, "test", "test");
}
+/**
+ * Component displays submitted value after
+ * submission of invalid value
+ *
+ * @param template - current template
+ */
+ @Test
+ public void testProcessingInvalidValue(Template template) {
+ setTestUrl(PROCESSING_INVALID_VALUE_PAGE);
+ init(template);
+
+ String iid = inplaceId + PROCESSING_INVALID_VALUE_ID_PREFIX;
+ String newValue = "Aspen";
+ setValue(iid, newValue);
+ clickAjaxCommandAndWait(buttonId + PROCESSING_INVALID_VALUE_ID_PREFIX);
+ String value = getTextById(iid);
+ Assert.assertTrue(value.endsWith(newValue));
+ }
+
@Override
public void setTestUrl(String testUrl) {
this.testUrl = "pages/inplaceInput/" + testUrl;
@@ -202,9 +225,9 @@
iTempValuePx = "tempValue";
}
- protected void setValue(String id, String newValue) {
- selenium.runScript("($('" + id +
"')).component.setValue(\"\", {value: \""+ newValue +
"\"})");
- //type(id, newValue);
+ @Override
+ protected void renderPage(Template template) {
+ renderPage(template,INPLACE_INPUT_RESET_METHOD);
}
@Override
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceSelectTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceSelectTest.java 2009-03-27
10:30:55 UTC (rev 13245)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplaceSelectTest.java 2009-03-27
10:42:38 UTC (rev 13246)
@@ -21,40 +21,47 @@
package org.richfaces.testng;
import org.ajax4jsf.template.Template;
+import org.richfaces.testng.util.CommonUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
public class InplaceSelectTest extends InplacesTest {
+ private final String INPLACE_SELECT_PAGE = "inplaceSelectTest.xhtml";
+
+ private final String INPLACE_SELECT_RESET_METHOD =
"#{inplaceSelectBean.reset}";
+
@Test
public void testInplaceSelectComponent(Template template) {
- renderPage(template);
-
+
+ setTestUrl(INPLACE_SELECT_PAGE);
+
+ renderPage(template, INPLACE_SELECT_RESET_METHOD);
+
String parentId = getParentId() + "_form:";
String inplaceSelectId = parentId + "inplaceSelect";
String okButton = parentId + "inplaceSelect" + "ok";
- //String inplaceTmpValueElemId = parentId + "inplaceSelect" +
"inplaceTmpValue";
String cancelButton = parentId + "inplaceSelect" + "cancel";
- String popupId = "list" + inplaceSelectId;
+ String popupId = inplaceSelectId + "list";
writeStatus("click the component");
clickById(inplaceSelectId);
- Assert.assertFalse(isVisibleById(popupId), "Component pop-up should not show
up on solitary click");
+ Assert.assertFalse(isVisible(popupId), "Component pop-up should not show up
on solitary click");
writeStatus("double click the component");
selenium.doubleClick(inplaceSelectId);
- Assert.assertTrue(isVisibleById(popupId), "Component pop-up should show up
on double click");
+ Assert.assertTrue(isVisible(popupId), "Component pop-up should show up on
double click");
writeStatus("Check that controls buttons are present");
- Assert.assertTrue(isPresentById(okButton));
- Assert.assertTrue(isPresentById(cancelButton));
+ Assert.assertTrue(isPresent(okButton));
+ Assert.assertTrue(isPresent(cancelButton));
writeStatus("Select second element"); //Birch
- selenium.mouseMove("xpath=//div[@id='list" + inplaceSelectId +
"']/span[2]");
+ selenium.mouseMove("xpath=//div[@id='" + inplaceSelectId +
"list" + "']/span[2]");
selenium.mouseDown(okButton);
writeStatus("Check that a new element is selected");
@@ -65,7 +72,7 @@
selenium.doubleClick(inplaceSelectId);
- selenium.mouseMove("xpath=//div[@id='list" + inplaceSelectId +
"']/span[3]");
+ selenium.mouseMove("xpath=//div[@id='" + inplaceSelectId +
"list']/span[3]");
selenium.mouseDown(cancelButton);
writeStatus("Cancel selected value.");
@@ -73,31 +80,47 @@
writeStatus("Verify javascript event triggering");
- runScript("theLatestEvent='undefined'");
-
writeStatus("Double click the component");
selenium.doubleClick(inplaceSelectId);
- Assert.assertEquals(runScript("theLatestEvent"),
"editactivated", "editactivated event has not been triggered");
+ assertEvent("oneditactivated");
writeStatus("Stop editing with ok");
selenium.mouseDown(okButton);
- Assert.assertEquals(runScript("theLatestEvent"),
"viewactivated", "viewactivated event has not been triggered");
-
- writeStatus("Stop editing with cancel");
- selenium.mouseDown(cancelButton);
- Assert.assertEquals(runScript("theLatestEvent"),
"viewactivated", "viewactivated event has not been triggered");
+ assertEvent("onviewactivated");
+
}
-
- protected void testJSApiSetValue() {
- selenium.getEval("window.inplace.setValue(\"\", {itemValue:
\"JSApi\", itemLabel : \"JSApi\"})");
-
Assert.assertTrue("JSApi".equals(selenium.getEval("window.inplace.getValue()")));
+
+ @Test
+ public void testJSApi(Template template) {
+ setTestUrl(JS_API_PAGE);
+ init(template);
+
+ String iid = inplaceId + JS_API_ID_PREFIX;
+ Assert.assertTrue("test".equals(getValue(iid)));
+
+ setValue(iid, "999");
+ Assert.assertTrue("999".equals(getValue(iid)));
+
+ setValue(iid, "Aspen");
+ Assert.assertTrue("Aspen".equals(getValue(iid)),
CommonUtils.getFailedTestMessage(iid));
+
+ edit(iid);
+
+ selenium.click("xpath=//div[@id='" + iid +
"list']/span[4]");
+ cancel(iid);
+ Assert.assertEquals("Aspen".equals(getValue(iid)),
CommonUtils.getFailedTestMessage(iid));
}
-
+
@Override
public void setTestUrl(String testUrl) {
this.testUrl = "pages/inplaceSelect/" + testUrl;
}
+
+ @Override
+ protected void renderPage(Template template) {
+ renderPage(template, INPLACE_SELECT_RESET_METHOD);
+ }
public void initIds() {
super.initIds();
@@ -106,7 +129,4 @@
iTempValuePx = "inplaceTmpValue";
}
- protected void setValue(String id, String newValue) {
- selenium.runScript("($('" + id +
"')).component.setValue(\"\", {itemValue: \""+ newValue +
"\", itemLabel : \"" + newValue + "\"})");
- }
}
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplacesTest.java
===================================================================
---
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplacesTest.java 2009-03-27
10:30:55 UTC (rev 13245)
+++
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/InplacesTest.java 2009-03-27
10:42:38 UTC (rev 13246)
@@ -20,6 +20,7 @@
*/
package org.richfaces.testng;
+import java.awt.image.renderable.RenderContext;
import java.util.ArrayList;
import java.util.List;
@@ -80,14 +81,10 @@
private static final String VALUE_CHANGE_LISTENER_ID_PREFIX = "_tvcl";
- private static final String PROCESSING_INVALID_VALUE_PAGE =
"testProcessingInvalidValue.xhtml";
+ protected static final String JS_API_PAGE = "testJSApi.xhtml";
- private static final String PROCESSING_INVALID_VALUE_ID_PREFIX = "_tpiv";
+ protected static final String JS_API_ID_PREFIX = "_tja";
- private static final String JS_API_PAGE = "testJSApi.xhtml";
-
- private static final String JS_API_ID_PREFIX = "_tja";
-
private static final String RENDERED_ATTRIBUTE_PAGE =
"testRenderedAttribute.xhtml";
private static final String RENDERED_ATTRIBUTE_ID_PREFIX = "_tra";
@@ -173,23 +170,6 @@
clickById(iid);
Assert.assertEquals(isVisible(iid + SHOW_CONTROLS_ATTRIBUTE_BAR), false,
"showControls='false' but controls are visible");
-// check(!isVisible(iid + SHOW_CONTROLS_ATTRIBUTE_BAR),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
-// delay(1000);
-// String clip = getStyleAttributeString(iid + iTempValuePx, "clip");
-// check(("rect(auto, auto, auto, auto)".equals(clip)) || ("rect(auto
auto auto auto)".equals(clip)),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
-// //selenium.fireEvent(iid + iTempValuePx, "blur");
-// selenium.focus(buttonId + SHOW_CONTROLS_ATTRIBUTE1_PAGE_ID_PREFIX);
-//
-// delay(1000);
-//
-// clip = getStyleAttributeString(iid + iTempValuePx, "clip");
-// check(("rect(0px, 0px, 0px, 0px)".equals(clip)) || ("rect(0px 0px
0px 0px)".equals(clip)),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
}
/**
@@ -207,21 +187,6 @@
clickById(iid);
Assert.assertEquals(isVisible(iid + SHOW_CONTROLS_ATTRIBUTE_BAR), true,
"showControls='true' but controls are not visible");
-
-
-// check(isVisible(iid + SHOW_CONTROLS_ATTRIBUTE_BAR),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
-//
-// String clip = getStyleAttributeString(iid + iTempValuePx, "clip");
-// check(("rect(auto, auto, auto, auto)".equals(clip)) || ("rect(auto
auto auto auto)".equals(clip)),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
-// selenium.focus(buttonId + SHOW_CONTROLS_ATTRIBUTE2_PAGE_ID_PREFIX);
-// clip = getStyleAttributeString(iid + iTempValuePx, "clip");
-// check(("rect(auto, auto, auto, auto)".equals(clip)) || ("rect(auto
auto auto auto)".equals(clip)),
-// CommonUtils.getSuccessfulTestMessage(iid),
-// CommonUtils.getFailedTestMessage(iid));
}
/**
@@ -269,7 +234,10 @@
check("Value isn't correct!".equals(getTextById(messageId +
VALIDATOR_PAGE_ID_PREFIX + "1")),
CommonUtils.getSuccessfulTestMessage(iid + "1"),
CommonUtils.getFailedTestMessage(iid + "1"));
-
+
+ setValue(iid + "1", "Pine");
+ setValue(iid + "2", "Pine");
+
clickById(buttonId + VALIDATOR_PAGE_ID_PREFIX + "2");
waitForAjaxCompletion();
check("Value isn't correct!".equals(getTextById(messageId +
VALIDATOR_PAGE_ID_PREFIX + "2")),
@@ -353,28 +321,6 @@
}
/**
- * Component displays submitted value after
- * submission of invalid value
- *
- * @param template - current template
- */
- @Test
- public void testProcessingInvalidValue(Template template) {
- setTestUrl(PROCESSING_INVALID_VALUE_PAGE);
- init(template);
-
- String iid = inplaceId + PROCESSING_INVALID_VALUE_ID_PREFIX;
- String newValue = "Aspen";
- setValue(iid, newValue);
- clickById(buttonId + PROCESSING_INVALID_VALUE_ID_PREFIX);
- waitForAjaxCompletion();
- String value = getTextById(iid);
- check(value.endsWith(newValue),
- CommonUtils.getSuccessfulTestMessage(iid),
- CommonUtils.getFailedTestMessage(iid));
- }
-
- /**
* Verify JS API of the component
*
* @param template - current template
@@ -383,38 +329,28 @@
public void testJSApi(Template template) {
setTestUrl(JS_API_PAGE);
init(template);
-
+
String iid = inplaceId + JS_API_ID_PREFIX;
-
- selenium.runScript("var inplace = ($('" + iid +
"')).component;");
-
Assert.assertTrue("test".equals(selenium.getEval("window.inplace.getValue()")));
+ Assert.assertTrue("test".equals(getValue(iid)));
- //testJSApiSetValue();
setValue(iid, "999");
-
Assert.assertTrue("999".equals(selenium.getEval("window.inplace.getValue()")));
+ Assert.assertTrue("999".equals(getValue(iid)));
- selenium.getEval("window.inplace.edit()");
- String clip = getStyleAttributeString(iid + iTempValuePx, "clip");
- check(("rect(auto, auto, auto, auto)".equals(clip)) || ("rect(auto
auto auto auto)".equals(clip)),
- CommonUtils.getSuccessfulTestMessage(iid),
- CommonUtils.getFailedTestMessage(iid));
-
- setValue(iid, "Aspen");
- Assert.assertEquals("Aspen", getValueById(iid + iTempValuePx),
CommonUtils.getFailedTestMessage(iid));
+ setValue(iid, "Aspen");
+ Assert.assertEquals("Aspen", getValue(iid),
CommonUtils.getFailedTestMessage(iid));
+
+ edit(iid);
+ type(iid + iTempValuePx, "Test");
+ cancel(iid);
- selenium.click(iid);
- selenium.runScript("document.getElementById('" + iid + iTempValuePx +
"').value = '999';");
- selenium.getEval("window.inplace.cancel();");
- Assert.assertEquals("Aspen", getValueById(iid + iTempValuePx),
CommonUtils.getFailedTestMessage(iid));
+ Assert.assertEquals("Aspen", getValue(iid),
CommonUtils.getFailedTestMessage(iid));
}
- protected void testJSApiSetValue() {
- selenium.getEval("window.inplace.setValue(\"\", {value:
\"JSApi\"})");
-
Assert.assertTrue("JSApi".equals(selenium.getEval("window.inplace.getValue()")));
- }
+// protected void testJSApiSetValue() {
+// selenium.getEval("window.inplace.setValue(\"\", {value:
\"JSApi\"})");
+//
Assert.assertTrue("JSApi".equals(selenium.getEval("window.inplace.getValue()")));
+// }
- protected abstract void setValue(String id, String newValue);
-
/**
* Component is present on the page and shows model value
*
@@ -472,7 +408,7 @@
renderPage(template);
initIds();
}
-
+
public void initIds() {
formId = getParentId() + "_form:";
buttonId = formId + "bn";
@@ -486,4 +422,20 @@
public abstract void setTestUrl(String testUrl);
+ protected void setValue(String id, String newValue) {
+ selenium.runScript("$('" + id +
"').component.setValue('" + newValue + "')");
+ }
+
+ protected String getValue(String id) {
+ return runScript("$('" + id + "').component.getValue()");
+ }
+
+ protected void edit(String id) {
+ runScript("$('" + id + "').component.edit()");
+ }
+
+ protected void cancel(String id) {
+ runScript("$('" + id + "').component.cancel()");
+ }
+
}