Author: aharui
Date: Tue Nov 27 05:43:14 2012
New Revision: 1414001
URL: http://svn.apache.org/viewvc?rev=1414001&view=rev
Log:
fix more apollo mac tests
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/Window/mirroring/window_mirroring_tester1.mxml
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests.mxml
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests2.mxml
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/Window/mirroring/window_mirroring_tester1.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/Window/mirroring/window_mirroring_tester1.mxml?rev=1414001&r1=1414000&r2=1414001&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/Window/mirroring/window_mirroring_tester1.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/Window/mirroring/window_mirroring_tester1.mxml
Tue Nov 27 05:43:14 2012
@@ -202,7 +202,9 @@
<RunCode
code="FlexGlobals.topLevelApplication.closeAllChildWindow()"/>
<RunCode
code="FlexGlobals.topLevelApplication.createAWindowWithScroller();"
waitTarget="" waitEvent="myWindowComplete" />
<!-- add a button from the window caused scrolling -->
- <RunCode code="addAButton();" waitTarget="windowObj"
waitEvent="updateComplete" />
+ <RunCode code="addAButton();" />
+ <WaitForLayoutManager />
+ <WaitForEvent target="stage"
eventName="enterFrame" numExpectedEvents="2"/>
</setup>
<body>
<!-- verify the window should show scroller -->
@@ -407,6 +409,8 @@
<body>
<SetStyle target="windowObj" styleName="skinClass"
valueExpression="value = SparkChromeWindowedApplicationSkin"
waitEvent="updateComplete" />
<SetProperty target="" propertyName="titleIcon"
valueExpression="value =smallSquare1" waitEvent="updateComplete" />
+ <WaitForLayoutManager />
+ <WaitForEvent target="stage"
eventName="enterFrame" numExpectedEvents="2"/>
<MyCompareBitmap target="windowObj" numColorVariances="10"
maxColorVariance="10" url="../mirroring/baselines/$testID.png"
mac_url="../mirroring/baselines/$testID_mac.png" />
<WaitForEvent target="stage" eventName="enterFrame"
numExpectedEvents="2"/>
@@ -428,6 +432,8 @@
<RunCode
code="FlexGlobals.topLevelApplication.windowObj.setStyle('direction','ltr')"
waitEvent="updateComplete" waitTarget="windowObj" />
<SetProperty target="windowObj" propertyName="titleIcon"
valueExpression="value =smallSquare1" waitEvent="updateComplete" />
+ <WaitForLayoutManager />
+ <WaitForEvent target="stage"
eventName="enterFrame" numExpectedEvents="2"/>
<MyCompareBitmap target="windowObj" numColorVariances="10"
maxColorVariance="10" url="../mirroring/baselines/$testID.png"
mac_url="../mirroring/baselines/$testID_mac.png" />
<WaitForEvent target="stage" eventName="enterFrame"
numExpectedEvents="2"/>
@@ -450,6 +456,8 @@
<SetProperty target="windowObj" propertyName="titleIcon"
valueExpression="value =smallSquare1" waitEvent="updateComplete" />
<RunCode
code="FlexGlobals.topLevelApplication.windowObj.layoutDirection='rtl'"
waitEvent="updateComplete" waitTarget="windowObj" />
<RunCode
code="FlexGlobals.topLevelApplication.windowObj.setStyle('direction','rtl')"
waitEvent="updateComplete" waitTarget="windowObj" />
+ <WaitForLayoutManager />
+ <WaitForEvent target="stage"
eventName="enterFrame" numExpectedEvents="2"/>
<MyCompareBitmap target="windowObj" numColorVariances="10"
maxColorVariance="10" url="../mirroring/baselines/$testID.png"
mac_url="../mirroring/baselines/$testID_mac.png" />
<WaitForEvent target="stage" eventName="enterFrame"
numExpectedEvents="2"/>
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests.mxml?rev=1414001&r1=1414000&r2=1414001&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests.mxml
Tue Nov 27 05:43:14 2012
@@ -52,6 +52,7 @@ Test title set in MXML
-->
<TestCase testID="title_mxml_test1_mac" keywords="[WindowedApplication,title]"
description="Check title set in mxml." >
<body>
+ <WaitForEvent target="stage" eventName="enterFrame"
numExpectedEvents="2"/>
<AssertPropertyValue target="skin.titleBar.skin.titleText"
propertyName="text" value="The pokey, orange fox leapt over the lazy cat." />
<CompareBitmap target="" url="../properties/baselines/$testID.png" />
</body>
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests2.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests2.mxml?rev=1414001&r1=1414000&r2=1414001&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests2.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_title_mxml_tests2.mxml
Tue Nov 27 05:43:14 2012
@@ -53,6 +53,8 @@ Test title set in MXML
<TestCase testID="title_mxml_test2_mac" keywords="[WindowedApplication,title]"
description="Check truncated title set in mxml." >
<body>
<AssertPropertyValue target="skin.titleBar.skin.titleText"
propertyName="text" value="The pokey, orange fox leapt over the lazy cat. The
pokey, orange fox leapt over the lazy cat. The pokey, orange fox leapt over the
lazy cat. The pokey, orange fox leapt over the lazy cat." />
+ <WaitForLayoutManager />
+ <WaitForEvent target="stage" eventName="enterFrame"
numExpectedEvents="2"/>
<CompareBitmap target="" url="../properties/baselines/$testID.png" />
</body>
</TestCase>
