You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/12/13 23:00:41 UTC
svn commit: r1421571 -
/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml
Author: cframpton
Date: Thu Dec 13 22:00:39 2012
New Revision: 1421571
URL: http://svn.apache.org/viewvc?rev=1421571&view=rev
Log:
Replace WaitForEvent enterFrame with WaitForLayoutManager.
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml?rev=1421571&r1=1421570&r2=1421571&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Events/DataGrid_Events_basic01.mxml Thu Dec 13 22:00:39 2012
@@ -410,21 +410,19 @@
<TestCase testID="event_gridMouseDrag_test02" keywords="['event,gridMouseDrag']" description="Test mouse drag on dataGrid to outside of dataGrid">
- <setup>
-
+ <setup>
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
- <!-- add waiting for enterFrame event since more layout runs after updateComplete -->
- <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
+ <WaitForLayoutManager/>
<RunCode code="eventType=GridEvent.GRID_MOUSE_DRAG" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,mouseGeneralHandler)" />
</setup>
<body>
<DispatchMouseEvent type="{MouseEvent.MOUSE_DOWN}" target="dataGrid.grid" localX="10" localY="20" />
<DispatchMouseEvent type="{MouseEvent.MOUSE_MOVE}" buttonDown="true" target="dataGrid.grid" localX="10" localY="20"/>
- <DispatchMouseEvent type="{MouseEvent.MOUSE_MOVE}" buttonDown="true" target="label1" localX="10" localY="30"/>
+ <DispatchMouseEvent type="{MouseEvent.MOUSE_MOVE}" buttonDown="true" target="label1" localX="10" localY="30"/>
<!-- drag outside of dataGrid -->
<AssertEvent target="dataGrid.grid" eventName="{eventType}" eventClass="spark.events::GridEvent" />
- <AssertMethodValue method="value=verifyGridEvent(createExpectedGridEvent(eventType,-1,0,FlexGlobals.topLevelApplication.dataGrid))" value=""/>
+ <AssertMethodValue method="value=verifyGridEvent(createExpectedGridEvent(eventType,-1,0,FlexGlobals.topLevelApplication.dataGrid))" value=""/>
</body>
</TestCase>
@@ -435,8 +433,7 @@
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.MULTIPLE_ROWS"/>
- <!-- add waiting for enterFrame event since more layout runs after updateComplete -->
- <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
+ <WaitForLayoutManager/>
<RunCode code="eventType=GridCaretEvent.CARET_CHANGE" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,caretChangeHandler)" />
</setup>
@@ -454,7 +451,7 @@
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.MULTIPLE_ROWS"/>
- <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
+ <WaitForLayoutManager/>
<RunCode code="eventType=GridCaretEvent.CARET_CHANGE" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,caretChangeHandler)" />
</setup>
@@ -472,8 +469,7 @@
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.MULTIPLE_ROWS"/>
- <!-- add waiting for enterFrame event since more layout runs after updateComplete -->
- <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
+ <WaitForLayoutManager/>
<RunCode code="eventType=GridCaretEvent.CARET_CHANGE" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,caretChangeHandler)" />
<RunCode code="gridCaretEvt=null" />
@@ -488,8 +484,7 @@
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.SINGLE_ROW"/>
- <!-- add waiting for enterFrame event since more layout runs after updateComplete -->
- <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
+ <WaitForLayoutManager/>
<RunCode code="eventType=GridCaretEvent.CARET_CHANGE" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,caretChangeHandler)" />
</setup>
@@ -507,7 +502,7 @@
<ResetComponent target="dataGrid" className="components.DataGrid_comp1" waitTarget="dataGrid" waitEvent="updateComplete"/>
<RunCode code="FlexGlobals.topLevelApplication.dataGrid.selectionMode=GridSelectionMode.MULTIPLE_CELLS"/>
- <!-- add waiting for enterFrame event since more layout runs after updateComplete -->
+ <WaitForLayoutManager/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
<RunCode code="eventType=GridCaretEvent.CARET_CHANGE" />
<RunCode code="addEvtListener(FlexGlobals.topLevelApplication.dataGrid,eventType,caretChangeHandler)" />