You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2012/10/06 00:53:30 UTC
svn commit: r1394856 - in
/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid:
Properties/ Properties/Baselines/ SWFs/
Author: aharui
Date: Fri Oct 5 22:53:30 2012
New Revision: 1394856
URL: http://svn.apache.org/viewvc?rev=1394856&view=rev
Log:
Try to fix failures on Windows (with smaller screens)
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index2.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index3.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_itemEditor.mxml
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index2.png?rev=1394856&r1=1394855&r2=1394856&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index3.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_navigation_on_ComboBoxEditor_index3.png?rev=1394856&r1=1394855&r2=1394856&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml?rev=1394856&r1=1394855&r2=1394856&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_editable.mxml Fri Oct 5 22:53:30 2012
@@ -1494,6 +1494,8 @@
</TestCase>
<TestCase testID="key_input_ComboBoxEditor_test001" keywords="[DataGrid, Property,Editable]" description="verify input text in editable combobox editor, verify combobox value tried to match the input">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
@@ -1525,6 +1527,8 @@
<TestCase testID="key_navigation_on_ComboBoxEditor" keywords="[DataGrid, Property,Editable]" description="verify key navigation on combobox editor, verify up/down arrow, ctrl+down arrow works as expected">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
@@ -1559,6 +1563,8 @@
</TestCase>
<TestCase testID="comboBoxEditor_close_open" keywords="[DataGrid, Property,Editable]" description="verify combobox can be closed/open with key navigation">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
</setup>
@@ -1586,6 +1592,8 @@
<TestCase testID="mouse_interacting_on_comboBoxEditor" keywords="[DataGrid, Property,Editable]" description="verify mouse clicking navigation on combobox cell editor">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
</setup>
@@ -1611,6 +1619,8 @@
<TestCase testID="mouse_interacting_on_comboBoxEditor_test2" keywords="[DataGrid, Property,Editable]" description="verify mouse clicks on the same selected value">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
</setup>
@@ -1623,7 +1633,8 @@
<DispatchKeyEvent keys="[F2]" waitEvent="enterFrame" waitTarget="stage" />
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
<!-- mouse on the same, selected value -->
- <DispatchMouseClickEvent target="dataGrid7.itemEditorInstance.comboBox.dropDown" localX="22" localY="10" />
+ <DispatchMouseEvent type="mouseDown" target="dataGrid7.itemEditorInstance.comboBox.dropDown" localX="22" localY="10" />
+ <DispatchMouseEvent type="mouseUp" target="dataGrid7" localX="31" localY="81"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
<!-- verify value is committed -->
<AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid7.dataProvider.getItemAt(1).state" value="Alaska"/>
@@ -1633,6 +1644,8 @@
<TestCase testID="mouse_comboBoxEditor_verticalScrollBar_test" keywords="[DataGrid, Property,Editable]" description="verify mouse clicks on verticalScrollbar of Combobox editor will scroll the dropdown list, verify clicking on the scrollbar scrolls the list">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
</setup>
@@ -1661,6 +1674,8 @@
<TestCase testID="mouse_comboBoxEditor_horizontalScrollBar_test" keywords="[DataGrid, Property,Editable]" description="verify mouse clicks on horizontalScrollbar of Combobox editor will scroll the dropdown list, verify clicking on the scrollbar scrolls the list">
<setup>
+ <SetProperty propertyName="currentState" value="setTwo" />
+ <WaitForLayoutManager />
<ResetComponent target="dataGrid7" className="components.DataGrid_ComboBoxEditor" waitEvent="updateComplete"/>
<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
</setup>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_itemEditor.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_itemEditor.mxml?rev=1394856&r1=1394855&r2=1394856&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_itemEditor.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/SWFs/DataGrid_itemEditor.mxml Fri Oct 5 22:53:30 2012
@@ -433,21 +433,24 @@
<s:layout>
<s:VerticalLayout/>
</s:layout>
+ <s:states>
+ <s:State name="setOne" />
+ <s:State name="setTwo" />
+ </s:states>
-
- <s:HGroup id="hg1">
+ <s:HGroup id="hg1" includeIn="setOne">
<!-- default one, editable is turned off -->
<comps:DataGrid_comp1 id="dataGrid" />
<comps:DataGrid_editable_comp1 id="dataGrid2" />
<comps:DataGrid_editable_size id="dataGrid3" />
</s:HGroup>
- <s:HGroup id="hg2">
+ <s:HGroup id="hg2" includeIn="setOne">
<comps:DataGrid_editable_comp2 id="dataGrid4" />
<comps:DataGrid_editable_comp3 id="dataGrid5" />
</s:HGroup>
- <comps:DataGrid_multiline_lineBreakStyle id="dataGrid6" />
- <comps:DataGrid_ComboBoxEditor id="dataGrid7" />
+ <comps:DataGrid_multiline_lineBreakStyle id="dataGrid6" includeIn="setOne"/>
+ <comps:DataGrid_ComboBoxEditor id="dataGrid7" includeIn="setTwo" />
</s:Application>
\ No newline at end of file