You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2012/12/22 07:35:04 UTC
svn commit: r1425250 - in /incubator/flex/sdk/branches/release4.9: ./
frameworks/projects/apache/ mustella/tests/components/
mustella/tests/gumbo/components/TextInput/Properties/
mustella/tests/gumbo/components/TextInput/Properties/baselines/ mustella/...
Author: aharui
Date: Sat Dec 22 06:35:04 2012
New Revision: 1425250
URL: http://svn.apache.org/viewvc?rev=1425250&view=rev
Log:
merge develop branch mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s: 1424357 1424836
Modified:
incubator/flex/sdk/branches/release4.9/ (props changed)
incubator/flex/sdk/branches/release4.9/README (props changed)
incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml (props changed)
incubator/flex/sdk/branches/release4.9/mustella/tests/components/ (props changed)
incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png
incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
Propchange: incubator/flex/sdk/branches/release4.9/
------------------------------------------------------------------------------
Merged /incubator/flex/sdk/branches/develop:r1423769,1424357,1424836
Propchange: incubator/flex/sdk/branches/release4.9/README
------------------------------------------------------------------------------
Merged /incubator/flex/sdk/branches/develop/README:r1423769,1424357,1424836
Propchange: incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml
------------------------------------------------------------------------------
Merged /incubator/flex/sdk/branches/develop/frameworks/projects/apache/compile-config.xml:r1423769,1424357,1424836
Propchange: incubator/flex/sdk/branches/release4.9/mustella/tests/components/
------------------------------------------------------------------------------
Merged /incubator/flex/sdk/branches/develop/mustella/tests/components:r1423769,1424357,1424836
Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml?rev=1425250&r1=1425249&r2=1425250&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml (original)
+++ incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml Sat Dec 22 06:35:04 2012
@@ -1020,7 +1020,7 @@
<ResetComponent target="textInput" className="spark.components.TextInput" waitEvent="updateComplete" waitTarget="textInput" />
- <SetProperty target="textInput" propertyName="alpha" value="0.1" />
+ <SetProperty target="textInput" propertyName="alpha" value="0.1156" />
<SetProperty target="textInput" propertyName="height" value="21" waitEvent="updateComplete"/>
<SetProperty target="textInput" propertyName="text" value="The quick brown fox jumped over the lazy dog" waitEvent="updateComplete" waitTarget="textInput"/>
Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png?rev=1425250&r1=1425249&r2=1425250&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml?rev=1425250&r1=1425249&r2=1425250&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml (original)
+++ incubator/flex/sdk/branches/release4.9/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml Sat Dec 22 06:35:04 2012
@@ -32,6 +32,11 @@
{
}
+
+ private function fixToFixed(numberToFormat:uint, baseCompare:String):String {
+ var s:String = application.cf_inline.format(numberToFormat);
+ return (s.indexOf(".") > -1) ? baseCompare + "." : baseCompare;
+ }
]]>
</mx:Script>
@@ -55,7 +60,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='USD123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='USD0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'USD0')"/>
<AssertMethodValue method="value=application.cf_inline.format(-1234567.345)"
valueExpression="value='USD-1234567'"/>
</body>
@@ -114,7 +119,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='RUR123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='RUR0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'RUR0')"/>
<AssertMethodValue method="value=application.cf_inline.format(-1234567.345)"
valueExpression="value='RUR-1234567'"/>
</body>
@@ -137,7 +142,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='RUR123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='RUR0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'RUR0')"/>
<AssertMethodValue method="value=application.cf_inline.format(-1234567.345)"
valueExpression="value='RUR-1234567'"/>
</body>
@@ -160,7 +165,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='RUR123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='RUR0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'RUR0')"/>
<AssertMethodValue method="value=application.cf_inline.format(-1234567.345)"
valueExpression="value='RUR-1234567'"/>
</body>
@@ -182,7 +187,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='RUR123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='RUR0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'RUR0')"/>
<AssertMethodValue method="value=application.cf_inline.format(-1234567.345)"
valueExpression="value='RUR-1234567'"/>
</body>
@@ -347,7 +352,7 @@
<AssertMethodValue method="value=application.cf_inline.format(123456789)"
valueExpression="value='â¬123456789'"/>
<AssertMethodValue method="value=application.cf_inline.format(0.12345)"
- valueExpression="value='â¬0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'â¬0')"/>
<AssertMethodValue method="value=application.cf_inline.format(123.345)"
valueExpression="value='â¬123'"/>
</body>
@@ -365,7 +370,7 @@
<AssertMethodValue method="value=application.cf.format(123456789)"
valueExpression="value='USD123456789'"/>
<AssertMethodValue method="value=application.cf.format(0.12345)"
- valueExpression="value='USD0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'USD0')"/>
<AssertMethodValue method="value=application.cf.format(-1234567.345)"
valueExpression="value='USD-1234567'"/>
</body>
@@ -386,7 +391,7 @@
<AssertMethodValue method="value=application.cf.format(123456789)"
valueExpression="value='CNY123456789'"/>
<AssertMethodValue method="value=application.cf.format(0.12345)"
- valueExpression="value='CNY0.'"/>
+ valueExpression="value=fixToFixed(0.12345, 'CNY0')"/>
<AssertMethodValue method="value=application.cf.format(-1234567.345)"
valueExpression="value='CNY-1234567'"/>
</body>
Re: svn commit: r1425250 - in
/incubator/flex/sdk/branches/release4.9: ./ frameworks/projects/apache/
mustella/tests/components/
mustella/tests/gumbo/components/TextInput/Properties/
mustella/tests/gumbo/components/TextInput/Properties/baselines/ muste...
Posted by Alex Harui <ah...@adobe.com>.
Yeah, I didn't do a status beforehand so I was surprised they got committed.
They were not in the two merges I was syncing.
Not sure what is up with that. I did a content diff and nothing changed in
those two files.
On 12/21/12 10:47 PM, "Justin Mclean" <ju...@classsoftware.com> wrote:
> Hi,
>
>> incubator/flex/sdk/branches/release4.9/README (props changed)
>>
>> incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-con
>> fig.xml (props changed)
> Assume nothing changed in the above 2 files?
>
> Thanks,
> Justin
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
Re: svn commit: r1425250 - in /incubator/flex/sdk/branches/release4.9: ./ frameworks/projects/apache/ mustella/tests/components/ mustella/tests/gumbo/components/TextInput/Properties/ mustella/tests/gumbo/components/TextInput/Properties/baselines/ mustella/...
Posted by Justin Mclean <ju...@classsoftware.com>.
Hi,
> incubator/flex/sdk/branches/release4.9/README (props changed)
> incubator/flex/sdk/branches/release4.9/frameworks/projects/apache/compile-config.xml (props changed)
Assume nothing changed in the above 2 files?
Thanks,
Justin