You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/10/03 00:18:01 UTC

svn commit: r1393214 - /incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml

Author: cframpton
Date: Tue Oct  2 22:18:01 2012
New Revision: 1393214

URL: http://svn.apache.org/viewvc?rev=1393214&view=rev
Log:
Embed fonts and remove OS specific conditionals.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml?rev=1393214&r1=1393213&r2=1393214&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml Tue Oct  2 22:18:01 2012
@@ -91,13 +91,11 @@
 		</body>
 	</TestCase>
 
-    <TestCase testID="constraintRow_contentSized_mxml_noHeightOnComponent_mac" keywords="[constraintRows, MXML]"
+    <TestCase testID="constraintRow_contentSized_mxml_noHeightOnComponent" keywords="[constraintRows, MXML]"
 	    description="Verify the constraintRows has the right height when its children have no explicit height set in mxml">
 		<body>
 			<AssertPropertyValue target="constraintRows.2" propertyName="height" valueExpression="value=application.datechooser1.height + 20" />
-			<AssertPropertyValue target="datechooser1" propertyName="height" value="194">
-				<ConditionalValue os="win" value="202"/>
-			</AssertPropertyValue>
+			<AssertPropertyValue target="datechooser1" propertyName="height" value="194"/>
 			<AssertPropertyValue target="datechooser1" propertyName="x" value="0" />
 			<AssertPropertyValue target="datechooser1" propertyName="y" valueExpression="value=application.constraintRows[0].height + application.constraintRows[1].height + 10" />
 		</body>
@@ -122,13 +120,11 @@
 		</body>
 	</TestCase>
 
-    <TestCase testID="constraintColumn_contentSized_mxml_noWidthOnComponent_mac" keywords="[constraintRows, MXML]"
+    <TestCase testID="constraintColumn_contentSized_mxml_noWidthOnComponent" keywords="[constraintRows, MXML]"
 	    description="Verify the constraintRows has the right width when its children have no explicit width set in mxml">
 		<body>
 			<AssertPropertyValue target="constraintColumns.2" propertyName="width" valueExpression="value=application.getChildAt(4).width + 20" />
-			<AssertPropertyValue target="getChildAt(4)" propertyName="width" value="83">
-				<ConditionalValue os="win" value="85"/>
-			</AssertPropertyValue>
+			<AssertPropertyValue target="getChildAt(4)" propertyName="width" value="83"/>
 			<AssertPropertyValue target="getChildAt(4)" propertyName="y" value="0" />
 			<AssertPropertyValue target="getChildAt(4)" propertyName="x" valueExpression="value=application.constraintColumns[0].width + application.constraintColumns[1].width + 10" />
 		</body>