Author: pent
Date: Mon Nov 26 21:41:01 2012
New Revision: 1413878
URL: http://svn.apache.org/viewvc?rev=1413878&view=rev
Log:
Fixed test scripts. Baselines did not need to be regened for 240ppi.
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_Integration.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_ListResize.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_iconIR.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_labelIR.mxml
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_Integration.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_Integration.mxml?rev=1413878&r1=1413877&r2=1413878&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_Integration.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_Integration.mxml
Mon Nov 26 21:41:01 2012
@@ -104,6 +104,7 @@
<!-- Intentionally not waiting for
touchInteractionEndEvent for verifying the bug -->
<SimulateMouseGesture
target="navigator.activeView.imageGroup"
valueExpression="value=application.mouseSequences.throw_large_right"
waitTarget="navigator.activeView.imageScroller"/>
<RunCode
code="application.navigator.stage.setOrientation(StageOrientation.ROTATED_RIGHT)"
waitTarget="stage" waitEvent="orientationChange" timeout="6000"/>
+ <WaitForLayoutManager />
<AssertMethodValue
method="value=application.navigator.activeView.imageGroup.horizontalScrollPosition
% application.navigator.activeView.imageGroup.width" value="0" />
</body>
</TestCase>
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_ListResize.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_ListResize.mxml?rev=1413878&r1=1413877&r2=1413878&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_ListResize.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/ItemSnapping_ListResize.mxml
Mon Nov 26 21:41:01 2012
@@ -210,6 +210,7 @@
<SetProperty
target="navigator.activeView.itemList" propertyName="scrollSnappingMode"
value="trailingEdge" />
<SetProperty
target="navigator.activeView.itemList" propertyName="selectedIndex" value="2" />
<RunCode
code="application.navigator.activeView.itemList.ensureIndexIsVisible(12)"
waitTarget="navigator.activeView.itemList.dataGroup"
waitEvent="propertyChange"/>
+ <WaitForLayoutManager />
<!-- ensure snapping lands at a complete page
ie. verticalscroll position aligns with the starting of first element in view
-->
<AssertMethodValue
method="value=(application.navigator.activeView.itemList.layout as
VerticalLayout).fractionOfElementInView((application.navigator.activeView.itemList.layout
as VerticalLayout).lastIndexInView)" value="1" />
</body>
@@ -501,6 +502,7 @@
<SetProperty
target="navigator.activeView.itemList" propertyName="scrollSnappingMode"
value="trailingEdge" />
<SetProperty
target="navigator.activeView.itemList" propertyName="selectedIndex" value="2" />
<RunCode
code="application.navigator.activeView.itemList.ensureIndexIsVisible(12)"
waitTarget="navigator.activeView.itemList.dataGroup"
waitEvent="propertyChange"/>
+ <WaitForLayoutManager />
<!-- ensure snapping lands at a complete page
ie. verticalscroll position aligns with the starting of first element in view
-->
<AssertMethodValue
method="value=(application.navigator.activeView.itemList.layout as
VerticalLayout).fractionOfElementInView((application.navigator.activeView.itemList.layout
as VerticalLayout).lastIndexInView)" value="1" />
<!-- alternative approach generic for all
layouts including tile -->
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_iconIR.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_iconIR.mxml?rev=1413878&r1=1413877&r2=1413878&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_iconIR.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_iconIR.mxml
Mon Nov 26 21:41:01 2012
@@ -388,7 +388,7 @@
<SetStyle target="navigator.activeView.target"
styleName="color" value="0xFF0000"
waitTarget="navigator.activeView.target.dataGroup.getElementAt(1)"
waitEvent="updateComplete" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -429,7 +429,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -445,7 +445,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -461,7 +461,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/" numColorVariances="4" maxColorVariance="20">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -477,7 +477,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -547,7 +547,7 @@
<Pause timeout="500" /><!-- TODO: iOS interpreter seems to
need a bit of extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/" numColorVariances="2"
ignoreMaxColorVariance="true">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -620,7 +620,7 @@
<SetProperty target="navigator.activeView.target"
propertyName="itemRenderer" valueExpression="value=new
ClassFactory(views.IIR_Styles_verticalAlign_top)"
waitEvent="itemRenderer1IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -636,7 +636,7 @@
<Pause timeout="500" /><!-- TODO: For iOS interpreter -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(2)"
url="../integration/baselines/" numColorVariances="1" maxColorVariance="10">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -653,7 +653,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -668,7 +668,7 @@
<SetProperty target="navigator.activeView.target"
propertyName="itemRenderer" valueExpression="value=new
ClassFactory(views.IIR_Styles_verticalAlign_bottom)"
waitEvent="itemRenderer2IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(2)"
url="../integration/baselines/" numColorVariances="1" maxColorVariance="10">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -888,7 +888,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer1IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -904,7 +904,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/" numColorVariances="2" maxColorVariance="20">
<ConditionalValue os="android"/>
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -920,7 +920,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -936,7 +936,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -952,7 +952,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios"
/>
<ConditionalValue deviceDensity="160" os="qnx"
/>
</CompareBitmap>
</body>
@@ -968,7 +968,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/" numColorVariances="2" maxColorVariance="20">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -984,7 +984,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/" numColorVariances="2" maxColorVariance="20">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1006,7 +1006,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer0IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(0)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1029,7 +1029,7 @@
<Pause timeout="500" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1051,7 +1051,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer1IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1074,7 +1074,7 @@
<Pause timeout="1000" /><!-- TODO: Why is this needed to run
on device all of a sudden? Do I need to upgrade InstrumentedBitmapImage? -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1090,7 +1090,7 @@
<WaitForEvent target="navigator.activeView.target"
eventName="itemRenderer1IconReady" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
@@ -1107,7 +1107,7 @@
<Pause timeout="100" /><!-- TODO: iOS interpreter seems to
need a bit extra time here -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320" os="iphone" />
+ <ConditionalValue deviceDensity="320" os="ios" />
<ConditionalValue deviceDensity="160" os="qnx" />
</CompareBitmap>
</body>
Modified:
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_labelIR.mxml
URL:
http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_labelIR.mxml?rev=1413878&r1=1413877&r2=1413878&view=diff
==============================================================================
---
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_labelIR.mxml
(original)
+++
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_labelIR.mxml
Mon Nov 26 21:41:01 2012
@@ -203,7 +203,7 @@
<WaitForEvent
target="navigator.activeView.target.dataGroup.getElementAt(1)"
eventName="creationComplete" timeout="9000" />
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -259,7 +259,7 @@
<Pause timeout="250" /><!-- TODO: For iOS interpreter -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -275,7 +275,7 @@
<Pause timeout="250" /><!-- TODO: For iOS interpreter -->
<CompareBitmap
target="navigator.activeView.target.dataGroup.getElementAt(1)"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -512,7 +512,7 @@
<Pause timeout="1000" /><!-- TODO: The server iPod doesn't
seem to be ready yet sometimes, pause to see if that helps -->
<CompareBitmap target="navigator.activeView.target"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -526,7 +526,7 @@
<RunCode
code="application.navigator.pushView(views.LabelItemRendererView)"
waitTarget="navigator" waitEvent="viewChangeComplete" timeout="9000" />
<CompareBitmap target="navigator.activeView.target"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
@@ -540,7 +540,7 @@
<RunCode
code="application.navigator.pushView(views.LabelItemRendererView)"
waitTarget="navigator" waitEvent="viewChangeComplete" timeout="9000" />
<CompareBitmap target="navigator.activeView.target2"
url="../integration/baselines/">
<ConditionalValue os="android" />
- <ConditionalValue deviceDensity="320"
os="iphone" />
+ <ConditionalValue deviceDensity="320"
os="ios" />
<ConditionalValue deviceDensity="160"
os="qnx" />
</CompareBitmap>
</body>
