Author: fthomas
Date: Mon Dec 10 11:04:35 2012
New Revision: 1419339
URL: http://svn.apache.org/viewvc?rev=1419339&view=rev
Log:
Fixed:
- resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule
RTL_Method_loadResourceModule_SameLocaleSameBundle -> Problem of timeout.
- resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule
RTL_Method_loadResourceModule_AdditionalLocales3Bundles -> Problem of timeout +
-library-path=$LIBRARY_PATH
- resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule
RTL_Method_loadResourceModule_AdditionalLocale1Bundle -> Problem of timeout +
added the custom framework locale bundle (fr_FR)
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule.mxml
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/SWFs/pre_compile.sh
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule.mxml?rev=1419339&r1=1419338&r2=1419339&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_loadResourceModule.mxml
Mon Dec 10 11:04:35 2012
@@ -208,11 +208,11 @@ General approach:
<RunCode
code="ed4=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom/resMod_loadResourceModule_enUS_bundle1_004.swf')"
/>
<RunCode code="ed4.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed4.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<RunCode
code="ed5=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom2/resMod_loadResourceModule_enUS_bundle1_005.swf')"
/>
<RunCode code="ed5.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed5.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().length" value="1" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales()[0]" value="en_US" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getString('bundle1','SHUTDOWN')"
value="Shut down" />
@@ -231,11 +231,11 @@ General approach:
<RunCode
code="ed6=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom/resMod_loadResourceModule_enUS_bundle1_006.swf')"
/>
<RunCode code="ed6.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed6.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<RunCode
code="ed7=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom/resMod_loadResourceModule_frFR_bundle2.swf')"
/>
<RunCode code="ed7.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed7.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().length" value="2" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().indexOf('en_US') !=
-1" value="true" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().indexOf('fr_FR') !=
-1" value="true" />
@@ -255,11 +255,11 @@ General approach:
<RunCode
code="ed9=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom/resMod_loadResourceModule_enUS_bundle1_007.swf')"
/>
<RunCode code="ed9.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed9.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<RunCode
code="ed10=ResourceManager.getInstance().loadResourceModule('assets/bundles/custom/resMod_loadResourceModule_enUS,frFR,jaJP_bundles1,2,3.swf')"
/>
<RunCode code="ed10.addEventListener(ResourceEvent.ERROR,
handleErrorEvent)" />
<RunCode code="ed10.addEventListener(ResourceEvent.COMPLETE,
handleCompleteEvent)" />
- <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="1000" />
+ <WaitForEvent
target="mx.resources::ResourceManager.getInstance()" eventName="change"
timeout="2000" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().length" value="3" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().indexOf('en_US') !=
-1" value="true" />
<AssertMethodValue
method="value=ResourceManager.getInstance().getLocales().indexOf('fr_FR') !=
-1" value="true" />
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/SWFs/pre_compile.sh
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/SWFs/pre_compile.sh?rev=1419339&r1=1419338&r2=1419339&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/SWFs/pre_compile.sh
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/resources/ResourceManager/SWFs/pre_compile.sh
Mon Dec 10 11:04:35 2012
@@ -52,8 +52,8 @@ cp bundles/custom/resMod_loadResourceMod
$SDK_DIR/bin/mxmlc -locale=en_US -source-path=bundles/custom/{locale}
-include-resource-bundles bundle2 -o
bundles/custom/resMod_loadResourceModule_enUS_bundle2.swf
$SDK_DIR/bin/mxmlc -locale=en_US -source-path=bundles/custom/{locale}
-include-resource-bundles bundle1 bundle2 bundle3 -o
bundles/custom/resMod_loadResourceModule_enUS_bundles1,2,3_001.swf
cp bundles/custom/resMod_loadResourceModule_enUS_bundles1,2,3_001.swf
bundles/custom/resMod_loadResourceModule_enUS_bundles1,2,3_002.swf
-$SDK_DIR/bin/mxmlc -library-path=$LIBRARY_PATH -locale=fr_FR -static-rsls=true
-source-path=bundles/custom/{locale} -include-resource-bundles bundle2 -o
bundles/custom/resMod_loadResourceModule_frFR_bundle2.swf
-$SDK_DIR/bin/mxmlc -library-path=$LIBRARY_PATH -locale=en_US,fr_FR,ja_JP
-static-rsls=true -source-path=bundles/custom/{locale}
-include-resource-bundles bundle1 bundle2 bundle3 -o
bundles/custom/resMod_loadResourceModule_enUS,frFR,jaJP_bundles1,2,3.swf
+$SDK_DIR/bin/mxmlc -library-path=$LIBRARY_PATH -static-rsls=true -locale=fr_FR
-source-path bundles/custom/{locale} bundles/framework/{locale}
-include-resource-bundles bundle2 collections containers controls core effects
formatters logging SharedResources skins states styles validators components
layout sparkEffects -o bundles/custom/resMod_loadResourceModule_frFR_bundle2.swf
+$SDK_DIR/bin/mxmlc -locale=en_US,fr_FR,ja_JP -static-rsls=true
-source-path=bundles/custom/{locale} -include-resource-bundles bundle1 bundle2
bundle3 -o
bundles/custom/resMod_loadResourceModule_enUS,frFR,jaJP_bundles1,2,3.swf
$SDK_DIR/bin/mxmlc -library-path=$LIBRARY_PATH -locale=ja_JP -static-rsls=true
-source-path=bundles/framework/{locale} -include-resource-bundles collections
containers controls core effects formatters logging SharedResources skins
states styles validators components layout sparkEffects -o
bundles/framework/resMod_loadResourceModule_jaJP_framework.swf
$SDK_DIR/bin/mxmlc -library-path=$LIBRARY_PATH -locale=ja_JP,fr_FR,de_DE
-source-path=bundles/framework/{locale} -include-resource-bundles collections
containers controls core effects formatters logging SharedResources skins
states styles validators components layout sparkEffects -o
bundles/framework/resMod_loadResourceModule_jaJP,frFR,deDE_framework_001.swf
