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/09 20:50:48 UTC
svn commit: r1396194 - in /incubator/flex/sdk/branches/develop/mustella: ./
properties/ tests/
tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/
tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/
tests/MarshallPlan/Spark/...
Author: cframpton
Date: Tue Oct 9 18:50:46 2012
New Revision: 1396194
URL: http://svn.apache.org/viewvc?rev=1396194&view=rev
Log:
More elimination of duplicate set of tests and rename of tests.
Added:
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style_source.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style_source_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_nested_style.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_nested_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_style.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style_2.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style_mac_2.png
incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/baselines/MP_Spark_Component_TextAreaScrolling_compatible.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/baselines/MP_Spark_Component_TextAreaScrolling_compatible_Mac.png
incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/baselines/paths_moveto_path@mac.png
- copied unchanged from r1396130, incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/baselines/paths_moveto_path_mac.png
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_basic_noMatch_style_source_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_nested_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_combining_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style_mac.png
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/baselines/descendantSelector_noninheriting_styleSetOnParent_style_mac_2.png
incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/baselines/MP_Spark_Component_TextAreaScrolling_compatible_Mac.png
incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/Application/integration/baselines/Application_Integration_MixedComponents@mac.png
incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/baselines/paths_moveto_path_mac.png
Modified:
incubator/flex/sdk/branches/develop/mustella/ (props changed)
incubator/flex/sdk/branches/develop/mustella/properties/ (props changed)
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style.mxml
incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2.mxml
incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/MP_Spark_Controls_Tests.mxml
incubator/flex/sdk/branches/develop/mustella/tests/spark/core/fxg/properties/fxgtemplate_tester.mxml
Propchange: incubator/flex/sdk/branches/develop/mustella/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 9 18:50:46 2012
@@ -4,3 +4,4 @@ classes
tmp
failures.txt
results.txt
+local.properties
Propchange: incubator/flex/sdk/branches/develop/mustella/properties/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 9 18:50:46 2012
@@ -0,0 +1 @@
+mustella_tmp.properties
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=1396194&r1=1396193&r2=1396194&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMac.txt Tue Oct 9 18:50:46 2012
@@ -1632,13 +1632,9 @@ Managers/PopUpManager/Properties/PopUpMa
Managers/PopUpManager/Properties/PopUpManager_BugTests_spark$PopUpManager_bugSDK9428_spark,
Managers/PopUpManager/Properties/PopUpManager_properties_spark$PopUp_properties_height_MXML,
Managers/PopUpManager/Properties/PopUpManager_properties_spark$PopUp_properties_width_MXML,
-Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_RuntimeCSS$descendantSelector_basic_noMatch_style,
Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Source$descendantSelector_basic_noMatch_style,
Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style$descendantSelector_basic_noMatch_style,
-Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style$descendantSelector_combining_nested_style,
-Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style$descendantSelector_combining_style,
Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2$descendantSelector_noninheriting_style,
-Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2$descendantSelector_noninheriting_styleSetOnParent_style,
Managers/StyleManager/AdvancedCSS/idSelectors/AdvancedCSS_IDSelectors_RuntimeCSS$id_AnydescendantSelector_ControlBar_style,
Managers/StyleManager/AdvancedCSS/idSelectors/AdvancedCSS_IDSelectors_RuntimeCSS$id_AnydescendantSelector_style_neg2,
Managers/StyleManager/AdvancedCSS/idSelectors/AdvancedCSS_IDSelectors_RuntimeCSS$id_AnydescendantSelector_subclass_style,
@@ -1705,7 +1701,6 @@ MarshallPlan/Spark/MP_FCK_Tests$MP_FCK_C
MarshallPlan/Spark/MP_FCK_Tests$MP_FCK_Component_toolTip_trusted,
MarshallPlan/Spark/MP_FCK_Tests$MP_FCK_Component_toolTip_untrusted,
MarshallPlan/Spark/MP_FCK_Tests$MP_FCK_Component_toolTip_untrusted,
-MarshallPlan/Spark/MP_Spark_Controls_Tests$MP_Spark_Component_TextAreaScrolling_compatible,
MarshallPlan/Spark/MP_Spark_Controls_Tests$MP_Spark_Component_toolTip_trusted,
MarshallPlan/Spark/MP_Spark_Controls_Tests$MP_Spark_Component_toolTip_trusted,
Mirroring/styles/Mirroring_Styles_Tests$Mirroring_layoutDirection_RTL_runtime,
Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style.mxml?rev=1396194&r1=1396193&r2=1396194&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style.mxml Tue Oct 9 18:50:46 2012
@@ -64,17 +64,6 @@
<CompareBitmap url="../descendantSelectors/baselines/$testID.png" target="main_button1" />
</body>
</TestCase>
- <TestCase testID="descendantSelector_basic_noMatch_style_mac" keywords="[CSS, descendant selector]"
- description="Be sure that the style doesn't apply to other types that aren't descendants.">
- <setup>
- <ResetComponent target="panel1" className="comps.PanelComp" waitTarget="panel1" waitEvent="updateComplete" />
- <ResetComponent target="panel2" className="comps.PanelComp" waitTarget="panel2" waitEvent="updateComplete" />
- </setup>
- <body>
- <AssertStyleValue target="panel1.label1" styleName="color" value="0x000000" />
- <CompareBitmap url="../descendantSelectors/baselines/$testID.png" target="main_button1" />
- </body>
- </TestCase>
<TestCase testID="descendantSelector_subclass_style" keywords="[CSS, descendant selector]"
description="Be sure that the style applies to other subclasses of the subject">
<setup>
@@ -253,36 +242,6 @@
<CompareBitmap numColorVariances="12" maxColorVariance="20" url="../descendantSelectors/baselines/$testID.png" target="tileComp.label2" />
</body>
</TestCase>
- <TestCase testID="descendantSelector_combining_style_mac" keywords="[CSS, descendant selector, class selector]"
- description="Be sure that a descendant selector and class selector can combine styles.">
- <setup>
- <ResetComponent target="tileComp" className="comps.TileComp" waitTarget="tileComp" waitEvent="updateComplete" />
- <SetProperty propertyName="styleName" target="tileComp" value="italicStyles" waitTarget="tileComp" waitEvent="updateComplete" />
- </setup>
- <body>
- <AssertStyleValue target="tileComp.label1" styleName="fontSize" value="14" />
- <AssertStyleValue target="tileComp.button1" styleName="fontSize" value="14" />
- <AssertStyleValue target="tileComp.button2" styleName="fontSize" value="14" />
- <AssertStyleValue target="tileComp.label1" styleName="textDecoration" value="underline" />
- <AssertStyleValue target="tileComp.button1" styleName="textDecoration" value="none" />
- <AssertStyleValue target="tileComp.button2" styleName="textDecoration" value="none" />
- <CompareBitmap numColorVariances="12" maxColorVariance="20" url="../descendantSelectors/baselines/$testID.png" target="tileComp.label1" />
- </body>
- </TestCase>
- <TestCase testID="descendantSelector_combining_nested_style_mac" keywords="[CSS, descendant selector, class selector]"
- description="Be sure that a descendant selector and class selector can combine styles.">
- <setup>
- <ResetComponent target="tileComp" className="comps.TileComp" waitTarget="tileComp" waitEvent="updateComplete" />
- <SetProperty propertyName="styleName" target="tileComp" value="italicStyles" waitTarget="tileComp" waitEvent="updateComplete" />
- </setup>
- <body>
- <AssertStyleValue target="tileComp.label2" styleName="fontSize" value="14" />
- <AssertStyleValue target="tileComp.button3" styleName="fontSize" value="14" />
- <AssertStyleValue target="tileComp.label2" styleName="textDecoration" value="underline" />
- <AssertStyleValue target="tileComp.button3" styleName="textDecoration" value="none" />
- <CompareBitmap numColorVariances="12" maxColorVariance="20" url="../descendantSelectors/baselines/$testID.png" target="tileComp.label2" />
- </body>
- </TestCase>
</testCases>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2.mxml?rev=1396194&r1=1396193&r2=1396194&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Managers/StyleManager/AdvancedCSS/descendantSelectors/AdvancedCSS_descendantSelectors_Style2.mxml Tue Oct 9 18:50:46 2012
@@ -39,20 +39,6 @@
<testCases>
<TestCase testID="descendantSelector_noninheriting_styleSetOnParent_style" keywords="[CSS, descendant selector, noninheriting styles]"
description="Be sure that non inheriting styles are still applied to descendant children.">
- <setup>
- <ResetComponent target="accordionComp2" className="comps.AccordionComp" waitEvent="updateComplete" />
- </setup>
- <body>
- <CompareBitmap target="accordionComp2" url="../descendantSelectors/baselines/$testID.png" timeout="2500" />
- <SetProperty propertyName="selectedIndex" value="1" target="accordionComp2" waitEvent="updateComplete" />
- <WaitForEffectsToEnd />
- <WaitForLayoutManager />
- <Pause timeout="50"/>
- <CompareBitmap target="accordionComp2" url="../descendantSelectors/baselines/$testID_2.png" timeout="2500" />
- </body>
- </TestCase>
- <TestCase testID="descendantSelector_noninheriting_styleSetOnParent_style_mac" keywords="[CSS, descendant selector, noninheriting styles]"
- description="Be sure that non inheriting styles are still applied to descendant children.">
<body>
<CompareBitmap target="accordionComp2" url="../descendantSelectors/baselines/$testID.png" timeout="2500" />
<SetProperty propertyName="selectedIndex" value="1" target="accordionComp2" waitTarget="accordionComp2" waitEvent="updateComplete" />
Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/MP_Spark_Controls_Tests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/MP_Spark_Controls_Tests.mxml?rev=1396194&r1=1396193&r2=1396194&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/MP_Spark_Controls_Tests.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/Spark/MP_Spark_Controls_Tests.mxml Tue Oct 9 18:50:46 2012
@@ -102,28 +102,7 @@
<AssertEvent eventName="toolTipShown" eventClass="mx.events::ToolTipEvent" target="swf1.content.document.textinput1" />
</body>
</TestCase>
- <TestCase testID="MP_Spark_Component_TextAreaScrolling_compatible" description="Test that you can use a ScrollBar on a spark TextArea." keywords="[TextArea, ScrollBar, Spark, Marshall Plan, ToolTip]">
- <setup>
- <ResetComponent target="control1" className="spark.components.TextInput" waitTarget="control1"
- waitEvent="updateComplete" />
- <SetProperty target="swf1" propertyName="autoLoad" value="true" />
- <SetProperty target="swf1" propertyName="source" value="../../../Assets/Images/smallpurplerect.jpg" waitTarget="swf1" waitEvent="updateComplete"/>
- <Pause timeout="100" />
- <SetProperty target="swf1" propertyName="loadForCompatibility" value="true" />
- <SetProperty target="swf1" propertyName="autoLoad" value="false" />
- <SetProperty target="swf1" propertyName="source" value="assets/MP_SparkControls_Child.swf" />
- <SetProperty target="swf1" propertyName="autoLoad" value="true" waitTarget="swf1" waitEvent="complete"/>
- </setup>
- <body>
- <DispatchMouseEvent target="" type="mouseMove" localX="12" localY="55" waitTarget="swf1.content" waitEvent="applicationComplete"/>
- <DispatchMouseEvent type="rollOver" target="swf1.content.document.textarea1.scroller.verticalScrollBar.track" localX="5" localY="30" />
- <DispatchMouseEvent type="mouseDown" target="swf1.content.document.textarea1.scroller.verticalScrollBar.track" localX="5" localY="30" />
- <WaitForEffectsToEnd />
- <DispatchMouseEvent type="mouseUp" target="swf1.content.document.textarea1" localX="5" localY="30" />
- <AssertEvent target="swf1.content.document.textarea1.scroller.verticalScrollBar" eventName="change" eventClass="flash.events::Event" />
- </body>
- </TestCase>
- <TestCase testID="MP_Spark_Component_TextAreaScrolling_compatible_Mac" description="Test that you can use a ScrollBar on a spark TextArea." keywords="[TextArea, ScrollBar, Spark, Marshall Plan, ToolTip]">
+ <TestCase testID="MP_Spark_Component_TextAreaScrolling_compatible" description="Test that you can use a ScrollBar on a spark TextArea." keywords="[TextArea, ScrollBar, Spark, Marshall Plan, ToolTip]">
<setup>
<ResetComponent target="control1" className="spark.components.TextInput" waitTarget="control1"
waitEvent="updateComplete" />
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=1396194&r1=1396193&r2=1396194&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 Tue Oct 9 18:50:46 2012
@@ -1712,8 +1712,8 @@
<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">
- <ConditionalValue os="mac" url="../properties/baselines/$testID_mac.png"/>
+ <CompareBitmap url="../properties/baselines/" numColorVariances="38" ignoreMaxColorVariance="true" target="grp">
+ <ConditionalValue os="mac"/>
</CompareBitmap>
</body>
</TestCase>