flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [2/6] git commit: [flex-sdk] [refs/heads/NewDPIBuckets] - fix tests for 120 an 640 dpi
Date Sun, 11 Aug 2013 13:10:22 GMT
fix tests for 120 an 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/e506ece1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e506ece1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e506ece1

Branch: refs/heads/NewDPIBuckets
Commit: e506ece14da701ab6dadc99117709abbb10e0ee3
Parents: 4864b87
Author: Justin Mclean <jmclean@apache.org>
Authored: Sun Aug 11 22:37:46 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Sun Aug 11 22:37:46 2013 +1000

----------------------------------------------------------------------
 .../tests/applicationDPI_120.mxml                   | 16 ++++++++--------
 .../tests/applicationDPI_160.mxml                   |  8 ++++----
 .../tests/applicationDPI_320.mxml                   |  4 ++--
 .../tests/applicationDPI_480.mxml                   |  4 ++--
 .../tests/applicationDPI_640.mxml                   |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e506ece1/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 780892f..a626f62 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_120.mxml
@@ -70,11 +70,11 @@
 				
 				<AssertPropertyValue target="" propertyName="scalingFactor" value="1" >
 					<ConditionalValue deviceDensity="120" value="1"/>
-					<ConditionalValue deviceDensity="160" value="1.5"/>
+					<ConditionalValue deviceDensity="160" value="1.33333"/>
 					<ConditionalValue deviceDensity="240" value="2"/>
-					<ConditionalValue deviceDensity="320" value="2.5"/>
+					<ConditionalValue deviceDensity="320" value="2.66667"/>
 					<ConditionalValue deviceDensity="480" value="4"/>
-					<ConditionalValue deviceDensity="640" value="8"/>
+					<ConditionalValue deviceDensity="640" value="5.33333"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -87,11 +87,11 @@
 				
 				<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"/>
+					<ConditionalValue deviceDensity="160" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/1.33333"/>
+					<ConditionalValue deviceDensity="240" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/2"/>
+					<ConditionalValue deviceDensity="320" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/2.66667"/>
+					<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/4"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/5.33333"/>
 				</AssertPropertyValue>	
 			</body>
 			

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e506ece1/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 a8c3749..a0e12f6 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_160.mxml
@@ -73,8 +73,8 @@
 					<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"/>
+					<ConditionalValue deviceDensity="480" value="3"/>
+					<ConditionalValue deviceDensity="640" value="4"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -90,8 +90,8 @@
 					<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/4"/>
-					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/8"/>
+					<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/3"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/4"/>
 				</AssertPropertyValue>	
 			</body>
 			

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e506ece1/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 81e3014..5e6faab 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_320.mxml
@@ -90,8 +90,8 @@
 					<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"/>
+					<ConditionalValue deviceDensity="480" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/1.5"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/2"/>
 				</AssertPropertyValue>	
 			</body>
 			

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e506ece1/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 7bb5740..2a37d38 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_480.mxml
@@ -74,7 +74,7 @@
 					<ConditionalValue deviceDensity="240" value="0.5"/>
 					<ConditionalValue deviceDensity="320" value="0.75"/>
 					<ConditionalValue deviceDensity="480" value="1"/>
-					<ConditionalValue deviceDensity="640" value="2"/>
+					<ConditionalValue deviceDensity="640" value="1.333333"/>
 				</AssertPropertyValue>	
 			
 			</body>
@@ -91,7 +91,7 @@
 					<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"/>
+					<ConditionalValue deviceDensity="640" valueExpression="value=FlexGlobals.topLevelApplication.stage.stageWidth/1.333333"/>
 				</AssertPropertyValue>	
 			</body>
 			

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e506ece1/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_640.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_640.mxml
b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_640.mxml
index cfb6833..3d3f12b 100644
--- a/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_640.mxml
+++ b/mustella/tests/mobile/DensityIndependentScaling/tests/applicationDPI_640.mxml
@@ -45,10 +45,10 @@
 	
 	<testCases>
 		
-		<TestCase testID="Get_applicationDPI" description="applicationDPI is set to 320 in MXML"
keywords="[ViewNavigatorApplication, properties, applicationDPI]">
+		<TestCase testID="Get_applicationDPI" description="applicationDPI is set to 640 in MXML"
keywords="[ViewNavigatorApplication, properties, applicationDPI]">
 
 			<body>
-				<AssertPropertyValue target="" propertyName="applicationDPI" value="320" />
+				<AssertPropertyValue target="" propertyName="applicationDPI" value="640" />
 			</body>
 		
 		</TestCase>
@@ -59,7 +59,7 @@
 				<SetProperty target="" propertyName="applicationDPI" value="777" />
 			</setup>
 			<body>
-			<AssertPropertyValue target="" propertyName="applicationDPI" value="320" />
+			<AssertPropertyValue target="" propertyName="applicationDPI" value="640" />
 			</body>
 			
 		</TestCase>


Mime
View raw message