Author: lfryc(a)redhat.com Date: 2011-02-16 07:46:40 -0500 (Wed, 16 Feb 2011) New Revision: 21687 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropListenerBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java Log: dropTarget - added tests @execute, @immediate, @bypassUpdates - removed issue tracking for (RF-10334, RF-10535) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropListenerBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropListenerBean.java 2011-02-16 12:45:40 UTC (rev 21686) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDropListenerBean.java 2011-02-16 12:46:40 UTC (rev 21687) @@ -43,6 +43,8 @@ private RichDropTargetBean richDropTargetBean; public void processDragging(DropEvent dropEvent) { + RichBean.logToPage("* dropListener"); + DragValue dragValue = (DragValue) dropEvent.getDragValue(); DropValue dropValue = (DropValue) dropEvent.getDropValue(); Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-16 12:45:40 UTC (rev 21686) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDropTarget/simple.xhtml 2011-02-16 12:46:40 UTC (rev 21687) @@ -86,6 +86,7 @@ acceptedTypes="#{richDropTargetBean.attributes['acceptedTypes'].value}" bypassUpdates="#{richDropTargetBean.attributes['bypassUpdates'].value}" immediate="#{richDropTargetBean.attributes['immediate'].value}" + execute="#{richDropTargetBean.attributes['execute'].value}" render="#{richDropTargetBean.attributes['render'].value}" rendered="#{richDropTargetBean.attributes['rendered'].value}" value="#{richDropTargetBean.attributes['value'].value}" Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java 2011-02-16 12:45:40 UTC (rev 21686) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/DropTargetAttributes.java 2011-02-16 12:46:40 UTC (rev 21687) @@ -39,4 +39,16 @@ public void setRendered(Boolean rendered) { setProperty("rendered", rendered); } + + public void setExecute(String execute) { + setProperty("execute", execute); + } + + public void setImmediate(Boolean immediate) { + setProperty("immediate", immediate); + } + + public void setBypassUpdates(Boolean bypassUpdates) { + setProperty("bypassUpdates", bypassUpdates); + } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-02-16 12:45:40 UTC (rev 21686) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richDropTarget/TestDropTarget.java 2011-02-16 12:46:40 UTC (rev 21687) @@ -21,6 +21,12 @@ *******************************************************************************/ package org.richfaces.tests.metamer.ftest.richDropTarget; +import static javax.faces.event.PhaseId.ANY_PHASE; +import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES; +import static javax.faces.event.PhaseId.INVOKE_APPLICATION; +import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS; +import static javax.faces.event.PhaseId.RESTORE_VIEW; +import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES; import static org.jboss.test.selenium.locator.LocatorFactory.jq; import static org.jboss.test.selenium.utils.URLUtils.buildUrl; import static org.richfaces.tests.metamer.ftest.richDragIndicator.Indicator.IndicatorState.ACCEPTING; @@ -29,7 +35,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import java.net.URL; @@ -138,21 +143,39 @@ } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10334") public void testExecute() { - fail("not working currently"); + attributes.setExecute("executeChecker"); + + testAcception(drg1, ACCEPTING); + drag.drop(); + + phaseInfo.assertListener(UPDATE_MODEL_VALUES, "executeChecker"); + phaseInfo.assertListener(INVOKE_APPLICATION, "dropListener"); + phaseInfo.assertPhases(ANY_PHASE); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10334") + @IssueTracking("https://issues.jboss.org/browse/RF-10535") public void testImmediate() { - fail("not working currently"); + attributes.setImmediate(true); + + testAcception(drg1, ACCEPTING); + drag.drop(); + + phaseInfo.assertListener(APPLY_REQUEST_VALUES, "dropListener"); + phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES); } @Test - @IssueTracking("https://issues.jboss.org/browse/RF-10334") + @IssueTracking("https://issues.jboss.org/browse/RF-10535") public void testBypassUpdates() { - fail("not working currently"); + attributes.setBypassUpdates(true); + + testAcception(drg1, ACCEPTING); + drag.drop(); + + phaseInfo.assertListener(PROCESS_VALIDATIONS, "dropListener"); + phaseInfo.assertPhases(RESTORE_VIEW, APPLY_REQUEST_VALUES, PROCESS_VALIDATIONS); } private void testAcceptedDropping(Draggable draggable) {