Author: aharui
Date: Tue Nov 27 04:34:20 2012
New Revision: 1413994
URL: http://svn.apache.org/viewvc?rev=1413994&view=rev
Log:
Fix apollo tests on Mac
Added:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin_mac.png
(with props)
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin_win.png
- copied unchanged from r1413817,
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin.png
Removed:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin.png
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt
incubator/flex/sdk/branches/develop/mustella/tests/apollo/HTML/Events/AIRHTMLEventsTester.mxml
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt?rev=1413994&r1=1413993&r2=1413994&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt
Tue Nov 27 04:34:20 2012
@@ -107,6 +107,7 @@ apollo/spark/components/WindowedApplicat
apollo/spark/components/WindowedApplication/styles/wa_styles_mirroring_tests$styles_mirroring_win_test4,
apollo/spark/components/WindowedApplication/styles/wa_styles_mirroring_tests$styles_mirroring_win_test5,
apollo/spark/components/WindowedApplication/styles/wa_styles_mirroring_tests$styles_mirroring_win_test6,
+apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test4_windowedApplicationSkin_win,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test4_SparkChromeWindowedApplicationSkin_win,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test6_SparkChromeWindowedApplicationSkin_win,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test7_SparkChromeWindowedApplicationSkin_win,
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt?rev=1413994&r1=1413993&r2=1413994&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt
Tue Nov 27 04:34:20 2012
@@ -71,6 +71,7 @@ apollo/spark/components/WindowedApplicat
apollo/spark/components/WindowedApplication/styles/wa_styles_mirroring_tests$styles_mirroring_mac_test2,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_systemchrome_tests$height_test1_systemChrome_mac,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_systemchrome_tests$height_test2_systemChrome_mac,
+apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test4_windowedApplicationSkin_mac,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test1_SparkChromeWindowedApplicationSkin_mac,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test1_windowedApplicationSkin_mac,
apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests$height_test2_SparkChromeWindowedApplicationSkin_mac,
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/HTML/Events/AIRHTMLEventsTester.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/HTML/Events/AIRHTMLEventsTester.mxml?rev=1413994&r1=1413993&r2=1413994&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/apollo/HTML/Events/AIRHTMLEventsTester.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/apollo/HTML/Events/AIRHTMLEventsTester.mxml
Tue Nov 27 04:34:20 2012
@@ -58,7 +58,7 @@
<TestCase testID="AIR_HTML_Event_htmlDOMInitialize "
description="checks htmlDOMInitialize event" keywords="[AIR, HTML, event,
htmlDOMInitialize]">
<setup>
<ResetComponent target="myHTML"
className="mx.controls::HTML" waitEvent="updateComplete" waitTarget="myHTML"/>
- <SetProperty propertyName="location"
value="http://www.blackle.com/"; target="myHTML"/>
+ <SetProperty propertyName="location"
value="http://incubator.apache.org/flex"; target="myHTML"/>
</setup>
<body>
<WaitForEffectsToEnd />
@@ -69,7 +69,7 @@
<TestCase testID="AIR_HTML_Event_complete" description="checks
complete event" keywords="[AIR, HTML, event, complete]">
<setup>
<ResetComponent target="myHTML"
className="mx.controls::HTML" waitEvent="updateComplete" waitTarget="myHTML"/>
- <SetProperty propertyName="location"
value="http://www.blackle.com/"; target="myHTML"/>
+ <SetProperty propertyName="location"
value="http://incubator.apache.org/flex"; target="myHTML"/>
</setup>
<body>
@@ -80,7 +80,7 @@
<TestCase testID="AIR_HTML_Event_htmlRender"
description="checks htmlRender event" keywords="[AIR, HTML, event,
htmlRender]">
<setup>
<ResetComponent target="myHTML"
className="mx.controls::HTML" waitEvent="updateComplete" waitTarget="myHTML"/>
- <SetProperty propertyName="location"
value="http://www.blackle.com/"; target="myHTML"/>
+ <SetProperty propertyName="location"
value="http://incubator.apache.org/flex"; target="myHTML"/>
</setup>
<body>
Added:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin_mac.png
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin_mac.png?rev=1413994&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/baselines/height_test4_windowedApplicationSkin_mac.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml?rev=1413994&r1=1413993&r2=1413994&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/apollo/spark/components/WindowedApplication/properties/wa_properties_height_tests.mxml
Tue Nov 27 04:34:20 2012
@@ -152,16 +152,26 @@ Test height
</body>
</TestCase>
-<TestCase testID="height_test4_windowedApplicationSkin"
keywords="[WindowedApplication,height]" description="Set height to a positive,
reasonable value." >
+<TestCase testID="height_test4_windowedApplicationSkin_mac"
keywords="[WindowedApplication,height]" description="Set height to a positive,
reasonable value." >
<setup>
<RunCode code="FlexGlobals.topLevelApplication.doReset()"
waitTarget="" waitEvent="resetComplete" />
</setup>
<body>
<SetProperty target="" propertyName="height" value="35"
waitEvent="resize" />
- <AssertPropertyValue target="" propertyName="height" value="38" />
+ <AssertPropertyValue target="" propertyName="height" value="35" />
<CompareBitmap target="" url="../properties/baselines/$testID.png" />
</body>
</TestCase>
+<TestCase testID="height_test4_windowedApplicationSkin_win"
keywords="[WindowedApplication,height]" description="Set height to a positive,
reasonable value." >
+ <setup>
+ <RunCode code="FlexGlobals.topLevelApplication.doReset()"
waitTarget="" waitEvent="resetComplete" />
+ </setup>
+ <body>
+ <SetProperty target="" propertyName="height" value="35"
waitEvent="resize" />
+ <AssertPropertyValue target="" propertyName="height" value="38"
/>
+ <CompareBitmap target=""
url="../properties/baselines/$testID.png" />
+ </body>
+</TestCase>
<TestCase testID="height_test5_SparkChromeWindowedApplicationSkin_mac"
keywords="[WindowedApplication,height]" description="Set height to a positive,
reasonable value." >
<setup>
