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/09/02 01:40:12 UTC
[10/41] git commit: [flex-sdk] [refs/heads/develop] - added missing
test
added missing test
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/1b26fcd6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/1b26fcd6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/1b26fcd6
Branch: refs/heads/develop
Commit: 1b26fcd6f826b31b7b0844b5f39b33fd50685b47
Parents: 07289a6
Author: Justin Mclean <jm...@apache.org>
Authored: Sat Aug 10 14:57:00 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Sat Aug 10 14:57:00 2013 +1000
----------------------------------------------------------------------
.../integration/ImageScaling_tester.mxml | 30 +++++++++++++++-----
.../swfs/ViewNavigatorApplication120dpi.mxml | 2 +-
.../tests/applicationDPI_120.mxml | 20 ++++++++-----
3 files changed, 37 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1b26fcd6/mustella/tests/mobile/DensityIndependentScaling/integration/ImageScaling_tester.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/integration/ImageScaling_tester.mxml b/mustella/tests/mobile/DensityIndependentScaling/integration/ImageScaling_tester.mxml
index 96eb3f5..3a3b234 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/integration/ImageScaling_tester.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/integration/ImageScaling_tester.mxml
@@ -43,10 +43,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="ready" waitTarget="navigator.activeView.bitmapImage" />
<CompareBitmap target="navigator.activeView.bitmapImageHolder" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -59,10 +61,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="referenced" waitEvent="ready" waitTarget="navigator.activeView.bitmapImage" />
<CompareBitmap target="navigator.activeView.bitmapImageHolder" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -75,10 +79,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="ready" waitTarget="navigator.activeView.image" />
<CompareBitmap target="navigator.activeView.image" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -107,10 +113,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="10000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="ready" waitTarget="navigator.activeView.button.iconDisplay" />
<CompareBitmap target="navigator.activeView.button" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -140,10 +148,12 @@
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="updateComplete" waitTarget="navigator.activeView.tabbedNavigator.tabBar.dataGroup.getElementAt(0)" />
<Pause timeout="500" /><!-- must pause as the iconDisplay skin part isn't used in ButtonSkinBase (mobile skins) since it extends UIComponent and not Group -->
<CompareBitmap target="navigator.activeView.tabbedNavigator" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
<ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -174,10 +184,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="itemRenderer0IconReady" waitTarget="navigator.activeView.normalList" />
<CompareBitmap target="navigator.activeView.normalList" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -206,10 +218,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="currentStateChange" waitTarget="navigator.activeView" />
<CompareBitmap target="navigator.activeView.loadingList" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
@@ -222,10 +236,12 @@
<RunCode code="application.navigator.pushView(views.ImageScalingView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
<ChangeState changeTarget="navigator.activeView" toState="embedded" waitEvent="currentStateChange" waitTarget="navigator.activeView" />
<CompareBitmap target="navigator.activeView.decoratorList" url="../integration/baselines/">
+ <ConditionalValue deviceDensity="120" />
<ConditionalValue deviceDensity="160" />
<ConditionalValue deviceDensity="240" />
<ConditionalValue deviceDensity="320" />
- <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="480" />
+ <ConditionalValue deviceDensity="640" />
</CompareBitmap>
</body>
</TestCase>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1b26fcd6/mustella/tests/mobile/DensityIndependentScaling/swfs/ViewNavigatorApplication120dpi.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/swfs/ViewNavigatorApplication120dpi.mxml b/mustella/tests/mobile/DensityIndependentScaling/swfs/ViewNavigatorApplication120dpi.mxml
index a0b4fa8..ea822f9 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/swfs/ViewNavigatorApplication120dpi.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/swfs/ViewNavigatorApplication120dpi.mxml
@@ -19,7 +19,7 @@
-->
<s:ViewNavigatorApplication xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark" firstView="views.ViewNavigatorApplication160dpiHomeView"
- applicationDPI="160" applicationComplete="init()">
+ applicationDPI="120" applicationComplete="init()">
<fx:Declarations>
<!-- Place non-visual elements (e.g., services, value objects) here -->
</fx:Declarations>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/1b26fcd6/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
index 0f7620b..780892f 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
@@ -18,7 +18,7 @@
-->
<UnitTester testDir="mobile/DensityIndependentScaling/tests/" xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" xmlns:mx="library://ns.adobe.com/flex/mx" xmlns="*"
- testSWF="ViewNavigatorApplication160dpi.mxml">
+ testSWF="ViewNavigatorApplication120dpi.mxml">
<!-- this set of lines form a template that must be in each unit test -->
<fx:Script>
<![CDATA[
@@ -45,10 +45,10 @@
<testCases>
- <TestCase testID="Get_applicationDPI" description="applicationDPI is set to 160 in MXML" keywords="[ViewNavigatorApplication, properties, applicationDPI]">
+ <TestCase testID="Get_applicationDPI" description="applicationDPI is set to 120 in MXML" keywords="[ViewNavigatorApplication, properties, applicationDPI]">
<body>
- <AssertPropertyValue target="" propertyName="applicationDPI" value="160" />
+ <AssertPropertyValue target="" propertyName="applicationDPI" value="120" />
</body>
</TestCase>
@@ -59,7 +59,7 @@
<SetProperty target="" propertyName="applicationDPI" value="777" />
</setup>
<body>
- <AssertPropertyValue target="" propertyName="applicationDPI" value="160" />
+ <AssertPropertyValue target="" propertyName="applicationDPI" value="120" />
</body>
</TestCase>
@@ -69,10 +69,12 @@
<body>
<AssertPropertyValue target="" propertyName="scalingFactor" value="1" >
- <ConditionalValue deviceDensity="160" value="1"/>
- <ConditionalValue deviceDensity="240" value="1.5"/>
- <ConditionalValue deviceDensity="320" value="2"/>
+ <ConditionalValue deviceDensity="120" value="1"/>
+ <ConditionalValue deviceDensity="160" value="1.5"/>
+ <ConditionalValue deviceDensity="240" value="2"/>
+ <ConditionalValue deviceDensity="320" value="2.5"/>
<ConditionalValue deviceDensity="480" value="4"/>
+ <ConditionalValue deviceDensity="640" value="8"/>
</AssertPropertyValue>
</body>
@@ -84,10 +86,12 @@
<body>
<AssertPropertyValue target="" propertyName="screenWidth" value="500">
+ <ConditionalValue deviceDensity="120" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
<ConditionalValue deviceDensity="160" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
<ConditionalValue deviceDensity="240" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/1.5"/>
<ConditionalValue deviceDensity="320" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/2"/>
<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
+ <ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
</AssertPropertyValue>
</body>
@@ -106,6 +110,8 @@
<ConditionalValue deviceDensity="160" os="qnx" />
<ConditionalValue deviceDensity="320" os="android" />
<ConditionalValue deviceDensity="480" os="android" />
+ <ConditionalValue deviceDensity="120" os="android" />
+ <ConditionalValue deviceDensity="640" os="android" />
</CompareBitmap>
</body>