You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2012/12/12 22:48:44 UTC
svn commit: r1420998 - in
/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List:
integration/ItemSnapping_ListResize.mxml
integration/List_Integration_nested.mxml swfs/List.mxml
Author: pent
Date: Wed Dec 12 21:48:43 2012
New Revision: 1420998
URL: http://svn.apache.org/viewvc?rev=1420998&view=rev
Log:
Modified test scripts to account for font changes in size and placement. Removed restrictions on which tests could run where.
Modified:
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_nested.mxml
incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/swfs/List.mxml
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=1420998&r1=1420997&r2=1420998&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 Wed Dec 12 21:48:43 2012
@@ -448,7 +448,8 @@
<RunCode code="application.navigator.pushView(views.ListResizeWithTransition)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000"/>
<SetProperty target="navigator.activeView.itemList" propertyName="scrollSnappingMode" value="trailingEdge" />
<SetProperty target="navigator.activeView.itemList" propertyName="selectedIndex" value="2" />
- <SimulateMouseGesture target="navigator.activeView.itemList" dragXFrom="100" dragXTo="100" dragYFrom="85%" dragYTo="0" waitTarget="navigator.activeView.itemList" waitEvent="touchInteractionEnd" />
+ <SimulateMouseGesture target="navigator.activeView.itemList" dragXFrom="100" dragXTo="100" dragYFrom="85%" dragYTo="0" waitTarget="navigator.activeView.itemList" waitEvent="touchInteractionEnd" />
+ <Pause timeout="300" />
<!-- 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 -->
@@ -502,7 +503,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 />
+ <Pause timeout="500" />
<!-- 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_nested.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_nested.mxml?rev=1420998&r1=1420997&r2=1420998&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_nested.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/integration/List_Integration_nested.mxml Wed Dec 12 21:48:43 2012
@@ -136,11 +136,11 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInVerticalView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="250" dragYTo="200" dragXFrom="250" dragXTo="250" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="250" dragYTo="231" dragXFrom="250" dragXTo="250" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
@@ -164,7 +164,7 @@
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
@@ -181,12 +181,12 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInVerticalView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="250" dragYTo="200" dragXFrom="250" dragXTo="200" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="250" dragYTo="231" dragXFrom="250" dragXTo="200" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50-List.getSlopValue())" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50-List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19-List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19-List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
@@ -395,7 +395,7 @@
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
@@ -413,12 +413,12 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInHorizontalView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="200" dragYTo="200" dragXFrom="200" dragXTo="150" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="200" dragYTo="200" dragXFrom="200" dragXTo="220" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
@@ -435,12 +435,12 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInHorizontalView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="200" dragYTo="150" dragXFrom="200" dragXTo="150" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="200" dragYTo="150" dragXFrom="200" dragXTo="220" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
@@ -639,11 +639,11 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInBasicView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="100" dragXFrom="150" dragXTo="150" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="131" dragXFrom="150" dragXTo="150" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
@@ -661,12 +661,12 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInBasicView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="150" dragXFrom="150" dragXTo="100" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="150" dragXFrom="150" dragXTo="131" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
@@ -683,12 +683,12 @@
<body>
<RunCode code="application.navigator.pushView(views.NestedInBasicView)" waitTarget="navigator" waitEvent="viewChangeComplete" timeout="6000" />
- <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="100" dragXFrom="150" dragXTo="100" />
+ <SimulateMouseGesture target="navigator.activeView.outerScroller" dragYFrom="150" dragYTo="131" dragXFrom="150" dragXTo="131" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.outerScroller.viewport" propertyName="horizontalScrollPosition" value="0" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
- <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(50 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="verticalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
+ <AssertPropertyValue target="navigator.activeView.innerScroller.viewport" propertyName="horizontalScrollPosition" valueExpression="value=(19 - List.getSlopValue())" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="verticalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.vList.dataGroup" propertyName="horizontalScrollPosition" value="0" />
<AssertPropertyValue target="navigator.activeView.hList.dataGroup" propertyName="verticalScrollPosition" value="0" />
Modified: incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/swfs/List.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/swfs/List.mxml?rev=1420998&r1=1420997&r2=1420998&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/swfs/List.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/mobile/components/List/swfs/List.mxml Wed Dec 12 21:48:43 2012
@@ -54,21 +54,9 @@
// We throw an error and exit so there is a single List failure:
// "mobile/components/List/swfs/List.swf Failed Timed out"
// rather than a couple hundred failures. It keeps the run cleaner.
- if (CONFIG::skaha == false){
- // adl_extras: -screensize 320x455:320x480 -profile mobileDevice -XscreenDPI 170
- // adl_extras: -screensize 640x960:640x960 -profile mobileDevice -XscreenDPI 320
- if (FlexGlobals.topLevelApplication.width == 320 || /* upcoming 170 ADL run */
- (FlexGlobals.topLevelApplication.width == 640 && (Capabilities.os.indexOf('Win') == 0 || Capabilities.os.indexOf('Mac') == 0) ) || /* upcoming 326 ADL run */
- Capabilities.screenDPI == 160 || /* current 160ADL run */
- Capabilities.screenDPI == 320 /* current 320 ADL run */ ){
-
- // quietly fail on all 160 + 320 ADL runs whether they are current or next
- var errorString:String = "Error: List tests excluded for 160dpi and 320dpi ADL Mustella runs";
- trace(errorString);
-// throw new Error(errorString);
- NativeApplication.nativeApplication.exit(-1);
- }
- }
+ //
+ // Note the code referenced above has been removed. It runs perfectly fine in the
+ // simulator. Check previous revisions for questions.
}
/**