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:47:11 UTC
svn commit: r1395691 - in
/incubator/flex/sdk/branches/develop/mustella/tests: ./
containers/Canvas/Properties/ gumbo/components/MXItemRenderer/properties/
gumbo/components/MXItemRenderer/properties/baselines/
gumbo/components/NumericStepper/Properties...
Author: cframpton
Date: Mon Oct 8 17:47:11 2012
New Revision: 1395691
URL: http://svn.apache.org/viewvc?rev=1395691&view=rev
Log:
Remove _mac tests, rename bitmaps and remove unused bitmaps.
Added:
incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS.png
- copied unchanged from r1395603, incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac@win.png
incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS@mac.png
- copied unchanged from r1395603, incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac.png
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/baselines/MXTIR_layout_haloContent_001_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac@win.png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt
incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/MXTIR_properties_main.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/baselines/MXTIR_layout_haloContent_001.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Properties/NumericStepper_Positioning.mxml
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Styles/NumericStepper_Styles.mxml
incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.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=1395691&r1=1395690&r2=1395691&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:47:11 2012
@@ -758,7 +758,6 @@ containers/ApplicationControlBar/Styles/
containers/ApplicationControlBar/Styles/ApplicationControlBar_Styles$ApplicationControlBar_Styles_fontfamily_airOnly,
containers/ApplicationControlBar/Styles/ApplicationControlBar_Styles$ApplicationControlBar_Styles_paddingTop,
containers/Box/Styles/Box_Styles$Box_Styles_fontfamily,
-containers/Canvas/Properties/ContentSizedConstraints_Canvas$contentSizedColumn_bugSDK12056,
containers/ControlBar/Styles/ControlBar_Styles$ControlBar_Styles_fontfamily,
containers/ControlBar/Styles/ControlBar_Styles$ControlBar_Styles_fontfamily_airOnly,
containers/ControlBar/Styles/ControlBar_Styles$ControlBar_Styles_paddingTop,
@@ -1234,12 +1233,9 @@ gumbo/components/ListDragDrop/SparkHaloD
gumbo/components/ListDragDrop/SparkHaloDND/SparkList_main$SparkTileListIconsRows_move1,
gumbo/components/ListDragDrop/SparkHaloDND/SparkList_main$SparkVListIcons_copy11,
gumbo/components/ListDragDrop/SparkHaloDND/SparkList_main$SparkVListIcons_move1,
-gumbo/components/MXItemRenderer/properties/MXTIR_properties_main$MXTIR_layout_haloContent_001,
gumbo/components/NavigatorContent/integration/NavigatorContent_integration_nc$integration_nc_test1,
-gumbo/components/NumericStepper/Properties/NumericStepper_Positioning$NumericStepper_baseline,
gumbo/components/NumericStepper/Properties/NumericStepper_Properties$NumericStepper_baselinePosition_postValidation,
gumbo/components/NumericStepper/Properties/NumericStepper_Properties$NumericStepper_baselinePosition_preValidation,
-gumbo/components/NumericStepper/Styles/NumericStepper_Styles$NumericStepper_styles_baseline,
gumbo/components/Panel/Properties/Panel_Properties_basic3$Panel_Properties_errorString1,
gumbo/components/Panel/Styles/Panel_Styles$Panel_Styles_lineThrough_airOnly,
gumbo/components/RadioButton/styles/FxRadioButton_textStyles$breakOpportunity_all_RadioButton,
@@ -2564,7 +2560,6 @@ spark/globalization/Collator/Properties/
spark/globalization/StringTools/Fallback/ST_fallback_getAvailableLocaleIDNames_tester$ST_fallback_getAvailableLocaleIDNames_test1,
spark/globalization/StringTools/Properties/ST_actualLocaleIDName_tester$StringTools_actualLocaleIDName_inheritUIcommponent_inline_test25,
spark/globalization/StringTools/Properties/ST_actualLocaleIDName_tester$StringTools_actualLocaleIDName_inheritUIcommponent_script_test24,
-spark/primitives/Graphic/integration/GraphicTags_FilterTests$GraphicTags_Filters_DropShadowFilter_AS,
spark/primitives/Graphic/integration/GraphicTags_MaskTests$FXG_Masks_Path_changeWidth,
spark/styles/local/spark_application_background_css_tester$mx_panel_backgroundColor_backgroundAlpha_classSelector,
spark/styles/local/spark_application_background_css_tester$spark_application_backgroundColor_backgroundAlpha_classSelector,
Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml Mon Oct 8 17:47:11 2012
@@ -580,68 +580,8 @@
<RunCode code="application.emptyCanvas.addChild(newButton)" waitEvent="childAdd" waitTarget="emptyCanvas"/>
<AssertPropertyValue target="emptyCanvas.constraintColumns.0" propertyName="width" value="40" />
- <AssertPropertyValue target="emptyCanvas.constraintColumns.1" propertyName="width" value="72" />
- </body>
- </TestCase>
- <TestCase testID="contentSizedColumn_bugSDK12056_mac" keywords="[ConstraintRows, Canvas, SDK-12056, Bug]"
- description="Coverage for bug SDK-12056" >
- <setup>
- <ResetComponent target="emptyCanvas" className="mx.containers.Canvas" waitTarget="emptyCanvas" waitEvent="updateComplete" />
- <RunCode code="newRows=[];newColumns=[]" />
- </setup>
- <body>
- <RunCode code="newConstraintRow = new ConstraintRow()" />
- <SetProperty target="script:newConstraintRow" propertyName="id" value="row1" />
- <SetProperty target="script:newConstraintRow" propertyName="maxHeight" value="100" />
- <RunCode code="newRows.push(newConstraintRow)" />
- <RunCode code="newConstraintRow2 = new ConstraintRow()" />
- <SetProperty target="script:newConstraintRow2" propertyName="id" value="row2" />
- <SetProperty target="script:newConstraintRow2" propertyName="maxHeight" value="100" />
- <RunCode code="newRows.push(newConstraintRow2)" />
- <SetProperty target="emptyCanvas" propertyName="constraintRows" valueExpression="value=newRows" waitEvent="updateComplete" waitTarget="emptyCanvas" />
- <RunCode code="newConstraintColumn = new ConstraintColumn()" />
- <SetProperty target="script:newConstraintColumn" propertyName="id" value="col1" />
- <SetProperty target="script:newConstraintColumn" propertyName="maxWidth" value="100" />
- <RunCode code="newColumns.push(newConstraintColumn)" />
- <RunCode code="newConstraintColumn2 = new ConstraintColumn()" />
- <SetProperty target="script:newConstraintColumn2" propertyName="id" value="col2" />
- <SetProperty target="script:newConstraintColumn2" propertyName="maxWidth" value="100" />
- <RunCode code="newColumns.push(newConstraintColumn2)" />
- <SetProperty target="emptyCanvas" propertyName="constraintColumns" valueExpression="value=newColumns" waitEvent="updateComplete" waitTarget="emptyCanvas" />
-
- <RunCode code="newButton = new Button()" />
- <SetStyle styleName="top" valueExpression="value='row1:0'" target="script:newButton" />
- <SetStyle styleName="bottom" valueExpression="value='row1:0'" target="script:newButton" />
- <SetStyle styleName="left" valueExpression="value='col1:0'" target="script:newButton" />
- <SetStyle styleName="right" valueExpression="value='col1:0'" target="script:newButton" />
- <RunCode code="application.emptyCanvas.addChild(newButton)" waitEvent="childAdd" waitTarget="emptyCanvas"/>
-
- <RunCode code="newButton = new Button()" />
- <SetStyle styleName="top" valueExpression="value='row1:0'" target="script:newButton" />
- <SetStyle styleName="bottom" valueExpression="value='row1:0'" target="script:newButton" />
- <SetStyle styleName="left" valueExpression="value='col2:0'" target="script:newButton" />
- <SetStyle styleName="right" valueExpression="value='col2:0'" target="script:newButton" />
- <SetProperty propertyName="label" target="script:newButton" value="test test" />
- <RunCode code="application.emptyCanvas.addChild(newButton)" waitEvent="childAdd" waitTarget="emptyCanvas"/>
-
- <RunCode code="newButton = new Button()" />
- <SetStyle styleName="top" valueExpression="value='row2:0'" target="script:newButton" />
- <SetStyle styleName="bottom" valueExpression="value='row2:0'" target="script:newButton" />
- <SetStyle styleName="left" valueExpression="value='col1:0'" target="script:newButton" />
- <SetStyle styleName="right" valueExpression="value='col1:0'" target="script:newButton" />
- <RunCode code="application.emptyCanvas.addChild(newButton)" waitEvent="childAdd" waitTarget="emptyCanvas"/>
-
- <RunCode code="newButton = new Button()" />
- <SetStyle styleName="top" valueExpression="value='row2:0'" target="script:newButton" />
- <SetStyle styleName="bottom" valueExpression="value='row2:0'" target="script:newButton" />
- <SetStyle styleName="left" valueExpression="value='col2:0'" target="script:newButton" />
- <SetStyle styleName="right" valueExpression="value='col2:0'" target="script:newButton" />
- <RunCode code="application.emptyCanvas.addChild(newButton)" waitEvent="childAdd" waitTarget="emptyCanvas"/>
-
- <AssertPropertyValue target="emptyCanvas.constraintColumns.0" propertyName="width" value="40" />
<AssertPropertyValue target="emptyCanvas.constraintColumns.1" propertyName="width" value="68" />
</body>
</TestCase>
-
</testCases>
</UnitTester>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/MXTIR_properties_main.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/MXTIR_properties_main.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/MXTIR_properties_main.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/MXTIR_properties_main.mxml Mon Oct 8 17:47:11 2012
@@ -151,21 +151,6 @@ MXItemRenderer Testing - Tree - Properti
<SetProperty target="treeRoot.tree1" propertyName="height" value="250" waitEvent="updateComplete" />
<RunCode code="FlexGlobals.topLevelApplication.treeRoot.tree1.expandChildrenOf(FlexGlobals.topLevelApplication.treeRoot.tree1.dataProvider.children()[0], true)" waitEvent="updateComplete" waitTarget="treeRoot.tree1" />
<AssertPropertyValue target="treeRoot.tree1" propertyName="rowHeight" value="133" />
- <CompareBitmap url="../properties/baselines/$testID.png" target="treeRoot.tree1" numColorVariances="10" maxColorVariance="10" />
- </body>
-</TestCase>
-
-<TestCase testID="MXTIR_layout_haloContent_001_mac" keywords="[Tree, mxTreeItemRenderer,content]" description="render has halo contents, verify layout is expected " >
- <setup>
- <ResetComponent target="treeRoot" className="comps.TreeIntegration" waitEvent="updateComplete" />
- </setup>
- <body>
- <SetProperty target="treeRoot.tree1" propertyName="showRoot" value="false" waitEvent="updateComplete" />
- <SetProperty target="treeRoot.tree1" propertyName="itemRenderer" value="{new ClassFactory(comps.MXTIR_HaloContent)}" />
- <SetProperty target="treeRoot.tree1" propertyName="editable" value="true" />
- <SetProperty target="treeRoot.tree1" propertyName="height" value="250" waitEvent="updateComplete" />
- <RunCode code="FlexGlobals.topLevelApplication.treeRoot.tree1.expandChildrenOf(FlexGlobals.topLevelApplication.treeRoot.tree1.dataProvider.children()[0], true)" waitEvent="updateComplete" waitTarget="treeRoot.tree1" />
- <AssertPropertyValue target="treeRoot.tree1" propertyName="rowHeight" value="133" />
<CompareBitmap url="../properties/baselines/$testID.png" target="treeRoot.tree1" numColorVariances="15" ignoreMaxColorVariance="true" />
</body>
</TestCase>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/baselines/MXTIR_layout_haloContent_001.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/MXItemRenderer/properties/baselines/MXTIR_layout_haloContent_001.png?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Properties/NumericStepper_Positioning.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Properties/NumericStepper_Positioning.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Properties/NumericStepper_Positioning.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Properties/NumericStepper_Positioning.mxml Mon Oct 8 17:47:11 2012
@@ -27,17 +27,6 @@
<SetProperty target="myNS_B2" propertyName="baseline" value="100" waitEvent="updateComplete" waitTarget="myNS_B2"/>
</setup>
<body>
- <!--CompareBitmap target="" url="../Properties/Baselines/$testID.png"/-->
- <SetProperty value="30" target="myNS_B2" propertyName="height" waitEvent="updateComplete" waitTarget="myNS_B2"/>
- <AssertPropertyValue target="myNS_B2" propertyName="y" value="85" />
- </body>
- </TestCase>
- <TestCase testID="NumericStepper_baseline_Mac" keywords="[FxNumericStepper, Default]" description="Test Default Values for Spark NumericStepper">
- <setup>
- <ResetComponent target="myNS_B2" className="comps.myCustomNS" waitEvent="updateComplete" waitTarget="myNS_B2"/>
- <SetProperty target="myNS_B2" propertyName="baseline" value="100" waitEvent="updateComplete" waitTarget="myNS_B2"/>
- </setup>
- <body>
<SetProperty value="30" target="myNS_B2" propertyName="height" waitEvent="updateComplete" waitTarget="myNS_B2"/>
<AssertPropertyValue target="myNS_B2" propertyName="y" value="84" />
</body>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Styles/NumericStepper_Styles.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Styles/NumericStepper_Styles.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Styles/NumericStepper_Styles.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/NumericStepper/Styles/NumericStepper_Styles.mxml Mon Oct 8 17:47:11 2012
@@ -34,20 +34,6 @@
</setup>
<body>
<SetProperty value="30" target="myNS3" propertyName="height" waitEvent="updateComplete" waitTarget="myNS3"/>
- <AssertPropertyValue target="myNS3" propertyName="y" value="0" />
- <!--CompareBitmap target="myPanel" url="../Styles/Baselines/$testID_1.png"/-->
- <SetStyle target="myNS3" styleName="baseline" value="50" waitTarget="myNS3" waitEvent="updateComplete"/>
- <!--CompareBitmap numColorVariances="4" maxColorVariance="7" target="myPanel" url="../Styles/Baselines/$testID_2.png"/-->
- <AssertPropertyValue target="myNS3" propertyName="y" value="35" />
- </body>
- </TestCase>
- <TestCase testID="NumericStepper_styles_baseline_Mac" keywords="[NumericStepper, Styles, baseline]" description="Test baseline style on Spark NumericStepper">
- <setup>
- <ResetComponent target="myNS3" className="comps.myCustomNS" waitEvent="updateComplete" waitTarget="myNS3"/>
- <SetProperty target="myNS3" propertyName="x" value="100" waitEvent="updateComplete" waitTarget="myNS3"/>
- </setup>
- <body>
- <SetProperty value="30" target="myNS3" propertyName="height" waitEvent="updateComplete" waitTarget="myNS3"/>
<AssertPropertyValue target="myNS3" propertyName="y" value="0" />
<SetStyle target="myNS3" styleName="baseline" value="50" waitTarget="myNS3" waitEvent="updateComplete"/>
<AssertPropertyValue target="myNS3" propertyName="y" value="34" />
Modified: incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml Mon Oct 8 17:47:11 2012
@@ -1712,20 +1712,11 @@
<RunCode code="application.grp.addElement(new moveto_path)" waitEvent="updateComplete" waitTarget="grp"/>
</setup>
<body>
- <CompareBitmap url="../properties/baselines/$testID.png" numColorVariances="38" ignoreMaxColorVariance="true" target="grp" />
+ <CompareBitmap url="../properties/baselines/$testID.png" numColorVariances="38" ignoreMaxColorVariance="true" target="grp">
+ <ConditionalValue os="mac" url="../properties/baselines/$testID_mac.png"/>
+ </CompareBitmap>
</body>
</TestCase>
- <TestCase testID="paths_moveto_path_mac" keywords="[fxg]">
- <setup>
- <ResetComponent target="grp" className="comps.MyComp" waitEvent="updateComplete" waitTarget="grp"/>
- <RunCode code="application.grp.addElement(new moveto_path)" waitEvent="updateComplete" waitTarget="grp"/>
- </setup>
- <body>
- <CompareBitmap url="../properties/baselines/$testID.png" numColorVariances="24" ignoreMaxColorVariance="true" target="grp" />
- </body>
- </TestCase>
-
-
<TestCase testID="paths_quadbezier_path" keywords="[fxg]">
<setup>
<ResetComponent target="grp" className="comps.MyComp" waitEvent="updateComplete" waitTarget="grp"/>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml?rev=1395691&r1=1395690&r2=1395691&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml Mon Oct 8 17:47:11 2012
@@ -135,17 +135,7 @@
<CompareBitmap url="../Integration/baselines/GradientGlowGraphic_mxml.png" target="graphic8.getChildAt(0)" timeout="2000" />
</body>
</TestCase>
- <TestCase testID="GraphicTags_Filters_DropShadowFilter_AS" description="Test that a DropShadow set on a Graphic looks right" keywords="[DropShadowFilter, Filters, Graphic, MXMLG-219]">
- <setup>
- <RunCode code="clearSpace()" />
- <RunCode code="addFilter(1,1)" />
- <Pause timeout="300" />
- </setup>
- <body>
- <CompareBitmap url="../Integration/baselines/AddFilter_AS.png" target="graphic9" timeout="2000" />
- </body>
- </TestCase>
- <TestCase testID="GraphicTags_Filters_DropShadowFilter_AS_mac" description="Test that a DropShadow set on a Graphic looks right" keywords="[DropShadowFilter, Filters, Graphic, MXMLG-219]">
+ <TestCase testID="GraphicTags_Filters_DropShadowFilter_AS" description="Test that a DropShadow set on a Graphic looks right" keywords="[DropShadowFilter, Filters, Graphic, MXMLG-219]">
<setup>
<RunCode code="clearSpace()" />
<RunCode code="addFilter(1,1)" />
@@ -153,7 +143,7 @@
</setup>
<body>
<CompareBitmap url="../Integration/baselines/" target="graphic9" timeout="2000">
- <ConditionalValue os="win" />
+ <ConditionalValue os="mac" />
</CompareBitmap>
</body>
</TestCase>