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/10/08 19:01:12 UTC
svn commit: r1395661 - in
/incubator/flex/sdk/branches/develop/mustella/tests: ./
components/CheckBox/properties/ components/DataGrid/DataGrid_HaloSkin/Styles/
components/DataGrid/DataGrid_HaloSkin/Styles/Baselines/
components/DataGrid/DataGrid_SparkSk...
Author: cframpton
Date: Mon Oct 8 17:01:11 2012
New Revision: 1395661
URL: http://svn.apache.org/viewvc?rev=1395661&view=rev
Log:
Remove _mac tests and add back in Alert tests which run correctly on both platforms.
Added:
incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/baselines/textDecoration_css_submenu.png
- copied unchanged from r1395603, incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/baselines/textDecoration_css_submenu_mac.png
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/Baselines/styleName_multiple_precedence_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/Baselines/styleName_multiple_precedence_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/baselines/textDecoration_css_submenu_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/baselines/textDecoration_underline_submenu_mac.png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt
incubator/flex/sdk/branches/develop/mustella/tests/components/CheckBox/properties/CheckBox_properties_tester_Spark.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_Styles_styleName.mxml
incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml
Modified: incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt?rev=1395661&r1=1395660&r2=1395661&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt Mon Oct 8 17:01:11 2012
@@ -93,22 +93,6 @@ Application/Application_SparkSkin/Proper
Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application$constraintRow_contentSized_mxml_noHeightOnComponent,
Application/Application_SparkSkin/Properties/PercentConstraints_Application$constraintRows_percentage_changeRow2AtRuntime,
Application/Application_SparkSkin/Styles/Application_Styles$style_backgroundGradientColors_test1_AIR,
-components/Alert/Properties/Alert_Properties$Alert_layoutDirection_direction_rtl,
-components/Alert/Properties/Alert_Properties$Alert_layoutDirection_direction_rtl_with_alertIcon,
-components/Alert/Properties/Alert_Properties_Spark$Alert_layoutDirection_direction_rtl_spark,
-components/Alert/Properties/Alert_Properties_Spark$Alert_layoutDirection_direction_rtl_with_alertIcon_spark,
-components/Alert/Properties/Alert_Properties_Spark_wireframe$Alert_layoutDirection_direction_rtl_spark_wireframe,
-components/Alert/Properties/Alert_Properties_Spark_wireframe$Alert_layoutDirection_direction_rtl_with_alertIcon_spark_wireframe,
-components/Alert/Styles/Alert_Styles$Alert_buttonStyleName,
-components/Alert/Styles/Alert_Styles$Alert_embedded_font_verdana,
-components/Alert/Styles/Alert_Styles$Alert_embedded_font_verdana_bold,
-components/Alert/Styles/Alert_Styles$Alert_embedded_font_verdana_italic,
-components/Alert/Styles/Alert_Styles$Alert_letterSpacing,
-components/Alert/Styles/Alert_Styles$Alert_messageStyleName,
-components/Alert/Styles/Alert_Styles$Alert_titleStyleName,
-components/Alert/Versioning/MP_Alert_Tests$MP_Alert_compatible_checkMask,
-components/Alert/Versioning/MP_Alert_Tests$MP_AlertParentIsChildApp_compatible,
-components/Alert/Versioning/MP_Alert_Tests$MP_AlertParentIsParentApp_compatible,
components/ButtonBar/Styles/ButtonBar_Styles_Basic$ButtonBar_Style_Basic_Embed_Font_Bold_airOnly,
components/ButtonBar/Styles/ButtonBar_Styles_Basic_bc$ButtonBar_Style_Basic_buttonHeight,
components/ButtonBar/Styles/ButtonBar_Styles_Basic_bc$ButtonBar_Style_Basic_horizontalGap,
@@ -476,8 +460,6 @@ components/Menu/Spark/Styles/Menu_Styles
components/MenuBar/Halo/Styles/MenuBar_MenuStyles$branchDisabledIcon_static,
components/MenuBar/Halo/Styles/MenuBar_MenuStyles$branchIcon_css,
components/MenuBar/Halo/Styles/MenuBar_MenuStyles$branchIcon_static,
-components/MenuBar/Halo/Styles/MenuBar_StylesAS$textDecoration_css_submenu,
-components/MenuBar/Halo/Styles/MenuBar_StylesAS$textDecoration_underline_submenu,
components/NumericStepper/styles/AIRNumericStepper_Styles_tester$AIRNumericStepper_Styles_backgroundAlpha,
components/NumericStepper/styles/AIRNumericStepper_Styles_tester$AIRNumericStepper_Styles_backgroundColor_DecimalValue,
components/NumericStepper/styles/AIRNumericStepper_Styles_tester$AIRNumericStepper_Styles_backgroundColor_hexaDecimal,
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/CheckBox/properties/CheckBox_properties_tester_Spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/CheckBox/properties/CheckBox_properties_tester_Spark.mxml?rev=1395661&r1=1395660&r2=1395661&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/CheckBox/properties/CheckBox_properties_tester_Spark.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/CheckBox/properties/CheckBox_properties_tester_Spark.mxml Mon Oct 8 17:01:11 2012
@@ -117,15 +117,6 @@
</body>
</TestCase>
- <TestCase testID="Spark_height_property_default_of_CheckBox_macOnly" description="Test that the default height of CheckBox is 18" keywords="[CheckBox, height, property]">
- <setup>
- <ResetComponent target="myCheckBox" className="mx.controls.CheckBox" waitEvent="updateComplete" waitTarget="myCheckBox"/>
- </setup>
- <body>
- <AssertPropertyValue target="myCheckBox" propertyName="height" value="21"/>
- </body>
- </TestCase>
-
<TestCase testID="Spark_height_property_50_of_CheckBox" description="Test that the height of CheckBox is 50" keywords="[CheckBox, height, property]">
<setup>
<ResetComponent target="myCheckBox" className="mx.controls.CheckBox" waitEvent="updateComplete" waitTarget="myCheckBox"/>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml?rev=1395661&r1=1395660&r2=1395661&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml Mon Oct 8 17:01:11 2012
@@ -76,21 +76,6 @@
</body>
</TestCase>
- <TestCase testID="styleName_multiple_precedence_mac_halo" description="Test multiple styleNames for DataGrid. This test will only work with Flex 4 and newer."
- keywords="[DataGrid, styleName, CSS]" >
- <setup>
- <ResetComponent target="gridInCanvas" className="comps.dataGridInCanvasComp" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="width" value="200" target="gridInCanvas" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="height" value="200" target="gridInCanvas" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="dataProvider" target="gridInCanvas.getChildAt(0)" valueExpression="value=application.myDP"
- waitEvent="updateComplete" waitTarget="gridInCanvas.getChildAt(0)" />
- </setup>
- <body>
- <SetStyle target="gridInCanvas" value="redText italicText boldBig" styleName="styleName" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <CompareBitmap target="gridInCanvas.getChildAt(0).mx_internal:rendererArray.1.0" url="../Styles/baselines/styleName_multiple_precedence_mac.png" />
- </body>
- </TestCase>
-
<TestCase testID="styleName_multiple_setStyle_halo" description="Test multiple styleNames for DataGrid used with setStyle. This test will only work with Flex 4 and newer."
keywords="[DataGrid, styleName, CSS]" >
<setup>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_Styles_styleName.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_Styles_styleName.mxml?rev=1395661&r1=1395660&r2=1395661&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_Styles_styleName.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_Styles_styleName.mxml Mon Oct 8 17:01:11 2012
@@ -77,22 +77,6 @@
</body>
</TestCase>
- <!-- FIXME: rename since this works on both platforms -->
- <TestCase testID="styleName_multiple_precedence_mac" description="Test multiple styleNames for DataGrid. This test will only work with Flex 4 and newer."
- keywords="[DataGrid, styleName, CSS]" >
- <setup>
- <ResetComponent target="gridInCanvas" className="comps.dataGridInCanvasComp" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="width" value="200" target="gridInCanvas" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="height" value="200" target="gridInCanvas" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <SetProperty propertyName="dataProvider" target="gridInCanvas.getChildAt(0)" valueExpression="value=application.myDP"
- waitEvent="updateComplete" waitTarget="gridInCanvas.getChildAt(0)" />
- </setup>
- <body>
- <SetStyle target="gridInCanvas" value="redText italicText boldBig" styleName="styleName" waitEvent="updateComplete" waitTarget="gridInCanvas" />
- <CompareBitmap target="gridInCanvas.getChildAt(0).mx_internal:rendererArray.1.0" url="../Styles/Baselines/$testID.png" timeout="5000" numColorVariances="5" ignoreMaxColorVariance="true" />
- </body>
- </TestCase>
-
<TestCase testID="styleName_multiple_setStyle" description="Test multiple styleNames for DataGrid used with setStyle. This test will only work with Flex 4 and newer."
keywords="[DataGrid, styleName, CSS]" >
<setup>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml?rev=1395661&r1=1395660&r2=1395661&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml Mon Oct 8 17:01:11 2012
@@ -500,8 +500,7 @@
<CompareBitmap target="mb2.menus.1" url="../Styles/baselines/textDecoration_underline_css_submenu.png" timeout="2500" />
</body>
</TestCase>
- <!-- FIXME: rename since this test works on both platforms despite the name -->
- <TestCase testID="textDecoration_underline_submenu_mac" description="MenuBar style textDecoration=underline." keywords="[styles, textDecoration, MenuBar]">
+ <TestCase testID="textDecoration_underline_submenu" description="MenuBar style textDecoration=underline." keywords="[styles, textDecoration, MenuBar]">
<setup>
<ResetComponent target="mb2" className="MyMenuBar" waitEvent="updateComplete" waitTarget="mb2" />
<RunCode code="application.mb2.setFocus()" waitTarget="mb2" waitEvent="focusIn" />
@@ -514,8 +513,7 @@
<CompareBitmap target="mb2.menus.1" url="../Styles/baselines/$testID.png" timeout="2500" numColorVariances="10" ignoreMaxColorVariance="true" />
</body>
</TestCase>
- <!-- FIXME: rename since this test works on both platforms despite the name -->
- <TestCase testID="textDecoration_css_submenu_mac" description="MenuBar style textDecoration=underline." keywords="[styles, textDecoration, MenuBar]">
+ <TestCase testID="textDecoration_css_submenu" description="MenuBar style textDecoration=underline." keywords="[styles, textDecoration, MenuBar]">
<setup>
<ResetComponent target="mb2" className="MyMenuBar" waitEvent="updateComplete" waitTarget="mb2" />
<RunCode code="application.mb2.setFocus()" waitTarget="mb2" waitEvent="focusIn" />
@@ -529,7 +527,7 @@
</body>
</TestCase>
-<!-- backgroundSkin -->
+ <!-- backgroundSkin -->
<TestCase testID="backgroundSkin_AS" description="MenuBar style backgroundSkin=myUpSkin." keywords="[styles, backgroundSkin, MenuBar]">
<setup>
<ResetComponent target="mb2" className="MyMenuBar" waitEvent="updateComplete" waitTarget="mb2" />