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/02 22:31:17 UTC
svn commit: r1393159 - in
/incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties:
ContentSizedConstraints_Application.mxml PercentConstraints_Application.mxml
Author: cframpton
Date: Tue Oct 2 20:31:16 2012
New Revision: 1393159
URL: http://svn.apache.org/viewvc?rev=1393159&view=rev
Log:
Updates for Windows.
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/ContentSizedConstraints_Application.mxml
incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/PercentConstraints_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=1393159&r1=1393158&r2=1393159&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 20:31:16 2012
@@ -95,7 +95,9 @@
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" />
+ <AssertPropertyValue target="datechooser1" propertyName="height" value="194">
+ <ConditionalValue os="win" value="202"/>
+ </AssertPropertyValue>
<AssertPropertyValue target="datechooser1" propertyName="x" value="0" />
<AssertPropertyValue target="datechooser1" propertyName="y" valueExpression="value=application.constraintRows[0].height + application.constraintRows[1].height + 10" />
</body>
@@ -124,7 +126,9 @@
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" />
+ <AssertPropertyValue target="getChildAt(4)" propertyName="width" value="83">
+ <ConditionalValue os="win" value="85"/>
+ </AssertPropertyValue>
<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>
Modified: incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/PercentConstraints_Application.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/PercentConstraints_Application.mxml?rev=1393159&r1=1393158&r2=1393159&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/PercentConstraints_Application.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/Application/Application_SparkSkin/Properties/PercentConstraints_Application.mxml Tue Oct 2 20:31:16 2012
@@ -213,7 +213,9 @@
</setup>
<body>
<SetProperty target="constraintRows.1" propertyName="percentHeight" value="30" waitEvent="updateComplete" waitTarget=""/>
- <AssertPropertyValue target="getChildAt(1)" propertyName="height" value="140" />
+ <AssertPropertyValue target="getChildAt(1)" propertyName="height" value="140" >
+ <ConditionalValue os="win" value="148"/>
+ </AssertPropertyValue>
<AssertPropertyValue target="getChildAt(1)" propertyName="y" value="10" />
</body>
</TestCase>