flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1397356 - in /incubator/flex/sdk/branches/develop/mustella/tests: components/TabBar/Styles/ containers/tabnavigator/Styles/
Date Thu, 11 Oct 2012 22:53:10 GMT
Author: aharui
Date: Thu Oct 11 22:53:09 2012
New Revision: 1397356

URL: http://svn.apache.org/viewvc?rev=1397356&view=rev
Log:
Hopefully fix these skin states tests for good.  In theory, you should not have a wait event
prior to the WaitForEvent for the "complete" event because you don't know how long it will
take for the SWFs to load and they oculd load before the WaitForEvent gets set up.  Also add
timeouts for when the load takes longer than expected.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates_Spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates_Spark.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates.mxml?rev=1397356&r1=1397355&r2=1397356&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates.mxml
Thu Oct 11 22:53:09 2012
@@ -434,10 +434,9 @@
                 <ResetComponent target="tb" className="mx.controls.TabBar"  waitEvent="updateComplete"
waitTarget="tb"/>
                 <RunCode code="addData(0);" />
                 <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
waitEvent="updateComplete" waitTarget="tb" /> 
+				<!-- don't wait for mouse event so we don't miss the complete event -->
                 <DispatchMouseEvent type="rollOver" localX="10" localY="10" target="tb"
/> 
                 <WaitForEvent eventName="complete" target="tb.getChildAt(0).currentSkin.overImage"
timeout="10000"/> 
-                <WaitForEffectsToEnd />
-                <WaitForLayoutManager />
             </setup>
             <body>
                 <CompareBitmap target="tb" url="../Styles/baselines/TabBar_Styles_SkinStates_runtime_SWF_mouseOver_selectedTab.png"
timeout="5000" />
@@ -448,8 +447,9 @@
                 <ResetComponent target="tb" className="mx.controls.TabBar"  waitEvent="updateComplete"
waitTarget="tb"/>
                 <RunCode code="addData(0);" />
                 <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
waitEvent="updateComplete" waitTarget="tb" /> 
+				<!-- don't wait for mouse event so we don't miss the complete event -->
                 <DispatchMouseEvent type="rollOver" localX="109" localY="10" target="tb"
/> 
-                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.overImage"/>

+                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.overImage"
timeout="5000"/> 
                 <WaitForEffectsToEnd />
                 <WaitForLayoutManager />
             </setup>
@@ -461,13 +461,12 @@
         <TestCase testID="TabBar_Styles_SkinStates_runtime_SWF_mouseDown_selectedTab"
keywords="[enabled, SkinStates,runtimeSWF, TabBar]" >
             <setup>
                 <ResetComponent target="tb" className="mx.controls.TabBar"  waitEvent="updateComplete"
waitTarget="tb"/>
-                <RunCode code="addData(0);" />
-                <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
waitEvent="updateComplete" waitTarget="tb" /> 
+				<RunCode code="addData(0);" />
+				<SetProperty target="tb" propertyName="selectedIndex" value="0" waitEvent="updateComplete"
waitTarget="tb" />
+                <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
/> 
+				<WaitForEvent eventName="complete" target="tb.getChildAt(0).currentSkin.selectedUpImage"
timeout="5000" /> 
                 <DispatchMouseEvent type="rollOver" localX="10" localY="10" target="tb"
waitEvent="rollOver" waitTarget="tb" /> 
-                <!-- don't wait for mouse up event so we don't miss the complete event
-->
-                <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tb"/>

-                <WaitForEvent eventName="complete" target="tb.getChildAt(0).currentSkin.selectedUpImage"
/> 
-                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tb"
waitEvent="mouseDown" waitTarget="tb" /> 
                 <WaitForLayoutManager />
             </setup>
             <body>
@@ -483,8 +482,7 @@
                 <DispatchMouseEvent type="rollOver" localX="109" localY="10" target="tb"
waitEvent="rollOver" waitTarget="tb" /> 
                 <!-- don't wait for mouse up event so we don't miss the complete event
-->
                 <DispatchMouseEvent type="mouseDown" localX="100" localY="9" target="tb"/>

-                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.selectedUpImage"
/> 
-                <WaitForEffectsToEnd />
+                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.selectedUpImage"
timeout="5000" /> 
                 <WaitForLayoutManager />
             </setup>
             <body>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates_Spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates_Spark.mxml?rev=1397356&r1=1397355&r2=1397356&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates_Spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/TabBar/Styles/TabBar_Styles_SkinStates_Spark.mxml
Thu Oct 11 22:53:09 2012
@@ -467,12 +467,11 @@
             <setup>
                 <ResetComponent target="tb" className="mx.controls.TabBar"  waitEvent="updateComplete"
waitTarget="tb"/>
                 <RunCode code="addData(0);" />
-                <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
waitEvent="updateComplete" waitTarget="tb" />
+				<SetProperty target="tb" propertyName="selectedIndex" value="0" waitEvent="updateComplete"
waitTarget="tb" />
+                <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
/>
+				<WaitForEvent eventName="complete" target="tb.getChildAt(0).currentSkin.selectedUpImage"
timeout="5000" /> 
                 <DispatchMouseEvent type="rollOver" localX="10" localY="10" target="tb"
waitEvent="rollOver" waitTarget="tb" /> 
-                <!-- don't wait for mouse up event so we don't miss the complete event
-->
-                <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tb"
/> 
-                <WaitForEvent eventName="complete" target="tb.getChildAt(0).currentSkin.selectedUpImage"
/> 
-                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tb"
waitEvent="mouseDown" waitTarget="tb" /> 
                 <WaitForLayoutManager />
             </setup>
             <body>
@@ -487,9 +486,8 @@
                 <SetStyle target="tb" styleName="tabStyleName" value="myTabBarSWFRunTime"
waitEvent="updateComplete" waitTarget="tb" /> 
 								 
                 <DispatchMouseEvent type="rollOver" localX="85" localY="7" target="tb"
waitEvent="rollOver" waitTarget="tb" /> 
-                <DispatchMouseEvent type="mouseDown" localX="85" localY="7" target="tb"
waitEvent="mouseDown" waitTarget="tb" /> 
-                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.selectedUpImage"
/> 
-                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseDown" localX="85" localY="7" target="tb"
/> 
+                <WaitForEvent eventName="complete" target="tb.getChildAt(1).currentSkin.selectedUpImage"
timeout="5000" /> 
                 <WaitForLayoutManager />
             </setup>
             <body>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates.mxml?rev=1397356&r1=1397355&r2=1397356&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates.mxml
Thu Oct 11 22:53:09 2012
@@ -437,11 +437,10 @@
         <TestCase testID="TabNavigator_Styles_SkinStates_runtime_SWF_mouseDown_selectedTab"
keywords="[enabled, SkinStates,runtimeSWF, TabNavigator]" >
             <setup>
                 <ResetComponent target="tn" className="TNComp"  waitEvent="updateComplete"
waitTarget="tn"/>
-                <SetStyle target="tn.tabn" styleName="tabStyleName" value="myTabNavigatorSWFRunTime"
waitEvent="updateComplete" waitTarget="tn.tabn" /> 
+                <SetStyle target="tn.tabn" styleName="tabStyleName" value="myTabNavigatorSWFRunTime"
/> 
+				<WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(0).currentSkin.selectedUpImage"
timeout="5000" />                
                 <DispatchMouseEvent type="rollOver" localX="10" localY="10" target="tn.tabn"
waitEvent="rollOver" waitTarget="tn.tabn" /> 
                 <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tn.tabn"
waitEvent="mouseDown" waitTarget="tn.tabn" /> 
-                <WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(0).currentSkin.selectedUpImage"
/>                
-                <WaitForEffectsToEnd />
             </setup>
             <body>
                 <CompareBitmap target="tn.tabn" url="../Styles/baselines/TabNavigator_Styles_SkinStates_runtime_SWF_mouseDown_selectedTab.png"
timeout="5000" />
@@ -453,12 +452,11 @@
                 <ResetComponent target="tn" className="TNComp"  waitEvent="updateComplete"
waitTarget="tn"/>
                 <SetStyle target="tn.tabn" styleName="tabStyleName" value="myTabNavigatorSWFRunTime"
waitEvent="updateComplete" waitTarget="tn.tabn" /> 
                 <DispatchMouseEvent type="rollOver" localX="109" localY="10" target="tn.tabn"
waitEvent="rollOver" waitTarget="tn.tabn" /> 
-                <DispatchMouseEvent type="mouseDown" localX="109" localY="10" target="tn.tabn"
waitEvent="mouseDown" waitTarget="tn.tabn" /> 
-                <WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(1).currentSkin.selectedUpImage"
/>                
-                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseDown" localX="109" localY="10" target="tn.tabn"
/> 
+                <WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(1).currentSkin.selectedUpImage"
timeout="5000" />
+				<WaitForLayoutManager />
             </setup>
             <body>
-            	<WaitForLayoutManager />
                 <CompareBitmap target="tn.tabn" url="../Styles/baselines/TabNavigator_Styles_SkinStates_runtime_SWF_mouseDown_NonselectedTab.png"
timeout="5000" />
             </body>
         </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates_Spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates_Spark.mxml?rev=1397356&r1=1397355&r2=1397356&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates_Spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/tabnavigator/Styles/TabNavigator_Styles_SkinStates_Spark.mxml
Thu Oct 11 22:53:09 2012
@@ -449,7 +449,7 @@
             <setup>
                 <ResetComponent target="tn" className="TNComp"  waitEvent="updateComplete"
waitTarget="tn"/>
                 <SetStyle target="tn.tabn" styleName="tabStyleName" value="myTabNavigatorSWFRunTime"/>

-				<WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(0).currentSkin.selectedUpImage"
/> 
+				<WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(0).currentSkin.selectedUpImage"
timeout="5000" /> 
                 <DispatchMouseEvent type="rollOver" localX="10" localY="10" target="tn.tabn"
waitEvent="rollOver" waitTarget="tn.tabn" /> 
                 <DispatchMouseEvent type="mouseDown" localX="10" localY="10" target="tn.tabn"
waitEvent="mouseDown"/>
             </setup>
@@ -463,9 +463,9 @@
                 <ResetComponent target="tn" className="TNComp"  waitEvent="updateComplete"
waitTarget="tn"/>
                 <SetStyle target="tn.tabn" styleName="tabStyleName" value="myTabNavigatorSWFRunTime"
waitEvent="updateComplete" waitTarget="tn.tabn" /> 
                 <DispatchMouseEvent type="rollOver" localX="109" localY="10" target="tn.tabn"
waitEvent="rollOver" waitTarget="tn.tabn" /> 
-                <DispatchMouseEvent type="mouseDown" localX="109" localY="10" target="tn.tabn"
waitEvent="mouseDown"/>
-                <WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(1).currentSkin.selectedUpImage"
/> 
-                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseDown" localX="109" localY="10" target="tn.tabn"
/>
+                <WaitForEvent eventName="complete" target="tn.tabn.rawChildren.getChildAt(2).getChildAt(1).currentSkin.selectedUpImage"
timeout="5000"/> 
+                <WaitForLayoutManager />
             </setup>
             <body>
                 <CompareBitmap target="tn.tabn" url="../Styles/baselines/spark/TabNavigator_Styles_SkinStates_runtime_SWF_mouseDown_NonselectedTab.png"
timeout="5000" />



Mime
View raw message