You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/04/16 06:48:46 UTC
[12/50] [abbrv] merge develop branch mustella test fixes to
release4.9 branch (except mobile fixes). Rev #'s: 1419339, 1419596, 1420380,
1420405, 1420426, 1420445, 1420836, 1420842, 1420852, 1420905, 1420927,
1420973, 1421673. mini_run -all passed on FP
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_columngroup.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_columngroup.mxml b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_columngroup.mxml
index c1cfd44..e3bd513 100644
--- a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_columngroup.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_columngroup.mxml
@@ -226,7 +226,7 @@
<body>
<WaitForEffectsToEnd />
<SetStyle styleName="layoutDirection" value="rtl" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/use_grouped_data_mirroring.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/use_grouped_data_mirroring.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -243,7 +243,7 @@
<DispatchMouseEvent target="mydatagrid" type="mouseOver" stageX="230.65" stageY="125"/>
<WaitForEffectsToEnd />
<Pause timeout = "1000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/adg_columngroups.png"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/adg_columngroups.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
-->
@@ -257,7 +257,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupedview_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupedview_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -270,7 +270,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_itemeditable_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_itemeditable_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
<AssertPropertyValue target="mydatagrid" propertyName="editable" value="item"/>
</body>
</TestCase>
@@ -288,7 +288,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupeditable_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupeditable_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
<AssertPropertyValue target="mydatagrid" propertyName="editable" value="group"/>
</body>
</TestCase>
@@ -304,7 +304,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupeditable_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupeditable_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
<AssertPropertyValue target="mydatagrid" propertyName="editable" value="item group"/>
</body>
</TestCase>
@@ -318,7 +318,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_insertcolumn_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_insertcolumn_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -329,7 +329,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_insertcolumngroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_insertcolumngroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -343,7 +343,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_hierarch_data_colgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_hierarch_data_colgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
<!--
@@ -355,7 +355,7 @@
</setup>
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_hierarch_data_colgroups.png"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_hierarch_data_colgroups.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
-->
@@ -369,7 +369,7 @@
<SetProperty propertyName="rowCount" value="2" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_rowcount_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_rowcount_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -383,7 +383,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_headerSkin_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_headerSkin_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase> -->
@@ -396,7 +396,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_formatting_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_formatting_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -409,7 +409,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_columnspanning_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_columnspanning_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -424,7 +424,7 @@
<SetProperty propertyName="variableRowHeight" value="true" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<SetProperty propertyName="wordWrap" value="true" target="mydatagrid" />
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_variablerowheight_wordwrap_withcolgroups.png"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_variablerowheight_wordwrap_withcolgroups.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -439,7 +439,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_headerrenderer_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_headerrenderer_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -452,7 +452,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_customheaderrenderer_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_customheaderrenderer_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -465,7 +465,7 @@
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_visible_withcolgroups.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_visible_withcolgroups.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
</testCases>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties.mxml b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties.mxml
index 51a2149..5f6b2ba 100644
--- a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties.mxml
@@ -330,8 +330,8 @@
</setup>
<body>
<SetProperty target="mydatagrid" propertyName="selectedIndex" value="1" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_columns.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_columns.png" timeout="1000"/>
</body>
</TestCase>
-->
@@ -383,7 +383,7 @@
</setup>
<body>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_state1.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_state1.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
<DispatchMouseEvent target="mydatagrid" type="mouseDown" localX="244" localY="14"/>
<DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="150" localY="14"/>
@@ -393,9 +393,9 @@
<DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="87" localY="14"/>
<DispatchMouseEvent target="mydatagrid" type="mouseUp" buttonDown="true" localX="87" localY="14"/>
- <Pause timeout="5000"/>
+ <Pause timeout="1000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_state2.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_state2.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -412,7 +412,7 @@
</setup>
<body>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_false_state1.png"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_false_state1.png" numColorVariances="1" maxColorVariance="2"/>
<DispatchMouseEvent target="mydatagrid" type="mouseDown" localX="244" localY="14"/>
<DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="150" localY="14"/>
@@ -423,8 +423,8 @@
<DispatchMouseEvent target="mydatagrid" type="mouseUp" buttonDown="true" localX="87" localY="14"/>
<Pause timeout="100"/>
- <Pause timeout="5000"/>
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_false_state2.png"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap timeout="1000" target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_false_state2.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -439,8 +439,8 @@
</setup>
<body>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupedview.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_groupedview.png" timeout="1000"/>
</body>
@@ -456,8 +456,8 @@
</setup>
<body>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_treeview.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_treeview.png" timeout="1000"/>
</body>
</TestCase>
@@ -474,8 +474,8 @@
</setup>
<body>
<DispatchMouseClickEvent target="mydatagrid" localX="244" localY="35"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_singlecellselection.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_singlecellselection.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -493,8 +493,8 @@
<body>
<DispatchMouseClickEvent target="mydatagrid" localX="244" localY="35"/>
<DispatchKeyEvent keys="['DOWN','SPACE']"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_multicellselection.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_multicellselection.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -514,8 +514,8 @@
<body>
<DispatchMouseClickEvent target="mydatagrid" localX="100" localY="35"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_singlecellselection.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_singlecellselection.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -534,8 +534,8 @@
<body>
<DispatchMouseClickEvent target="mydatagrid" localX="100" localY="35"/>
<DispatchKeyEvent keys="['DOWN','SPACE']"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_multicellselection.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_multicellselection.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
@@ -554,8 +554,8 @@
</setup>
<body>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_displayitemsexpanded.png" timeout="5000"/>
+ <Pause timeout="1000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_tree_displayitemsexpanded.png" timeout="1000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_scrollcontrolbase.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_scrollcontrolbase.mxml b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_scrollcontrolbase.mxml
index 6fb92fb..4b6a4e7 100644
--- a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_scrollcontrolbase.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_scrollcontrolbase.mxml
@@ -101,7 +101,7 @@
<testCases>
- <TestCase testID="propert_vscrollposition">
+ <TestCase testID="property_vscrollposition">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
@@ -111,50 +111,53 @@
<SetProperty propertyName="verticalScrollPosition" value="2" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="vscroll()"/>
<AssertPropertyValue target="mydatagrid" propertyName="verticalScrollPosition" value="1"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollposition.png" timeout="5000"/>
+ <!--Pause timeout="5000"/-->
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollposition.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_vscrollpolicy_off">
+ <TestCase testID="property_vscrollpolicy_off">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="verticalScrollPolicy" value="off" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_vscrollpolicy_on">
+ <TestCase testID="property_vscrollpolicy_on">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="verticalScrollPolicy" value="on" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy_on.png" timeout="5000"/>
+ <!--Pause timeout="5000"/-->
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy_on.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_vscrollpolicy_auto">
+ <TestCase testID="property_vscrollpolicy_auto">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="verticalScrollPolicy" value="auto" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy_auto.png" timeout="5000"/>
+ <!--Pause timeout="5000"/-->
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_verticalscrollpolicy_auto.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_showscrolltips_true">
+ <TestCase testID="property_showscrolltips_true">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
@@ -166,7 +169,7 @@
</body>
</TestCase>
- <TestCase testID="propert_showscrolltips_false">
+ <TestCase testID="property_showscrolltips_false">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
@@ -180,7 +183,7 @@
</TestCase>
- <TestCase testID="propert_livescrolling_true">
+ <TestCase testID="property_livescrolling_true">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
@@ -192,7 +195,7 @@
</body>
</TestCase>
- <TestCase testID="propert_livescrolling_false">
+ <TestCase testID="property_livescrolling_false">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
@@ -205,40 +208,43 @@
</body>
</TestCase>
<!--
- <TestCase testID="propert_hscrollpolicy_auto">
+ <TestCase testID="property_hscrollpolicy_auto">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="horizontalScrollPolicy" value="auto" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_auto.png" timeout="5000"/>
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_auto.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>-->
- <TestCase testID="propert_hscrollpolicy_on">
+ <TestCase testID="property_hscrollpolicy_on">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="horizontalScrollPolicy" value="on" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_on.png" timeout="5000"/>
+ <!--Pause timeout="5000"/-->
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_on.png" timeout="5000" numColorVariances="2" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_hscrollpolicy_off">
+ <TestCase testID="property_hscrollpolicy_off">
<setup>
- <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/> <RunCode code="startApp()"/>
+ <ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <RunCode code="startApp()"/>
<RunCode code="addItems()"/>
</setup>
<body>
<SetProperty propertyName="horizontalScrollPolicy" value="off" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <Pause timeout="5000"/>
- <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_off.png" timeout="5000"/>
+ <!--Pause timeout="5000"/-->
+ <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_horizontalscrollpolicy_off.png" timeout="5000" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_uicomponent.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_uicomponent.mxml b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_uicomponent.mxml
index 47d14ca..a257097 100644
--- a/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_uicomponent.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Properties/advanceddatagrid_properties_uicomponent.mxml
@@ -101,7 +101,7 @@
<testCases>
<!-- -->
- <TestCase testID="propert_enabled" keywords="['enabled']">
+ <TestCase testID="property_enabled" keywords="['enabled']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -113,7 +113,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="enabled" value="false"/>
</body>
</TestCase>
- <TestCase testID="propert_enabled_withdisabledcolor" keywords="['enabled']">
+ <TestCase testID="property_enabled_withdisabledcolor" keywords="['enabled']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -124,10 +124,10 @@
<SetStyle styleName="disabledColor" value="#FFCC00" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<SetProperty propertyName="enabled" value="false" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_enabled2.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_enabled2.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_explicitheight_400" keywords="['explicitheight']">
+ <TestCase testID="property_explicitheight_400" keywords="['explicitheight']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -139,7 +139,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="height" value="400"/>
</body>
</TestCase>
- <TestCase testID="propert_explicitheight_200" keywords="['explicitheight_200']">
+ <TestCase testID="property_explicitheight_200" keywords="['explicitheight_200']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -175,7 +175,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="width" value="200"/>
</body>
</TestCase>
- <TestCase testID="propert_explicitmaxwidth_300" keywords="['explicitmaxwidth_300']">
+ <TestCase testID="property_explicitmaxwidth_300" keywords="['explicitmaxwidth_300']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -187,7 +187,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="width" value="300"/>
</body>
</TestCase>
- <TestCase testID="propert_maxwidth_300" keywords="['maxwidth_300']">
+ <TestCase testID="property_maxwidth_300" keywords="['maxwidth_300']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -200,7 +200,7 @@
</body>
</TestCase>
- <TestCase testID="propert_maxheight" keywords="['maxheight_500']">
+ <TestCase testID="property_maxheight" keywords="['maxheight_500']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -216,7 +216,7 @@
</body>
</TestCase>
- <TestCase testID="propert_width" keywords="['width_700']">
+ <TestCase testID="property_width" keywords="['width_700']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -231,7 +231,7 @@
<CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_width_700.png"/>
</body>
</TestCase>
- <TestCase testID="propert_width_200" keywords="['width_200']">
+ <TestCase testID="property_width_200" keywords="['width_200']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -243,11 +243,11 @@
<AssertPropertyValue target="mydatagrid" propertyName="width" value="200"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_width_200.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_width_200.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_width_30" keywords="['width_30']">
+ <TestCase testID="property_width_30" keywords="['width_30']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -259,11 +259,11 @@
<AssertPropertyValue target="mydatagrid" propertyName="width" value="30"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_width_30.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_width_30.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_height" keywords="['height_120']">
+ <TestCase testID="property_height" keywords="['height_120']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -275,10 +275,10 @@
<AssertPropertyValue target="mydatagrid" propertyName="height" value="120"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_120.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_120.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_height_200" keywords="['height_200']">
+ <TestCase testID="property_height_200" keywords="['height_200']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -290,10 +290,10 @@
<AssertPropertyValue target="mydatagrid" propertyName="height" value="200"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_200.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_200.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_height_30" keywords="['height_30']">
+ <TestCase testID="property_height_30" keywords="['height_30']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -305,10 +305,10 @@
<AssertPropertyValue target="mydatagrid" propertyName="height" value="30"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_30.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_height_30.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_scalex_3" keywords="['scalex_3']">
+ <TestCase testID="property_scalex_3" keywords="['scalex_3']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -323,7 +323,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="scaleX" value="3"/>
</body>
</TestCase>
- <TestCase testID="propert_scalex_7" keywords="['scalex_7']">
+ <TestCase testID="property_scalex_7" keywords="['scalex_7']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -337,7 +337,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="scaleX" value="7"/>
</body>
</TestCase>
- <TestCase testID="propert_scalex_05" keywords="['scalex_0_5']">
+ <TestCase testID="property_scalex_05" keywords="['scalex_0_5']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -350,7 +350,7 @@
</body>
</TestCase>
- <TestCase testID="propert_scaley_05" keywords="['scaley_0_5']">
+ <TestCase testID="property_scaley_05" keywords="['scaley_0_5']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -364,7 +364,7 @@
</body>
</TestCase>
- <TestCase testID="propert_scaley_1" keywords="['scaley_1']">
+ <TestCase testID="property_scaley_1" keywords="['scaley_1']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid"/>
<RunCode code="startApp()"/>
@@ -377,7 +377,7 @@
<WaitForEffectsToEnd/>
</body>
</TestCase>
- <TestCase testID="propert_visible_true" keywords="['visible_true']">
+ <TestCase testID="property_visible_true" keywords="['visible_true']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid"/>
<RunCode code="startApp()"/>
@@ -390,7 +390,7 @@
<WaitForEffectsToEnd/>
</body>
</TestCase>
- <TestCase testID="propert_visible_false" keywords="['visible_false']">
+ <TestCase testID="property_visible_false" keywords="['visible_false']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid"/>
<RunCode code="startApp()"/>
@@ -406,7 +406,7 @@
<CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_visible_false.png"/>
</body>
</TestCase>
- <TestCase testID="propert_x_50" keywords="['x_50']">
+ <TestCase testID="property_x_50" keywords="['x_50']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -418,10 +418,10 @@
<AssertPropertyValue target="mydatagrid" propertyName="x" value="50"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_x_50.png"/>
+ <CompareBitmap timeout="5000" target="mydatagrid" url="../Properties/Baselines/datagrid_x_50.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_x_minus10" keywords="['x_minus_10']">
+ <TestCase testID="property_x_minus10" keywords="['x_minus_10']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -432,10 +432,10 @@
<SetProperty propertyName="x" value="-10" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_x_minus10.png"/>
+ <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_x_minus10.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_y_50" keywords="['y_50']">
+ <TestCase testID="property_y_50" keywords="['y_50']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -447,10 +447,10 @@
<AssertPropertyValue target="mydatagrid" propertyName="y" value="50"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_y_50.png"/>
+ <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_y_50.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_y_minus10" keywords="['y_minus_10']">
+ <TestCase testID="property_y_minus10" keywords="['y_minus_10']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -461,12 +461,12 @@
<SetProperty propertyName="y" value="-10" target="mydatagrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_y_minus10.png"/>
+ <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_y_minus10.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_focusEnabled_true" keywords="['focusEnabled_true']">
+ <TestCase testID="property_focusEnabled_true" keywords="['focusEnabled_true']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -477,11 +477,11 @@
<DispatchKeyEvent key="TAB"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_focusenabledtrue.png"/>
+ <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_focusenabledtrue.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_focusEnabled_false" keywords="['focusEnabled_false']">
+ <TestCase testID="property_focusEnabled_false" keywords="['focusEnabled_false']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -492,12 +492,12 @@
<DispatchKeyEvent key="TAB"/>
<WaitForEffectsToEnd/>
<WaitForEffectsToEnd />
- <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_focusenabledfalse.png"/>
+ <CompareBitmap timeout="5000" target="box" url="../Properties/Baselines/datagrid_focusenabledfalse.png" numColorVariances="1" maxColorVariance="2"/>
</body>
</TestCase>
- <TestCase testID="propert_focusManager" keywords="['focusManager']">
+ <TestCase testID="property_focusManager" keywords="['focusManager']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -511,7 +511,7 @@
- <TestCase testID="propert_includeInLayout_default" keywords="['includeInLayout_default']">
+ <TestCase testID="property_includeInLayout_default" keywords="['includeInLayout_default']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -522,7 +522,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="includeInLayout" value="true"/>
</body>
</TestCase>
- <TestCase testID="propert_includeInLayout_default" keywords="['includeInLayout_true']">
+ <TestCase testID="property_includeInLayout_default" keywords="['includeInLayout_true']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -534,7 +534,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="includeInLayout" value="true"/>
</body>
</TestCase>
- <TestCase testID="propert_includeInLayout_default" keywords="['includeInLayout_true']">
+ <TestCase testID="property_includeInLayout_default" keywords="['includeInLayout_true']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -547,7 +547,7 @@
</body>
</TestCase>
- <TestCase testID="propert_measuredHeight" keywords="['measuredHeight']">
+ <TestCase testID="property_measuredHeight" keywords="['measuredHeight']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -559,7 +559,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="measuredHeight" value="142"/>
</body>
</TestCase>
- <TestCase testID="propert_measuredWidth" keywords="['measuredWidth']">
+ <TestCase testID="property_measuredWidth" keywords="['measuredWidth']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -572,7 +572,7 @@
</body>
</TestCase>
- <TestCase testID="propert_measuredMinWidth" keywords="['measuredMinWidth']">
+ <TestCase testID="property_measuredMinWidth" keywords="['measuredMinWidth']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -584,7 +584,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="measuredMinWidth" value="40"/>
</body>
</TestCase>
- <TestCase testID="propert_measuredMinHeight" keywords="['measuredMinHeight']">
+ <TestCase testID="property_measuredMinHeight" keywords="['measuredMinHeight']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -597,7 +597,7 @@
</body>
</TestCase>
- <TestCase testID="propert_minWidth_default" keywords="['minWidth']">
+ <TestCase testID="property_minWidth_default" keywords="['minWidth']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -609,7 +609,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="minWidth" value="40"/>
</body>
</TestCase>
- <TestCase testID="propert_minHeight_default" keywords="['minHeight']">
+ <TestCase testID="property_minHeight_default" keywords="['minHeight']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -622,7 +622,7 @@
</body>
</TestCase>
- <TestCase testID="propert_minWidth" keywords="['minWidth']">
+ <TestCase testID="property_minWidth" keywords="['minWidth']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -634,7 +634,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="minWidth" value="100"/>
</body>
</TestCase>
- <TestCase testID="propert_minHeight" keywords="['minHeight']">
+ <TestCase testID="property_minHeight" keywords="['minHeight']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -646,7 +646,7 @@
<AssertPropertyValue target="mydatagrid" propertyName="minHeight" value="100"/>
</body>
</TestCase>
- <TestCase testID="propert_owner" keywords="['owner']">
+ <TestCase testID="property_owner" keywords="['owner']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -659,7 +659,7 @@
</body>
</TestCase>
- <TestCase testID="propert_parent" keywords="['parent']">
+ <TestCase testID="property_parent" keywords="['parent']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -672,7 +672,7 @@
</body>
</TestCase>
- <TestCase testID="propert_parentApplication" keywords="['parentApplication']">
+ <TestCase testID="property_parentApplication" keywords="['parentApplication']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -685,7 +685,7 @@
</body>
</TestCase>
- <TestCase testID="propert_parentDocument" keywords="['parentDocument']">
+ <TestCase testID="property_parentDocument" keywords="['parentDocument']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -698,7 +698,7 @@
</body>
</TestCase>
- <TestCase testID="propert_styleDeclaration" keywords="['styleDeclaration']">
+ <TestCase testID="property_styleDeclaration" keywords="['styleDeclaration']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -712,7 +712,7 @@
</TestCase>
<!--
- <TestCase testID="propert_focusPane" keywords="['focusEnabled_true']">
+ <TestCase testID="property_focusPane" keywords="['focusEnabled_true']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
@@ -726,7 +726,7 @@
</body>
</TestCase>
- <TestCase testID="propert_toolTip" keywords="['toolTip']">
+ <TestCase testID="property_toolTip" keywords="['toolTip']">
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Properties/formatters.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Properties/formatters.mxml b/mustella/tests/components/AdvancedDataGrid/Properties/formatters.mxml
index 7cfe625..c793600 100644
--- a/mustella/tests/components/AdvancedDataGrid/Properties/formatters.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Properties/formatters.mxml
@@ -374,7 +374,7 @@ public function setzipcodeformatter():void {
</setup>
<body>
<WaitForEffectsToEnd />
- <CompareBitmap target="myCustomADG.mydatagrid" url="../Properties/Baselines/groupview.png" timeout="5000" />
+ <CompareBitmap target="myCustomADG.mydatagrid" url="../Properties/Baselines/groupview.png" timeout="5000" numColorVariances="2" maxColorVariance="2"/>
</body>
</TestCase>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridColumnGroupMain.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridColumnGroupMain.mxml b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridColumnGroupMain.mxml
index f57533d..5d1df8f 100644
--- a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridColumnGroupMain.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridColumnGroupMain.mxml
@@ -19,7 +19,34 @@
-->
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" layout="vertical" height="700" width="850" >
- <mx:Style source="../../../../Assets/Fonts/MyStyles.css" />
+ <mx:Style>
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ mx|AdvancedDataGrid {
+ /* embed the numeric sort indicator */
+ sortFontFamily: EmbeddedVerdana;
+ }
+
+ global {
+ fontFamily: EmbeddedVerdana;
+ fontAntiAliasType: normal;
+ }
+ </mx:Style>
<mx:XMLList id="comps" xmlns="">
<companylist>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain.mxml b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain.mxml
index 99446ea..38f8958 100644
--- a/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/SWFs/AdvancedDataGridMain.mxml
@@ -19,32 +19,57 @@
-->
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" layout="vertical" >
- <mx:Style source="../../../../Assets/Fonts/MyStyles.css" />
-
<mx:Style>
- @namespace s "library://ns.adobe.com/flex/spark";
- @namespace mx "library://ns.adobe.com/flex/mx";
-
- @font-face{
- src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
- fontFamily: myArial;
- embedAsCFF: true;
- }
-
- @font-face{
- src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Bold.ttf");
- fontWeight: bold;
- fontFamily: myArial;
- embedAsCFF: true;
- }
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Italic.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: normal;
+ fontStyle: italic;
+ embedAsCFF: false;
+ }
+
+ /* Used by some of the styles tests. */
+ @font-face {
+ src: url("../../../../Assets/Fonts/Cousine/Cousine-Regular.ttf");
+ fontFamily: EmbeddedArial;
+ embedAsCFF: false;
+ }
- @font-face{
- src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Italic.ttf");
- fontStyle: italic;
- fontFamily: myArial;
- embedAsCFF: true;
- }
- </mx:Style>
+ @font-face {
+ src: url("../../../../Assets/Fonts/Cousine/Cousine-Bold.ttf");
+ fontFamily: EmbeddedArial;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ mx|AdvancedDataGrid {
+ /* embed the numeric sort indicator */
+ sortFontFamily: EmbeddedVerdana;
+ }
+
+ global {
+ fontFamily: EmbeddedVerdana;
+ fontAntiAliasType: normal;
+ }
+ </mx:Style>
<mx:Script>
<![CDATA[
@@ -57,8 +82,10 @@
{col1:546, col2:08056781372, col3:409},
{col1:123, col2:08543217703, col3:769},
{col1:511, col2:04562341444, col3:209},
- {col1:444322, col2:09873452144, col3:555} ]);
+ {col1:444322, col2:09873452144, col3:555}
+ ]);
}
+
]]>
</mx:Script>
@@ -66,7 +93,7 @@
<mx:AdvancedDataGrid id="mydatagrid" dataProvider="{mydata}">
<mx:columns>
<mx:AdvancedDataGridColumn headerText="Column 1" id="col1" dataField="col1"/>
- <mx:AdvancedDataGridColumn headerText="Column 2" id="col2" dataField="col2"/>
+ <mx:AdvancedDataGridColumn headerText="Column 2" id="col2" dataField="col2" />
<mx:AdvancedDataGridColumn headerText="Column 3" id="col3" dataField="col3"/>
</mx:columns>
</mx:AdvancedDataGrid>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/SWFs/Formatters_Main.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/SWFs/Formatters_Main.mxml b/mustella/tests/components/AdvancedDataGrid/SWFs/Formatters_Main.mxml
index 25dbf3c..093e1cf 100644
--- a/mustella/tests/components/AdvancedDataGrid/SWFs/Formatters_Main.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/SWFs/Formatters_Main.mxml
@@ -19,7 +19,34 @@
-->
<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" layout="vertical" >
- <mx:Style source="../../../../Assets/Fonts/MyStyles.css" />
+ <mx:Style>
+ @namespace s "library://ns.adobe.com/flex/spark";
+ @namespace mx "library://ns.adobe.com/flex/mx";
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Open_Sans/OpenSans-Regular.ttf");
+ fontFamily: EmbeddedVerdana;
+ embedAsCFF: false;
+ }
+
+ @font-face {
+ src: url("../../../../Assets/Fonts/Lobster_Two/LobsterTwo-Bold.ttf");
+ fontFamily: EmbeddedVerdana;
+ fontWeight: bold;
+ fontStyle: normal;
+ embedAsCFF: false;
+ }
+
+ mx|AdvancedDataGrid {
+ /* embed the numeric sort indicator */
+ sortFontFamily: EmbeddedVerdana;
+ }
+
+ global {
+ fontFamily: EmbeddedVerdana;
+ fontAntiAliasType: normal;
+ }
+ </mx:Style>
<mx:Script>
<![CDATA[
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png
index cf7a1a6..4f27c4c 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_alternatingitemcolors.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_all.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_bordersides_lr.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_inset.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_borderstyle_outset.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_dropShadowEnabled_true.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png
deleted file mode 100644
index 463a024..0000000
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontfamily_arial.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png
index 1f50c14..5c253e1 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontsize_16.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png
index 2096b7b..5819591 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontstyle_italic.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png
index 07bf0e2..458bae5 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_fontweight_bold.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png
index d43a8bc..4732b0a 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_headercolors.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingLeft.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingRight.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png
index 1dbb051..5ad8de9 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingTop.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png
index ceadd09..b14593f 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_paddingbottom.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdirection_right.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_shadowdistance_8.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png
index 3b28d8f..1d1cc4b 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_textdecoration_underline.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_userollover.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_bottom.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png
index 35ded2a..50ed9b0 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalalign_top.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png
index 9fc6eb3..6c5d851 100644
Binary files a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/datagrid_verticalgridlinestrue.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png
new file mode 100644
index 0000000..164044b
Binary files /dev/null and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedArial.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png
new file mode 100644
index 0000000..50ed9b0
Binary files /dev/null and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_AS_EmbeddedVerdana.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png
new file mode 100644
index 0000000..164044b
Binary files /dev/null and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedArial.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png
new file mode 100644
index 0000000..50ed9b0
Binary files /dev/null and b/mustella/tests/components/AdvancedDataGrid/Styles/Baselines/style_fontFamily_mxml_EmbeddedVerdana.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_listbase.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_listbase.mxml b/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_listbase.mxml
index ab3d4d1..0aa7f20 100644
--- a/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_listbase.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_listbase.mxml
@@ -72,11 +72,6 @@
{
application.mydatagrid.setStyle("backgroundColor",0xFF0000);
}
- public function setFF():void
- {
-
- application.mydatagrid.setStyle("fontFamily","Arial");
- }
public function startApp():void
{
application.startIt();
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/54c3e9f1/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml b/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
index 8c45207..f8f2f91 100644
--- a/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
+++ b/mustella/tests/components/AdvancedDataGrid/Styles/advanceddatagrid_styles_scrollcontrolbase.mxml
@@ -64,7 +64,7 @@
}
public function setFF():void
{
- application.mydatagrid.setStyle("fontFamily","MyArial");
+ application.mydatagrid.setStyle("fontFamily","EmbeddedArial");
}
public function startApp():void
{
@@ -208,10 +208,11 @@
<RunCode code="startApp()" waitTarget="mydatagrid" waitEvent="updateComplete"/>
</setup>
<body>
- <SetStyle target="mydatagrid" styleName="fontFamily" value="Verdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <SetStyle target="mydatagrid" styleName="fontFamily" value="MyArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <CompareBitmap target="mydatagrid" url="../Styles/Baselines/$testID_EmbeddedVerdana.png" timeout="5000" />
+
+ <SetStyle target="mydatagrid" styleName="fontFamily" value="EmbeddedArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Styles/Baselines/datagrid_fontfamily_arial.png" timeout="5000" />
+ <CompareBitmap target="mydatagrid" url="../Styles/Baselines/$testID_EmbeddedArial.png" timeout="5000" />
</body>
</TestCase>
@@ -219,13 +220,14 @@
<setup>
<ResetComponent target="mydatagrid" className="mx.controls.AdvancedDataGrid" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<RunCode code="startApp()" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <SetStyle target="mydatagrid" styleName="fontFamily" value="Verdana" waitTarget="mydatagrid" waitEvent="updateComplete"/>
- <RunCode code="setFF()"/>
</setup>
<body>
- <SetStyle target="mydatagrid" styleName="fontFamily" value="MyArial" waitTarget="mydatagrid" waitEvent="updateComplete"/>
+ <CompareBitmap target="mydatagrid" url="../Styles/Baselines/$testID_EmbeddedVerdana.png" timeout="5000" />
+
+ <RunCode code="setFF()" waitTarget="mydatagrid" waitEvent="updateComplete"/>
<WaitForEffectsToEnd />
- <CompareBitmap target="mydatagrid" url="../Styles/Baselines/datagrid_fontfamily_arial.png" timeout="5000" />
+
+ <CompareBitmap target="mydatagrid" url="../Styles/Baselines/$testID_EmbeddedArial.png" timeout="5000" />
</body>
</TestCase>