flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [2/2] git commit: [flex-sdk] [refs/heads/NewDPIBuckets] - updated existing test to also test new 160 and 640 dpi
Date Fri, 09 Aug 2013 18:38:38 GMT
updated existing test to also test new 160 and 640 dpi


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/70b00d5e
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/70b00d5e
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/70b00d5e

Branch: refs/heads/NewDPIBuckets
Commit: 70b00d5ec5af3e5628da73e9dbfcf1543dfe2d10
Parents: 9dcffe1
Author: Justin Mclean <jmclean@apache.org>
Authored: Sat Aug 10 04:38:17 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Sat Aug 10 04:38:17 2013 +1000

----------------------------------------------------------------------
 .../DensityIndependentScaling/tests/applicationDPI_160.mxml  | 6 +++++-
 .../DensityIndependentScaling/tests/applicationDPI_240.mxml  | 8 +++++++-
 .../DensityIndependentScaling/tests/applicationDPI_320.mxml  | 6 ++++++
 .../DensityIndependentScaling/tests/applicationDPI_480.mxml  | 8 +++++++-
 .../DensityIndependentScaling/tests/applicationDPI_none.mxml | 4 ++++
 5 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/70b00d5e/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
index 0f7620b..a8c3749 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
@@ -69,10 +69,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="scalingFactor" value="1" >
+					<ConditionalValue deviceDensity="120" value="0.75"/>
 					<ConditionalValue deviceDensity="160" value="1"/>
 					<ConditionalValue deviceDensity="240" value="1.5"/>
 					<ConditionalValue deviceDensity="320" value="2"/>
 					<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/0.75"/>
 					<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="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/4"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/8"/>
 				</AssertPropertyValue>	
 			</body>
 			

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/70b00d5e/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_240.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_240.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_240.mxml
index d82a72d..c060f41 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_240.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_240.mxml
@@ -69,10 +69,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="scalingFactor" value="0.666667" >
+					<ConditionalValue deviceDensity="120" value="0.5"/>
 					<ConditionalValue deviceDensity="160" value="0.666667"/>
 					<ConditionalValue deviceDensity="240" value="1"/>
 					<ConditionalValue deviceDensity="320" value="1.333333"/>
 					<ConditionalValue deviceDensity="480" value="2"/>
+					<ConditionalValue deviceDensity="640" value="4"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -85,10 +87,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="screenWidth" value="750">
+					<ConditionalValue deviceDensity="120" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/0.5)"/>
 					<ConditionalValue deviceDensity="160" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/0.666667)"/>
 					<ConditionalValue deviceDensity="240" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
 					<ConditionalValue deviceDensity="320" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/1.333333)"/>
-					<ConditionalValue deviceDensity="320" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/2)"/>
+					<ConditionalValue deviceDensity="480" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/2)"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=Math.round(FlexGlobals.topLevelApplication.stage.stageWidth/4)"/>
 				</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>
 					

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/70b00d5e/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
index 7a18630..81e3014 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
@@ -69,10 +69,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="scalingFactor" value="0.500000" >
+					<ConditionalValue deviceDensity="120" value="0.375"/>
 					<ConditionalValue deviceDensity="160" value="0.5"/>
 					<ConditionalValue deviceDensity="240" value="0.75"/>
 					<ConditionalValue deviceDensity="320" value="1"/>
 					<ConditionalValue deviceDensity="480" value="1.5"/>
+					<ConditionalValue deviceDensity="640" value="2"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -84,10 +86,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="screenWidth" value="1000">
+					<ConditionalValue deviceDensity="120" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.375"/>
 					<ConditionalValue deviceDensity="160" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.5"/>
 					<ConditionalValue deviceDensity="240" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.75"/>
 					<ConditionalValue deviceDensity="320" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
 					<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth*2"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth*4"/>
 				</AssertPropertyValue>	
 			</body>
 			
@@ -105,6 +109,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>
 					

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/70b00d5e/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
index fe52cb1..7bb5740 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
@@ -69,10 +69,12 @@
 			<body>
 				
 				<AssertPropertyValue target="" propertyName="scalingFactor" value="0.500000" >
-					<ConditionalValue deviceDensity="160" value="0.25"/>
+					<ConditionalValue deviceDensity="120" value="0.25"/>
+					<ConditionalValue deviceDensity="160" value="0.333333"/>
 					<ConditionalValue deviceDensity="240" value="0.5"/>
 					<ConditionalValue deviceDensity="320" value="0.75"/>
 					<ConditionalValue deviceDensity="480" value="1"/>
+					<ConditionalValue deviceDensity="640" value="2"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -85,9 +87,11 @@
 				
 				<AssertPropertyValue target="" propertyName="screenWidth" value="1000">
 					<ConditionalValue deviceDensity="160" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.25"/>
+					<ConditionalValue deviceDensity="160" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.333333"/>
 					<ConditionalValue deviceDensity="240" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.5"/>
 					<ConditionalValue deviceDensity="320" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/0.75"/>
 					<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth*2"/>
 				</AssertPropertyValue>	
 			</body>
 			
@@ -105,6 +109,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>
 					

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/70b00d5e/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_none.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_none.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_none.mxml
index 5d3ff2e..cfa7ae7 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_none.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_none.mxml
@@ -49,10 +49,12 @@
 
 			<body>
 				<AssertPropertyValue target="" propertyName="applicationDPI" value="160" >
+					<ConditionalValue deviceDensity="120" value="120"/>
 					<ConditionalValue deviceDensity="160" value="160"/>
 					<ConditionalValue deviceDensity="240" value="240"/>
 					<ConditionalValue deviceDensity="320" value="320"/>
 					<ConditionalValue deviceDensity="480" value="480"/>
+					<ConditionalValue deviceDensity="640" value="640"/>
 				</AssertPropertyValue>
 			</body>
 		
@@ -65,10 +67,12 @@
 			</setup>
 			<body>
 			<AssertPropertyValue target="" propertyName="applicationDPI" value="160" >
+				<ConditionalValue deviceDensity="120" value="120"/>
 				<ConditionalValue deviceDensity="160" value="160"/>
 				<ConditionalValue deviceDensity="240" value="240"/>
 				<ConditionalValue deviceDensity="320" value="320"/>
 				<ConditionalValue deviceDensity="480" value="480"/>
+				<ConditionalValue deviceDensity="640" value="640"/>
 			</AssertPropertyValue>
 		
 		


Mime
View raw message