You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/04/16 06:48:51 UTC
[17/50] [abbrv] git commit: [flex-sdk] - merge develop branch
mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s:
1424357 1424836
merge develop branch mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s: 1424357 1424836
git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/release4.9@1425250 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b3f92d26
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b3f92d26
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b3f92d26
Branch: refs/heads/develop
Commit: b3f92d267cf256a88e7ab63c4b8fdb7ca4500c66
Parents: 4c84e8b
Author: Alex Harui <ah...@apache.org>
Authored: Sat Dec 22 06:35:04 2012 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Dec 22 06:35:04 2012 +0000
----------------------------------------------------------------------
.../Properties/TextInput_properties_tester.mxml | 2 +-
.../Gumbo_TextInput_alpha_property_01.png | Bin 964 -> 1002 bytes
.../Fallback/CF_Fallback_format_Main_tester.mxml | 21 +++++++++-----
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3f92d26/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml b/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
index 580f8af..30dac5e 100644
--- a/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
+++ b/mustella/tests/gumbo/components/TextInput/Properties/TextInput_properties_tester.mxml
@@ -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"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3f92d26/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png
----------------------------------------------------------------------
diff --git a/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png b/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png
index 11f7ac6..667df56 100644
Binary files a/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png and b/mustella/tests/gumbo/components/TextInput/Properties/baselines/Gumbo_TextInput_alpha_property_01.png differ
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b3f92d26/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml b/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
index 4c83eb5..2631c90 100644
--- a/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
+++ b/mustella/tests/spark/formatters/CurrencyFormatter/Fallback/CF_Fallback_format_Main_tester.mxml
@@ -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>