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/21 19:05:22 UTC

svn commit: r1425063 [11/13] - in /incubator/flex/sdk/branches/develop: frameworks/ frameworks/projects/spark/ frameworks/projects/spark/src/ frameworks/projects/spark/src/spark/collections/ frameworks/projects/spark/src/spark/components/ frameworks/pr...

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test001_c1invisible.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test001_c1invisible.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test001_c1visible.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test001_c1visible.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test002_c1invisible.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/CHG_invisibleColumn_test002_c1invisible.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_col1VisibleFalse_1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_col1VisibleFalse_1.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_col1col2VisibleFalse.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_col1col2VisibleFalse.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_customSkin_selectionLayerTop.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_customSkin_selectionLayerTop.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_default_typItem_columnsAtRuntime1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_default_typItem_columnsAtRuntime1.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_gridIR_default.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_gridIR_default.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_gridIR_typItem.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_gridIR_typItem.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_misc.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_misc.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_misc2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_misc2.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedCell.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedCell.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedCells.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedCells.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedIndex.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedIndex.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedIndices.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_preInit_setSelectedIndices.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_stateColumn_1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_stateColumn_1.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_typicalItem_changedAtRuntimeExpWidth.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_typicalItem_changedAtRuntimeExpWidth.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_typicalItem_reqRowCol_default.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/DataGrid_Properties_typicalItem_reqRowCol_default.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_1.png?rev=1425063&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_2.png?rev=1425063&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_focusIn_multiline_test_2.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_multiline_true_explicit_test.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_multiline_true_explicit_test.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_startEditMode_Tabbing.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_startEditMode_Tabbing.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_style_test_green.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_style_test_green.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_style_test_red.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_style_test_red.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_variableRowHeight_large.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_variableRowHeight_large.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_variableRowHeight_small.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Editable_variableRowHeight_small.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Mirroring_rtl_editor_test1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Mirroring_rtl_editor_test1.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC01.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC01.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC04.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC04.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC05.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC05.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC06.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC06.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC07_afterColumnChg.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC07_afterColumnChg.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC10.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC10.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC11.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC11.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC12.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC12.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC13.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC13.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC14.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Properties_dataProvider_XMLLC14.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test001_ascending.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test001_ascending.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test001_descending.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test001_descending.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test002_replace.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test002_replace.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test002_update.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_Columns_test002_update.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_dataProvider_test001.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_dataProvider_test001.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_dataProvider_test001_reverse.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_dataProvider_test001_reverse.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_onColumns_test001_ascending.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_onColumns_test001_ascending.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_onColumns_test001_descending.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_onColumns_test001_descending.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortByColumns_sortInvalidUpdated.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortByColumns_sortInvalidUpdated.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortByColumns_sortUpdated.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortByColumns_sortUpdated.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortIndicator_test001.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortIndicator_test001.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortIndicator_test001_2.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/Sort_sortIndicator_test001_2.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_lastPage.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_lastPage.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_page1.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/column_withRenderer_test001_page1.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_nodata_test5.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_nodata_test5.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_scrollbar_test1_scrollBar.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_scrollbar_test1_scrollBar.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_scrollbar_test3_scrollBar.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/dataProvider_scrollbar_test3_scrollBar.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

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=1425063&r1=1425062&r2=1425063&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=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_tabbing_navigation.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/Baselines/key_tabbing_navigation.png?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_colResize.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_colResize.mxml?rev=1425063&r1=1425062&r2=1425063&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_colResize.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/DataGrid/Properties/DataGrid_Properties_colResize.mxml Fri Dec 21 18:05:20 2012
@@ -45,6 +45,25 @@
             {
                 import mx.core.FlexGlobals;
             }
+            
+            private function debugWidths():void
+            {
+                var totalWidth:int = 
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width +
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width +
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width +
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width +
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width;
+                
+                trace('widths',
+                    'explicit width', FlexGlobals.topLevelApplication.myComp1.dataGrid1.width,
+                    'total width of columns', totalWidth,
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width,
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width,
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width,
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width,
+                    FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width);
+            }
         ]]>
     </fx:Script>    
 
@@ -522,32 +541,60 @@
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+							
+				<!-- each drag must be within the seperatorAffordance -->
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.columnHeaderGroup.getStyle('separatorAffordance')" value="5"/>
+							
+				<!-- drag the seperator to the left of the last column to the right to increase the size of the column -->
+				<!-- the grid size increases -->
 				<DispatchMouseEvent type="rollOver" target="myComp1.dataGrid1" localX="208" localY="10" waitEvent="rollOver" /> 
-				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="208" localY="10" waitEvent="separatorMouseDown" /> 
-				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="231" localY="10" waitEvent="separatorMouseDown" /> 				
+
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="235" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="240" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="245" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="250" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="255" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="260" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="265" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="270" localY="10" waitEvent="separatorMouseDrag" /> 
 				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseUp" /> 												
+
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="315"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="289"/>
+				
+				<!-- drag the seperator to the left of the last column to the left to decrease the size of the last column -->
+				<!-- the grid size does not change -->
 				<DispatchMouseEvent type="rollOver" target="myComp1.dataGrid1" localX="273" localY="10" waitEvent="rollOver" /> 
 				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseDown" /> 
-				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="263" localY="10" waitEvent="separatorMouseDrag" /> 
-				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="263" localY="10" waitEvent="enterFrame" waitTarget="stage"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="270" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="265" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="260" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="255" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="250" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="245" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="240" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="235" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="234" localY="10" waitEvent="separatorMouseDrag"/> 												
+				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="234" localY="10" waitEvent="separatorMouseUp"/>
+				 												
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="99"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="39"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="315"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="250"/>				
 			</body>
 		</TestCase>			      
 		
+		<!-- this test is silly since it is the first part of the test DataGrid_Properties_col5ResizeLargerSmaller above -->
 		<TestCase testID="DataGrid_Properties_col5ResizeLarger" keywords="[DataGrid, Property, column, resize]" description="Test how resizing columng 5 larger effects widths">			
 			<setup>
 				<ResetComponent target="myComp1" className="components.basicDG" waitEvent="updateComplete" />
@@ -560,18 +607,32 @@
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+							
+				<!-- each drag must be within the seperatorAffordance -->
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.columnHeaderGroup.getStyle('separatorAffordance')" value="5"/>
+							
+				<!-- drag the seperator to the left of the last column to the right to increase the size of the column -->
+				<!-- the grid size increases -->
 				<DispatchMouseEvent type="rollOver" target="myComp1.dataGrid1" localX="208" localY="10" waitEvent="rollOver" /> 
-				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="208" localY="10" waitEvent="separatorMouseDown" /> 
-				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="231" localY="10" waitEvent="separatorMouseDown" /> 				
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="235" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="240" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="245" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="250" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="255" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="260" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="265" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="270" localY="10" waitEvent="separatorMouseDrag" /> 
 				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseUp" /> 												
+
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="315"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="289"/>
 			</body>
 		</TestCase>						
 
@@ -587,30 +648,51 @@
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+															
+				<!-- each drag must be within the seperatorAffordance -->
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.columnHeaderGroup.getStyle('separatorAffordance')" value="5"/>
+							
+				<!-- increase size of column 5 -->
 				<DispatchMouseEvent type="rollOver" target="myComp1.dataGrid1" localX="208" localY="10" waitEvent="rollOver" /> 
-				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="208" localY="10" waitEvent="separatorMouseDown" /> 
-				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="231" localY="10" waitEvent="separatorMouseDown" /> 				
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="235" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="240" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="245" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="250" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="255" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="260" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="265" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="270" localY="10" waitEvent="separatorMouseDrag" /> 
 				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseUp" /> 												
+				<WaitForLayoutManager/>
+												
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="315"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="289"/>
+
+                <!-- increase width of dataGrid -->
 				<SetProperty target="myComp1.dataGrid1" propertyName="width" value="420" waitEvent="updateComplete"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="420"/>																
+				<WaitForLayoutManager/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="420"/>
+
+                <!-- the size of the columns is not increased - only the grid itself -->
+                <!-- set explicit column widths, set the typical item, or change the dataProvider to get the grid to remeasure -->												
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="134"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				
 			</body>
 		</TestCase>			      
 
-		<TestCase testID="DataGrid_Properties_col5ResizeLargerDGResizeSmaller" keywords="[DataGrid, Property, column, resize]" description="Test how resizing column 5 and then reducing the size of the DataGrid effects widths">			
+		<!--TestCase testID="DataGrid_Properties_explicit_width" keywords="[DataGrid, Property, column, resize]" description="Test how resizing DataGrid affects column widths">			
 			<setup>
 				<ResetComponent target="myComp1" className="components.basicDG" waitEvent="updateComplete" />
 				<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>				
@@ -622,26 +704,80 @@
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+
+				<RunCode code="debugWidths()"/-->
+
+                <!-- increase size of grid does not cause the columns to remeasure -->
+				<!--SetProperty target="myComp1.dataGrid1" propertyName="width" value="350" waitEvent="updateComplete"/>
+				<WaitForLayoutManager/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="350"/>
+				<RunCode code="debugWidths()"/-->
+				
+				<!-- changing the explicit width of a column does cause the dataGrid to remeasure -->
+				<!--SetProperty target="myComp1.c1_6" propertyName="width" value="129" waitTarget="myComp1.dataGrid1.grid" waitEvent="invalidateSize"/>
+				<WaitForLayoutManager/>
+
+				<RunCode code="debugWidths()"/>
+				
+				<AssertPropertyValue target="myComp1.c1_6" propertyName="width" value="129"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="129"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="350"/>
+			</body>				
+        </TestCase-->
+        
+		<TestCase testID="DataGrid_Properties_col5ResizeLargerDGResizeSmaller" keywords="[DataGrid, Property, column, resize]" description="Test how resizing column 5 and then reducing the size of the DataGrid affects widths">			
+			<setup>
+				<ResetComponent target="myComp1" className="components.basicDG" waitEvent="updateComplete" />
+				<WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>				
+			</setup>
+			<body>			
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="250"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
+															
+				<!-- each drag must be within the seperatorAffordance -->
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.columnHeaderGroup.getStyle('separatorAffordance')" value="5"/>
+							
+				<!-- increase size of column 5 -->
 				<DispatchMouseEvent type="rollOver" target="myComp1.dataGrid1" localX="208" localY="10" waitEvent="rollOver" /> 
-				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="208" localY="10" waitEvent="separatorMouseDown" /> 
-				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseDown" target="myComp1.dataGrid1.columnHeaderGroup" localX="231" localY="10" waitEvent="separatorMouseDown" /> 				
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="235" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="240" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="245" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="250" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="255" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="260" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="265" localY="10" waitEvent="separatorMouseDrag" /> 
+				<DispatchMouseEvent type="mouseMove" target="myComp1.dataGrid1.columnHeaderGroup" localX="270" localY="10" waitEvent="separatorMouseDrag" /> 
 				<DispatchMouseEvent type="mouseUp" target="myComp1.dataGrid1.columnHeaderGroup" localX="273" localY="10" waitEvent="separatorMouseUp" /> 												
+				<WaitForLayoutManager/>
+												
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="315"/>
-				<SetProperty target="myComp1.dataGrid1" propertyName="width" value="280" waitEvent="updateComplete"/>
-				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="280"/>																
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="289"/>
+
+                <!-- decrease the width of the dataGrid -->
+				<SetProperty target="myComp1.dataGrid1" propertyName="width" value="180" waitEvent="updateComplete"/>
+				<WaitForLayoutManager/>
+										
+				<!-- the size of the columns will not change even if if the sum of their widths is larger than the dg width -->
+				<!-- size the dg by sizing the columns or changing the typicalItem -->															
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(0).width" value="38"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(1).width" value="46"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(2).width" value="45"/>
 				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(3).width" value="32"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="109"/>
-				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="29"/>				
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(4).width" value="44"/>
+				<AssertMethodValue method="value=FlexGlobals.topLevelApplication.myComp1.dataGrid1.grid.getColumnBounds(5).width" value="68"/>
+				<AssertPropertyValue target="myComp1.dataGrid1" propertyName="width" value="180"/>
 			</body>
 		</TestCase>	
 
@@ -741,4 +877,4 @@
 		</TestCase>
 
     </testCases>
-</UnitTester>
\ No newline at end of file
+</UnitTester>

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=1425063&r1=1425062&r2=1425063&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 Dec 21 18:05:20 2012
@@ -42,45 +42,58 @@
     
     <fx:Script>
         <![CDATA[
+        {
+            import flash.geom.Rectangle;
+            import mx.core.FlexGlobals;
+            import mx.collections.XMLListCollection;
+            import mx.collections.ArrayList;
+            import mx.utils.ObjectUtil;
+            import spark.components.DataGrid;
+            import spark.components.gridClasses.GridSelectionMode;
+            import spark.components.gridClasses.GridColumn;
+            import spark.components.gridClasses.ComboBoxGridItemEditor;
+            import spark.events.GridItemEditorEvent;
+            import mx.managers.CursorManager;
+            import components.*;
+            
+            
+            /**
+            * this method is an event handler for gridItemEditorSessionStart, it is used for endItemEditorSesion(false) which saves data
+            */         
+            public function editStartSaveHandler(event:GridItemEditorEvent):void
             {
-                import mx.core.FlexGlobals;
-                import mx.collections.XMLListCollection;
-                import mx.collections.ArrayList;
-                import mx.utils.ObjectUtil;
-                import spark.components.DataGrid;
-                import spark.components.gridClasses.GridSelectionMode;
-                import spark.components.gridClasses.GridColumn;
-                import spark.components.gridClasses.ComboBoxGridItemEditor;
-                import spark.events.GridItemEditorEvent;
-                import mx.managers.CursorManager;
-                import components.*;
-                
-		
-		/**
-		* this method is an event handler for gridItemEditorSessionStart, it is used for endItemEditorSesion(false) which saves data
-		*/
-		
-		public function editStartSaveHandler(event:GridItemEditorEvent):void
-		{
-	
-			var dgTemp:DataGrid=(DataGrid)(event.currentTarget);
-			if (dgTemp.itemEditorInstance!=null && dgTemp.itemEditorInstance is ComboBoxGridItemEditor)
-				(ComboBoxGridItemEditor)(dgTemp.itemEditorInstance).comboBox.selectedItem="ProductFx";
-			dgTemp.endItemEditorSession(false);
-		}
-		/**
-		* this method is an event handler for gridItemEditorSessionStart, it is used for endItemEditorSesion(true) which cancels update
-		*/
-		public function editStartCancelHandler(event:GridItemEditorEvent):void
-		{
-			var dgTemp:DataGrid=(DataGrid)(event.currentTarget);
-			if (dgTemp.itemEditorInstance!=null && dgTemp.itemEditorInstance is ComboBoxGridItemEditor)
-				(ComboBoxGridItemEditor)(dgTemp.itemEditorInstance).comboBox.selectedItem="ProductFx";
-			dgTemp.endItemEditorSession(true);
-		}
-		
+            
+                var dgTemp:DataGrid=(DataGrid)(event.currentTarget);
+                if (dgTemp.itemEditorInstance!=null && dgTemp.itemEditorInstance is ComboBoxGridItemEditor)
+                    (ComboBoxGridItemEditor)(dgTemp.itemEditorInstance).comboBox.selectedItem="ProductFx";
+                dgTemp.endItemEditorSession(false);
+            }
+            
+            /**
+            * this method is an event handler for gridItemEditorSessionStart, it is used for endItemEditorSesion(true) which cancels update
+            */
+            public function editStartCancelHandler(event:GridItemEditorEvent):void
+            {
+                var dgTemp:DataGrid=(DataGrid)(event.currentTarget);
+                if (dgTemp.itemEditorInstance!=null && dgTemp.itemEditorInstance is ComboBoxGridItemEditor)
+                    (ComboBoxGridItemEditor)(dgTemp.itemEditorInstance).comboBox.selectedItem="ProductFx";
+                dgTemp.endItemEditorSession(true);
             }
             
+            [Bindable]
+            private var cellX:int;
+            [Bindable]
+            private var cellY:int;
+            
+            private function setCellXY(dg:DataGrid, rowIndex:int, columnIndex:int):void
+            {                
+                var r:Rectangle = dg.grid.getCellBounds(rowIndex, columnIndex);
+                cellX = r.x + (r.width / 2);
+                cellY = r.y + (r.height / 2);
+                trace("click point for cell " + rowIndex + "," + columnIndex + " is", cellY, cellX);
+            }        
+        }
+        
         ]]>
     </fx:Script>    
 
@@ -105,24 +118,24 @@
     	      </body>
 	   </TestCase> 
 	      	  
-	    <TestCase testID="Editable_true_defaultEditor" keywords="[DataGrid, Property, editable]" description="verify editable=true, defaultGridItemEditor is TextArea">
-	       <setup> 
-		   <ResetComponent target="dataGrid4" className="components.DataGrid_editable_comp2" /> 
-	       </setup>
-	       <body>
-		  
-		  <!-- by default, DataGridColumn.editable=true -->
-		  <!-- select the cell(0,1)-->
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.setSelectedCell(0,1)" value="true"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="1"/>
-
-		  <!-- click on the selected cell to invoke editor -->
-		  <DispatchMouseClickEvent target="dataGrid4.grid" localX="40" localY="10" waitEvent="click" waitTarget="dataGrid4.grid"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.gridItemEditEvent.rowIndex" value="0"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.gridItemEditEvent.columnIndex" value="1"/>
-	      </body>
-	   </TestCase>    
+    <TestCase testID="Editable_true_defaultEditor" keywords="[DataGrid, Property, editable]" description="verify editable=true, defaultGridItemEditor is TextArea">
+        <setup> 
+            <ResetComponent target="dataGrid4" className="components.DataGrid_editable_comp2" />
+        </setup>
+        <body>       
+            <!-- by default, DataGridColumn.editable=true -->
+            <!-- select the cell(0,1)-->
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.setSelectedCell(0,1)" value="true"/>
+            <WaitForLayoutManager/>
+            
+            <!-- click on the selected cell to invoke editor -->
+            <RunCode code="setCellXY(FlexGlobals.topLevelApplication.dataGrid4, 0, 1)"/>
+            <DispatchMouseClickEvent target="dataGrid4.grid" localX="{cellX}" localY="{cellY}" waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid4"/>
+            <WaitForLayoutManager/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.gridItemEditEvent.rowIndex" value="0"/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid4.gridItemEditEvent.columnIndex" value="1"/>
+        </body>
+    </TestCase>    
 	     
 	    <TestCase testID="Editable_GridColumn_false" keywords="[DataGrid, Property, editable]" description="verify editable=true on DataGrid, but DataGridColumn.editable=false, verify no editing allowed">
 	       <setup>
@@ -808,25 +821,25 @@
 	      </body>
 	   </TestCase>  
 
-	 <TestCase testID="key_tabbing_navigation" keywords="[DataGrid, Property,Editable]" description="verify tabbing on multiple components in the editor component works as expected">
-	       <setup>
-		  <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
-		  <RunCode code="FlexGlobals.topLevelApplication.setEditorOnColumnIndex(FlexGlobals.topLevelApplication.dataGrid2,13)"  waitEvent="enterFrame" waitTarget="stage"/>
-		  <SetProperty target="dataGrid2" propertyName="height" value="250"   waitEvent="updateComplete"/>
-		  
-	       </setup>
-	       <body>  
-	          <!-- select the cell(0,0)-->
-	          <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,0)" value="true"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="1"/>
-  
-		  <DispatchKeyEvent keys="[F2]" waitEvent="enterFrame" waitTarget="stage" />
-		  <DispatchKeyEvent keys="[TAB,TAB]"  waitEvent="enterFrame" waitTarget="stage" />
-		  <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2.itemEditorInstance.panel1"/><!-- itemEditorInstance -->
-		 
-	      </body>
-	   </TestCase>  
+    <TestCase testID="key_tabbing_navigation" keywords="[DataGrid, Property,Editable]" description="verify tabbing on multiple components in the editor component works as expected">
+        <setup>
+            <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
+            <RunCode code="FlexGlobals.topLevelApplication.setEditorOnColumnIndex(FlexGlobals.topLevelApplication.dataGrid2,13)" waitEvent="enterFrame" waitTarget="stage"/>
+            <SetProperty target="dataGrid2" propertyName="height" value="250" waitEvent="updateComplete"/>        
+        </setup>
+        <body>  
+            <!-- select the cell(0,0)-->
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,0)" value="true"/>
+            <WaitForLayoutManager/>
+            
+            <!-- start editing on the selected cell -->
+            <DispatchKeyEvent keys="[F2]" waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid2" />
+            <!-- move focus to TextInput and then to checkbox -->
+            <DispatchKeyEvent keys="[TAB,TAB]"  waitEvent="keyFocusChange" waitTarget="dataGrid2" />
+            <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2.itemEditorInstance.panel1"/><!-- itemEditorInstance -->       
+        </body>
+    </TestCase>  
 
 	 <TestCase testID="key_tabbing_lastEditableCell" keywords="[DataGrid, Property,Editable]" description="verify tabbing on last editable cell, verify focus is expected after tab">
 	       <setup>
@@ -1015,28 +1028,29 @@
 	      </body>
 	   </TestCase> 
 	
-	   <TestCase testID="Editable_style_test" keywords="[DataGrid, Property,Editable]" description="dataGrid, renderer, itemEditor has different styles, verify style set in itemEditor is used, otherwise it is from its parent">
-	       <setup>
-		  <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/>   
-	       </setup>
-	       <body>  
-	          <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.c41_2.itemRenderer=new ClassFactory(components.DGIR_RichEditableText)"  waitEvent="enterFrame" waitTarget="stage"/>
-	          <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.c41_2.itemEditor=new ClassFactory(components.DGIE_TextArea)"  waitEvent="enterFrame" waitTarget="stage"/>
-	          
-	          <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,2)" value="true"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="1"/>
-		  <DispatchKeyEvent keys="[F2]"  waitEvent="enterFrame" waitTarget="stage" />
-		  <CompareBitmap url="../Properties/baselines/$testID_green.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
-		 
-    		  <DispatchKeyEvent char="John"  />
-    		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <DispatchKeyEvent keys="[ENTER]" ctrlKey="true" waitEvent="enterFrame" waitTarget="stage" />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <CompareBitmap url="../Properties/baselines/$testID_red.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
- 		
-	      </body>
-	   </TestCase> 	
+    <TestCase testID="Editable_style_test" keywords="[DataGrid, Property,Editable]" description="dataGrid, renderer, itemEditor has different styles, verify style set in itemEditor is used, otherwise it is from its parent">
+        <setup>
+            <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/>   
+        </setup>
+        <body>  
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.c41_2.itemRenderer=new ClassFactory(components.DGIR_RichEditableText)"  waitEvent="enterFrame" waitTarget="stage"/>
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.c41_2.itemEditor=new ClassFactory(components.DGIE_TextArea)"  waitEvent="enterFrame" waitTarget="stage"/>
+            
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,2)" value="true"/>
+            <!-- F2 to edit cell.  Selection indicator remains.  -->
+            <DispatchKeyEvent keys="[F2]"  waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid2" />
+            <WaitForLayoutManager/>
+            <CompareBitmap url="../Properties/baselines/$testID_green.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
+            
+            <DispatchKeyEvent char="John"  />
+            <!-- ctrl-ENTER to commit edit and move to the next cell -->
+            <DispatchKeyEvent keys="[ENTER]" ctrlKey="true" waitEvent="gridItemEditorSessionSave" waitTarget="dataGrid2" />
+            <WaitForLayoutManager/>
+            <CompareBitmap url="../Properties/baselines/$testID_red.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>        
+        </body>
+    </TestCase> 
+	
 	 <TestCase testID="Editable_variableRowHeight" keywords="[DataGrid, Property,Editable]" description="verify variableRowHeight=true, different columnWidth,editor should show in different size">
 	       <setup>
 		  <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
@@ -1177,37 +1191,42 @@
 	   </TestCase>   
 	   
 	<!-- bug 28587 -->
-	 <TestCase testID="Editable_renderIsEditor_test" keywords="[DataGrid, Property,Editable]" description="verify rendererIsEditor=true, the render is editor">
-	       <setup>
-		  <ResetComponent target="dataGrid3" className="components.DataGrid_editable_size" waitEvent="updateComplete"/> 
-		 
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-
-	       </setup>
-	       <body>  
-		  <RunCode code="FlexGlobals.topLevelApplication.dataGrid3.setFocus()" waitEvent="focusIn" waitTarget="dataGrid3"/>
-		  <DispatchMouseClickEvent target="dataGrid3.grid" localX="310" localY="40" waitEvent="click" waitTarget="dataGrid3.grid"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <DispatchKeyEvent char="Golden"  />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <DispatchKeyEvent keys="[ENTER]" ctrlKey="true" waitEvent="enterFrame" waitTarget="stage"  />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).lastName" value="GoldenHamFN"/>
-		  <!-- update to a new renderer,not default one  -->
-		  <RunCode code="FlexGlobals.topLevelApplication.dataGrid3.c3_3a.itemRenderer=new ClassFactory(components.DGIR_RichEditableText)" waitEvent="enterFrame" waitTarget="stage" />
-	          <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <RunCode code="FlexGlobals.topLevelApplication.dataGrid3.ensureCellIsVisible(0,2)"  waitEvent="enterFrame" waitTarget="stage"  />
-		  <!-- click the first row, cellIndex=2 -->
-		  <DispatchMouseClickEvent target="dataGrid3.grid" localX="315" localY="20"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <!-- click elsewhere to have the value at cell (0,2) saved -->
-		  <DispatchMouseClickEvent target="dataGrid3.grid" localX="310" localY="80"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <!-- verify the value -->
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).lastName" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).firstName"/>
-		
-	      </body>
-	   </TestCase> 
+    <TestCase testID="Editable_renderIsEditor_test" keywords="[DataGrid, Property,Editable]" description="verify rendererIsEditor=true, the render is editor">
+        <setup>
+            <ResetComponent target="dataGrid3" className="components.DataGrid_editable_size" waitEvent="updateComplete"/>             
+        </setup>
+        <body>  
+            <!-- clicking on cell 0,2 to select and then click again to edit -->
+            <RunCode code="setCellXY(FlexGlobals.topLevelApplication.dataGrid3, 0, 2)"/>
+
+            <DispatchMouseClickEvent target="dataGrid3" localX="{cellX}" localY="{cellY}" waitEvent="selectionChange" waitTarget="dataGrid3"/> 
+            <!-- no gridItemEditor events being dispatched by custom render so don't wait on gridItemEditorSessionStart -->           
+            <DispatchMouseClickEvent target="dataGrid3" localX="{cellX}" localY="{cellY}" waitEvent="click" waitTarget="dataGrid3"/>            
+            <DispatchKeyEvent char="Golden"  />
+            
+            <DispatchKeyEvent keys="[ENTER]" ctrlKey="true" waitEvent="enterFrame" waitTarget="stage"/>
+            
+            <!-- This is a poor test since the itemRenderer which is editable does not save the edited value back to the collection hence -->
+            <!-- the typed in string "Golden" is lost.  It also doesn't dispatch the normal girdItemEditor events.  -->
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).lastName" value="HamFN"/>
+            
+            <!-- update to a new renderer,not default one  -->
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid3.c3_3a.itemRenderer=new ClassFactory(components.DGIR_RichEditableText)" waitEvent="enterFrame" waitTarget="stage" />
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid3.ensureCellIsVisible(0,2)"/>
+            <WaitForLayoutManager/>
+            
+            <!-- click the first row, cellIndex=2 -->
+            <DispatchMouseClickEvent target="dataGrid3.grid" localX="{cellX}" localY="{cellY}"/>
+            <WaitForLayoutManager/>
+            
+            <!-- click on (1,2) to have the value at cell (0,2) saved -->
+            <RunCode code="setCellXY(FlexGlobals.topLevelApplication.dataGrid3, 1, 2)"/>
+            <DispatchMouseClickEvent target="dataGrid3.grid" localX="{cellX}" localY="{cellY}"/>
+            
+            <!-- verify the value -->
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).lastName" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid3.dataProvider.getItemAt(0).firstName"/>  
+        </body>
+    </TestCase> 
 
 
 	 <TestCase testID="endItemEditorSession_cancelFalse_test001" keywords="[DataGrid, Method,endItemEditorSession]" description="verify calling endItemEditorSession(false), the value is saved and exit editing mode">
@@ -1239,49 +1258,48 @@
 		 
 	        </body>
 	   </TestCase>
-	 <TestCase testID="Mirroring_rtl_test1" keywords="[DataGrid, Mirroring]" description="verify mirroring layout=rtl, datagrid displays as expected">
-	       <setup>
-		  <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
-		  <SetProperty target="dataGrid2" propertyName="dataProvider" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid2.dp2" waitEvent="enterFrame" waitTarget="stage" />
-		  <SetProperty target="dataGrid2" propertyName="height" value="200" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <SetProperty target="dataGrid2" propertyName="width" value="450" waitEvent="updateComplete" waitTarget="dataGrid2" />
-	       </setup>
-	       <body>  
-	       	  <SetStyle target="dataGrid2" styleName="layoutDirection" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <SetStyle target="dataGrid2" styleName="direction" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <CompareBitmap url="../Properties/baselines/$testID_rtl.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
-		  <!-- check sort indicator -->
-		  <DispatchMouseClickEvent target="dataGrid2.columnHeaderGroup" localX="100" localY="10" waitEvent="click" waitTarget="dataGrid2"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,0)" value="true"/>
-			<WaitForLayoutManager />
-		  <CompareBitmap url="../Properties/baselines/$testID_sort_selection.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
-	      </body>
-	   </TestCase>  
+	   
+    <TestCase testID="Mirroring_rtl_test1" keywords="[DataGrid, Mirroring]" description="verify mirroring layout=rtl, datagrid displays as expected">
+        <setup>
+            <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
+            <SetProperty target="dataGrid2" propertyName="dataProvider" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid2.dp2" waitEvent="enterFrame" waitTarget="stage" />
+            <SetProperty target="dataGrid2" propertyName="height" value="200" />
+            <SetProperty target="dataGrid2" propertyName="width" value="450" waitEvent="updateComplete" waitTarget="dataGrid2"/>
+            <SetStyle target="dataGrid2" styleName="layoutDirection" value="rtl"/>
+            <SetStyle target="dataGrid2" styleName="direction" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
+        </setup>
+        <body>  
+            <CompareBitmap url="../Properties/baselines/$testID_rtl.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
+            
+            <!-- check sort indicator -->
+            <DispatchMouseClickEvent target="dataGrid2.columnHeaderGroup" localX="100" localY="10" waitEvent="sortChange" waitTarget="dataGrid2"/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,0)" value="true"/>
+            <WaitForLayoutManager />
+            
+            <CompareBitmap url="../Properties/baselines/$testID_sort_selection.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
+        </body>
+    </TestCase>  
 	  
-	 <TestCase testID="Mirroring_rtl_editor_test1" keywords="[DataGrid, Mirroring]" description="verify mirroring layout=rtl, datagrid displays editors as expected">
-	       <setup>
-		  <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
-  		  <SetProperty target="dataGrid2" propertyName="height" value="200" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <SetProperty target="dataGrid2" propertyName="width" value="450" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <SetProperty target="dataGrid2" propertyName="dataProvider" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid2.dp2" waitEvent="enterFrame" waitTarget="stage" />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-
-	       </setup>
-	       <body>  
-	       	  <SetStyle target="dataGrid2" styleName="layoutDirection" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
-		  <SetStyle target="dataGrid2" styleName="direction" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
-   		  <!-- check editor layout, check input for editor, using the one no text insertion -->
-		  <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>
-		 
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,1)" value="true"/>
-		  
-		  <DispatchMouseClickEvent target="dataGrid2.grid" localX="200" localY="10" waitEvent="click" waitTarget="dataGrid2"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>
-		  
-	      </body>
-	   </TestCase>   
+    <TestCase testID="Mirroring_rtl_editor_test1" keywords="[DataGrid, Mirroring]" description="verify mirroring layout=rtl, datagrid displays editors as expected">
+        <setup>
+            <ResetComponent target="dataGrid2" className="components.DataGrid_editable_comp1" waitEvent="updateComplete"/> 
+            <SetProperty target="dataGrid2" propertyName="height" value="200"/>
+            <SetProperty target="dataGrid2" propertyName="width" value="450"/>
+            <SetProperty target="dataGrid2" propertyName="dataProvider" valueExpression="value=FlexGlobals.topLevelApplication.dataGrid2.dp2" waitEvent="enterFrame" waitTarget="stage" />
+            <SetStyle target="dataGrid2" styleName="layoutDirection" value="rtl"/>
+            <SetStyle target="dataGrid2" styleName="direction" value="rtl" waitEvent="updateComplete" waitTarget="dataGrid2" />
+        </setup>
+        <body>  
+            <!-- check editor layout, check input for editor, using the one no text insertion -->
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid2.setFocus()" waitEvent="focusIn" waitTarget="dataGrid2"/>           
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid2.setSelectedCell(0,1)" value="true"/>
+            
+            <DispatchMouseClickEvent target="dataGrid2.grid" localX="200" localY="10" waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid2"/>
+            
+            <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid2"/>      
+        </body>
+    </TestCase>
+  
 	 <TestCase testID="Mirroring_rtl_editing_test1" keywords="[DataGrid, Mirroring]" description="verify mirroring layout=rtl, input text, verify input is in right layout">
 	       <setup>
 		  <ResetComponent target="dataGrid3" className="components.DataGrid_editable_size" waitEvent="updateComplete"/> 
@@ -1374,29 +1392,27 @@
 	      </body>
 	   </TestCase> 	
 	   <!-- regression test case: SDK-29256 -->
-	   <TestCase testID="Editable_focusIn_multiline_test" keywords="[DataGrid, Property,Editable]" description="verify focusIn should be consistent no matter what multiline is set: no insertion pt. Text selected ">
-	       <setup>
-		  <ResetComponent target="dataGrid5" className="components.DataGrid_editable_comp3" waitEvent="updateComplete"/> 
-	       </setup>
-	       <body>  
-		 
-		  <RunCode code="FlexGlobals.topLevelApplication.dataGrid5.setFocus()" waitEvent="focusIn" waitTarget="dataGrid5"/>
-		  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid5.setSelectedCell(0,0)" value="true"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="1"/>
-		  <DispatchKeyEvent keys="[F2]" waitEvent="enterFrame" waitTarget="stage" />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		 <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid5.itemEditorInstance.textArea"/>
-	      
-	      	  
-	      	  <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid5.setSelectedCell(0,1)" value="true"/>
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="1"/>
-		  <DispatchKeyEvent keys="[F2]" waitEvent="enterFrame" waitTarget="stage" />
-		  <WaitForEvent target="stage" eventName="enterFrame" numExpectedEvents="2"/>
-		  <CompareBitmap url="../Properties/baselines/$testID.png" numColorVariances="20" maxColorVariance="20" target="dataGrid5.itemEditorInstance.textArea"/>
-	          <!-- this statement is work around for bug 29522 -->
-	          <RunCode code="FlexGlobals.topLevelApplication.setFocus()"  waitEvent="focusIn" waitTarget=""/>
-	      </body>
-	   </TestCase> 	   
+    <TestCase testID="Editable_focusIn_multiline_test" keywords="[DataGrid, Property,Editable]" description="verify focusIn should be consistent no matter what multiline is set: no insertion pt. Text selected ">
+        <setup>
+            <ResetComponent target="dataGrid5" className="components.DataGrid_editable_comp3" waitEvent="updateComplete"/> 
+        </setup>
+        <body>          
+            <RunCode code="FlexGlobals.topLevelApplication.dataGrid5.setFocus()" waitEvent="focusIn" waitTarget="dataGrid5"/>
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid5.setSelectedCell(0,0)" value="true"/>
+            <DispatchKeyEvent keys="[F2]" waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid5" />
+            <WaitForLayoutManager/>
+            <CompareBitmap url="../Properties/baselines/$testID_1.png" numColorVariances="20" maxColorVariance="20" target="dataGrid5.itemEditorInstance.textArea"/>
+            <DispatchKeyEvent keys="[ESCAPE]" waitEvent="gridItemEditorSessionCancel" waitTarget="dataGrid5" />
+            
+            <AssertMethodValue method="value=FlexGlobals.topLevelApplication.dataGrid5.setSelectedCell(0,1)" value="true"/>
+            <DispatchKeyEvent keys="[F2]" waitEvent="gridItemEditorSessionStart" waitTarget="dataGrid5" />
+            <WaitForLayoutManager/>
+            <CompareBitmap url="../Properties/baselines/$testID_2.png" numColorVariances="20" maxColorVariance="20" target="dataGrid5.itemEditorInstance.textArea"/>
+            
+            <!-- this statement is work around for bug 29522 -->
+            <RunCode code="FlexGlobals.topLevelApplication.setFocus()"  waitEvent="focusIn" waitTarget=""/>
+        </body>
+    </TestCase> 	   
   	
   	   <TestCase testID="Editable_multiline_true_explicit_test" keywords="[DataGrid, Property,Editable]" description="verify If multiline=true then a newline character is inserted into the text. ">
 	       <setup>
@@ -1699,4 +1715,4 @@
 	     	       </body>
 	   </TestCase> 	   
     </testCases>
-</UnitTester>
\ No newline at end of file
+</UnitTester>