You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by mi...@apache.org on 2017/04/12 11:35:43 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-35267
Updated unit test - made it easier to read,
and now we're also testing GridColumnHeaderGroup.containsGlobalCoordinates().
For the test to pass I've improved the logic in GridHeaderViewLayout.
Repository: flex-sdk
Updated Branches:
refs/heads/develop 56abc7db2 -> 60ccf24cb
FLEX-35267 Updated unit test - made it easier to read, and now we're also testing GridColumnHeaderGroup.containsGlobalCoordinates(). For the test to pass I've improved the logic in GridHeaderViewLayout.getHeaderIndexAt() which, in turn, made a few functions redundant in GridColumnHeaderGroup. All tests currently pass.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a1c61c5c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a1c61c5c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a1c61c5c
Branch: refs/heads/develop
Commit: a1c61c5cfd452cb0a150788e498865763890d112
Parents: 56abc7d
Author: Mihai Chira <mi...@apache.org>
Authored: Wed Mar 29 14:26:51 2017 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed Mar 29 14:26:51 2017 +0200
----------------------------------------------------------------------
.../GridHeaderViewLayout_FLEX_35260_Tests.as | 84 ++++++++++++++------
1 file changed, 61 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a1c61c5c/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as b/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
index 1ac5a17..5bc24b4 100644
--- a/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
+++ b/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
@@ -88,6 +88,7 @@ package spark.components.gridClasses {
private static const directions:Array = [ITSELF, N, NE, E, SE, S, SW, W, NW];
private static const COLUMN_HEADER_RECTANGLES:String = "columnHeaderRectangles";
+ private static const COLUMN_RECTANGLES:String = "columnRectangles";
private static const ENTIRE_HEADER_RECTANGLE:String = "headerRectangle"; //includes padding
private static const MAIN_HEADER_VIEW_RECTANGLE:String = "mainHeaderViewRectangle";
private static const FIXED_HEADER_VIEW_RECTANGLE:String = "fixedHeaderViewRectangle";
@@ -98,11 +99,11 @@ package spark.components.gridClasses {
private var _keyPoints:Array;
//@TODO add cases with horizontal scroll, and also with fixed columns
- //@TODO we probably have to account for paddingTop and paddingBottom as well
public static var dimensions:Array = [
/*x, y, width, header padding left, header padding top, header padding bottom, [column widths] */
- [[10, 0, 300, 5, 0, 5, [25, 150]]],
- [[0, 0, 300, 5, 0, 0, [25, 150]]]
+ [[/*x=*/ 0, /*y=*/ 0, /*width=*/ 300, /*paddingLeft=*/ 5, /*paddingTop=*/ 0, /*paddingBottom=*/ 0, /*columnWidths=*/[25, 150]]],
+ [[/*x=*/ 10, /*y=*/ 0, /*width=*/ 300, /*paddingLeft=*/ 5, /*paddingTop=*/ 0, /*paddingBottom=*/ 5, /*columnWidths=*/[25, 150]]],
+ [[/*x=*/ -5, /*y=*/-100, /*width=*/ 200, /*paddingLeft=*/ 25, /*paddingTop=*/ 12, /*paddingBottom=*/ 5, /*columnWidths=*/[100, 150]]] //horizontal scroll
];
@@ -135,22 +136,6 @@ package spark.components.gridClasses {
_keyPoints = null;
}
- /*
- [Ignore]
- [Test]
- public function test_column_index(globalPoint:Array, expectedColumnIndex:int):void
- {
- //given
- var localPoint:Point = _dataGrid.grid.globalToLocal(new Point(globalPoint[0], globalPoint[1]));
-
- //when
- var columnIndex:int = _dataGrid.grid.getColumnIndexAt(localPoint.x, 0);
-
- //then
- assertEquals(expectedColumnIndex, columnIndex);
- }
-*/
-
[Test(dataProvider="dimensions")]
public function test_with_no_scroll(dimensions:Array):void
@@ -189,6 +174,7 @@ package spark.components.gridClasses {
{
assertThatHeaderContainsPointOrNot(point, pointName, currentTransformation);
assertThatHeaderIndexIsCorrect(point, pointName, currentTransformation);
+ assertThatColumnIndexIsCorrect(point, pointName, currentTransformation);
assertThatCoordinatesOverHeaderViewOrNot(point, pointName, currentTransformation);
}
@@ -227,6 +213,17 @@ package spark.components.gridClasses {
assertEquals(errorMessageHeaderIndex, expectedHeaderIndex, actualHeaderIndex);
}
+ private function assertThatColumnIndexIsCorrect(point:Point, pointName:String, currentTransformation:Matrix):void
+ {
+ //when
+ var expectedColumnIndex:int = getColumnIndexAssumption(point);
+ var actualColumnIndex:int = getColumnIndexAtGlobalPoint(point);
+ const errorMessageColumnIndex:String = getColumnIndexErrorMessage(pointName, currentTransformation, point, expectedColumnIndex, actualColumnIndex);
+
+ //then
+ assertEquals(errorMessageColumnIndex, expectedColumnIndex, actualColumnIndex);
+ }
+
private function getHeaderIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int):String
{
return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should be "
@@ -236,6 +233,15 @@ package spark.components.gridClasses {
+ "\n DEBUG INFO: headerRectangles=" + columnHeaderRectangles);
}
+ private function getColumnIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int):String
+ {
+ return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should have its x value "
+ + (expectedColumnHeaderIndex == -1 ? "outside any column bounds" : "within the column with index " + expectedColumnHeaderIndex)
+ + " but was mistakenly found to be "
+ + (actualColumnHeaderIndex == -1 ? "outside any column bounds" : "inside the column with index " + actualColumnHeaderIndex
+ + "\n DEBUG INFO: columnRectangles=" + columnRectangles);
+ }
+
private function getHeaderContainsPointErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, shouldBeContainedInHeader:Boolean, isActuallyContainedInHeader:Boolean):String
{
return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should be "
@@ -260,6 +266,12 @@ package spark.components.gridClasses {
return _sut.getHeaderIndexAt(localPoint.x, localPoint.y);
}
+ private function getColumnIndexAtGlobalPoint(globalPoint:Point):int
+ {
+ var localPoint:Point = _dataGrid.grid.globalToLocal(globalPoint);
+ return _dataGrid.grid.getColumnIndexAt(localPoint.x, localPoint.y);
+ }
+
private function getHeaderShouldContainPointAssumption(point:Point):Boolean
{
return rectangleContainsPoint(entireHeaderRectangle, point);
@@ -277,15 +289,15 @@ package spark.components.gridClasses {
private function getHeaderIndexAssumption(point:Point):int
{
- return getIndexOfHeaderRectangleWhichContainsPoint(point, columnHeaderRectangles);
+ return getIndexOfRectangleWhichContainsPoint(point, columnHeaderRectangles);
}
- private function getAdjacentPoint(point:Point, direction:Matrix):Point
+ private function getColumnIndexAssumption(point:Point):int
{
- return direction.transformPoint(point);
+ return getIndexOfRectangleWhichContainsPoint(point, columnRectangles);
}
- private function getIndexOfHeaderRectangleWhichContainsPoint(point:Point, rectangles:Array):int
+ private function getIndexOfRectangleWhichContainsPoint(point:Point, rectangles:Array):int
{
for (var i:int = 0; i < rectangles.length; i++)
{
@@ -301,6 +313,11 @@ package spark.components.gridClasses {
return rectangle.containsPoint(point);
}
+ private function getAdjacentPoint(point:Point, direction:Matrix):Point
+ {
+ return direction.transformPoint(point);
+ }
+
private function generateKeyPoints(dimensions:Array, grid:DataGrid):Array
{
var keyPoints:Array = [];
@@ -338,6 +355,7 @@ package spark.components.gridClasses {
var keyRectangles:Array = [];
keyRectangles[COLUMN_HEADER_RECTANGLES] = generateHeaderColumnRectangles(keyPoints, dimensions);
+ keyRectangles[COLUMN_RECTANGLES] = generateColumnRectangles(keyPoints, dimensions);
keyRectangles[ENTIRE_HEADER_RECTANGLE] = generateVisibleHeaderRectangle(keyPoints, dimensions);
keyRectangles[MAIN_HEADER_VIEW_RECTANGLE] = generateMainHeaderViewRectangle(keyPoints, dimensions);
keyRectangles[FIXED_HEADER_VIEW_RECTANGLE] = generateFixedHeaderViewRectangle(keyPoints, dimensions);
@@ -390,6 +408,21 @@ package spark.components.gridClasses {
return headerRectangles;
}
+ //Note that the height and y of the rectangles doesn't matter until FLEX-35280 is fixed
+ private function generateColumnRectangles(keyPoints:Array, dimensions:Array):Array
+ {
+ var columnRectangles:Array = [];
+
+ for (var i:int = 0; i < getColumnWidths(dimensions).length; i++)
+ {
+ var topLeft:Point = keyPoints["g" + i];
+ var topRight:Point = keyPoints["g" + (i+1)];
+ columnRectangles.push(new Rectangle(topLeft.x, -10000, topRight.x - topLeft.x, Number.MAX_VALUE));
+ }
+
+ return columnRectangles;
+ }
+
private function forEachPoint(assertThat_:Function):void
{
for (var pointName:String in _keyPoints)
@@ -415,6 +448,11 @@ package spark.components.gridClasses {
return _keyRectangles[COLUMN_HEADER_RECTANGLES];
}
+ private function get columnRectangles():Array
+ {
+ return _keyRectangles[COLUMN_RECTANGLES];
+ }
+
private function get entireHeaderRectangle():Rectangle //includes padding
{
return _keyRectangles[ENTIRE_HEADER_RECTANGLE] as Rectangle;
[3/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-35280
FLEX-35260 Recent changes to FLEX-35267 made it so that the y value in
GridHeaderViewLayout.getHeaderIndexAt() started to be considered,
when before it was simply ignored. But one caller of t
Posted by mi...@apache.org.
FLEX-35280 FLEX-35260 Recent changes to FLEX-35267 made it so that the y value in GridHeaderViewLayout.getHeaderIndexAt() started to be considered, when before it was simply ignored. But one caller of this function, GridColumnHeaderGroup.eventToHeaderLocations(), simply used '0' for that argument, instead of the real value, knowing that (before these changes) it wasn't being considered. Now the real value is used.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/60ccf24c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/60ccf24c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/60ccf24c
Branch: refs/heads/develop
Commit: 60ccf24cbd641fcac30e27215156e65d4cb0e923
Parents: 7d3073b
Author: Mihai Chira <mi...@apache.org>
Authored: Wed Apr 12 13:34:54 2017 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed Apr 12 13:34:54 2017 +0200
----------------------------------------------------------------------
.../projects/spark/src/spark/components/GridColumnHeaderGroup.as | 2 +-
.../spark/src/spark/components/gridClasses/GridColumnHeaderView.as | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/60ccf24c/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
index 02f3aac..3d51fd8 100644
--- a/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
+++ b/frameworks/projects/spark/src/spark/components/GridColumnHeaderGroup.as
@@ -1050,7 +1050,7 @@ public class GridColumnHeaderGroup extends Group implements IDataGridElement
const separatorIndex:int = viewLayout.getSeparatorIndexAt(viewXY.x, 0);
headerCP.rowIndex = (separatorIndex != -1) ? separatorIndex + gdv.viewColumnIndex : -1;
- headerCP.columnIndex = (separatorIndex == -1) ? viewLayout.getHeaderIndexAt(viewXY.x, 0) + gdv.viewColumnIndex : -1;
+ headerCP.columnIndex = (separatorIndex == -1) ? viewLayout.getHeaderIndexAt(viewXY.x, viewXY.y) + gdv.viewColumnIndex : -1;
headerXY.x = viewXY.x + gdv.viewOriginX;
headerXY.y = viewXY.y;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/60ccf24c/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as
index a836462..aecb7c2 100644
--- a/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as
+++ b/frameworks/projects/spark/src/spark/components/gridClasses/GridColumnHeaderView.as
@@ -120,7 +120,6 @@ public class GridColumnHeaderView extends Group
origin.x -= width;
origin.y += verticalScrollPosition;
-
var headerViewContainsGlobalCoordinates:Boolean = (stageX >= origin.x) && (stageY >= origin.y) &&
(stageX < (origin.x + width)) && (stageY < (origin.y + height));
[2/3] git commit: [flex-sdk] [refs/heads/develop] - FLEX-35267
Updated unit test to support horizontal scrolling and two new grid profiles.
Currently tests fail,
but for perplexing reasons (seems like a failure to validate,
despite the unit test calling
Posted by mi...@apache.org.
FLEX-35267 Updated unit test to support horizontal scrolling and two new grid profiles. Currently tests fail, but for perplexing reasons (seems like a failure to validate, despite the unit test calling validateNow() way too many times...).
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7d3073bb
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7d3073bb
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7d3073bb
Branch: refs/heads/develop
Commit: 7d3073bb34cf4a5853039bab63e6df8d1f47cd65
Parents: a1c61c5
Author: Mihai Chira <mi...@apache.org>
Authored: Wed Apr 5 18:33:03 2017 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Wed Apr 5 18:33:03 2017 +0200
----------------------------------------------------------------------
.../spark/src/spark/components/Scroller.as | 4 +-
.../GridHeaderViewLayout_FLEX_35260_Tests.as | 313 ++++++++++++-------
2 files changed, 200 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7d3073bb/frameworks/projects/spark/src/spark/components/Scroller.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/Scroller.as b/frameworks/projects/spark/src/spark/components/Scroller.as
index 3ca9155..4db6528 100644
--- a/frameworks/projects/spark/src/spark/components/Scroller.as
+++ b/frameworks/projects/spark/src/spark/components/Scroller.as
@@ -759,8 +759,8 @@ public class Scroller extends SkinnableComponent
/**
* @private
- * These are the minimum and maximum scroll possitions allowed
- * for both axes. They determine the points at which bounce and
+ * These are the minimum and maximum scroll positions allowed
+ * for both axes. They determine the points at which bounce and
* pull occur.
*/
private var minVerticalScrollPosition:Number = 0;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7d3073bb/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as b/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
index 5bc24b4..3fb4b92 100644
--- a/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
+++ b/frameworks/projects/spark/tests/spark/components/gridClasses/GridHeaderViewLayout_FLEX_35260_Tests.as
@@ -1,4 +1,7 @@
package spark.components.gridClasses {
+ import flash.events.Event;
+ import flash.events.EventDispatcher;
+
import flash.geom.Matrix;
import flash.geom.Point;
import flash.geom.Rectangle;
@@ -8,6 +11,8 @@ package spark.components.gridClasses {
import org.flexunit.assertThat;
import org.flexunit.asserts.assertEquals;
+ import org.flexunit.asserts.assertTrue;
+ import org.flexunit.async.Async;
import org.flexunit.runners.Parameterized;
import org.fluint.uiImpersonation.UIImpersonator;
@@ -87,22 +92,28 @@ package spark.components.gridClasses {
private static const ITSELF:Matrix = new Matrix(1, 0, 0, 1, 0, 0); //the point, unmodified
private static const directions:Array = [ITSELF, N, NE, E, SE, S, SW, W, NW];
- private static const COLUMN_HEADER_RECTANGLES:String = "columnHeaderRectangles";
- private static const COLUMN_RECTANGLES:String = "columnRectangles";
- private static const ENTIRE_HEADER_RECTANGLE:String = "headerRectangle"; //includes padding
- private static const MAIN_HEADER_VIEW_RECTANGLE:String = "mainHeaderViewRectangle";
+ private static const ENTIRE_HEADER_RECTANGLE:String = "visibleHeaderRectangle"; //includes padding
private static const FIXED_HEADER_VIEW_RECTANGLE:String = "fixedHeaderViewRectangle";
+ private static const NO_ENTER_FRAMES_TO_ALLOW:int = 2;
+
private static var _dataGrid:DataGrid;
+ private static const _finishNotifier:EventDispatcher = new EventDispatcher();
private var _keyRectangles:Array;
private var _keyPoints:Array;
+ private var _dimensions:Array;
+ private var _noEnterFramesRemaining:int = NaN;
- //@TODO add cases with horizontal scroll, and also with fixed columns
- public static var dimensions:Array = [
+ //@TODO add cases with fixed columns
+ //@TODO can the grid itself have padding?
+ //@TODO test with a columnGap as well
+ public static var allDimensions:Array = [
/*x, y, width, header padding left, header padding top, header padding bottom, [column widths] */
[[/*x=*/ 0, /*y=*/ 0, /*width=*/ 300, /*paddingLeft=*/ 5, /*paddingTop=*/ 0, /*paddingBottom=*/ 0, /*columnWidths=*/[25, 150]]],
[[/*x=*/ 10, /*y=*/ 0, /*width=*/ 300, /*paddingLeft=*/ 5, /*paddingTop=*/ 0, /*paddingBottom=*/ 5, /*columnWidths=*/[25, 150]]],
+ [[/*x=*/ 0, /*y=*/ 0, /*width=*/ 200, /*paddingLeft=*/ 5, /*paddingTop=*/ 0, /*paddingBottom=*/ 0, /*columnWidths=*/[80, 150]]], //horizontal scroll
+ [[/*x=*/ 0, /*y=*/ 0, /*width=*/ 100, /*paddingLeft=*/ 0, /*paddingTop=*/ 0, /*paddingBottom=*/ 0, /*columnWidths=*/[10, 110, 15]]], //horizontal scroll
[[/*x=*/ -5, /*y=*/-100, /*width=*/ 200, /*paddingLeft=*/ 25, /*paddingTop=*/ 12, /*paddingBottom=*/ 5, /*columnWidths=*/[100, 150]]] //horizontal scroll
];
@@ -134,11 +145,12 @@ package spark.components.gridClasses {
{
_keyRectangles = null;
_keyPoints = null;
+ _dimensions = null;
}
- [Test(dataProvider="dimensions")]
- public function test_with_no_scroll(dimensions:Array):void
+ [Test(dataProvider="allDimensions", async, timeout=3000)]
+ public function test_ltr(dimensions:Array):void
{
//given
_dataGrid.width = getWidth(dimensions);
@@ -158,24 +170,71 @@ package spark.components.gridClasses {
}
_dataGrid.columns = new ArrayCollection(gridColumns);
+ _dataGrid.columnHeaderGroup.invalidateDisplayList();
+ _dataGrid.columnHeaderGroup.validateNow();
+ _dataGrid.grid.validateNow();
_dataGrid.validateNow();
- _keyPoints = generateKeyPoints(dimensions, _dataGrid);
- _keyRectangles = generateKeyRectangles(_keyPoints, dimensions);
+ _dimensions = dimensions;
+ _keyPoints = generateKeyPoints(_dataGrid);
+ _keyRectangles = generateKeyRectangles();
+ _noEnterFramesRemaining = NO_ENTER_FRAMES_TO_ALLOW;
+ UIImpersonator.testDisplay.addEventListener(Event.ENTER_FRAME, onEnterFrame);
+ Async.handleEvent(this, _finishNotifier, Event.COMPLETE, doTests, 3000);
+ }
+
+ private function doTests(event:Event, passThroughData:Object):void
+ {
//then
//first, make sure that the dataGrid was rendered correctly
assertThat("The dataGrid has not yet been correctly rendered on stage", getActualHeaderHeight(_dataGrid) > 0);
- forEachPoint(assertAssumptionsAboutPoint);
+ //test the assumption about the center column header view location
+ var centerGridViewLocation:Point = GridHeaderLayout(_dataGrid.columnHeaderGroup.layout).centerGridColumnHeaderView.localToGlobal(new Point(0, 0));
+ assertTrue("The location of the centerGridColumnHeaderView does not reflect the columnHeaderGroup's padding rules! It's located at the global coordinates " +
+ centerGridViewLocation + ", but it should be at " + _keyPoints["e"],
+ centerGridViewLocation.equals(_keyPoints["e"]));
+
+ forEachPointAndScrollLocation(assertAssumptionsAboutPoint);
}
- private function assertAssumptionsAboutPoint(point:Point, pointName:String, currentTransformation:Matrix):void
+ private function forEachPointAndScrollLocation(assertThat_:Function):void
+ {
+ _dataGrid.columnHeaderGroup.invalidateDisplayList();
+ _dataGrid.columnHeaderGroup.validateNow();
+ _dataGrid.grid.validateNow();
+ _dataGrid.validateNow();
+
+ var maxScroll:Number = Math.max(1, getTotalColumnWidths(_dimensions) - getWidth(_dimensions) - getHeaderPaddingLeft(_dimensions));
+ for (var i:int = 0; i < maxScroll; i++)
{
+ _dataGrid.grid.horizontalScrollPosition = i;
+ _dataGrid.columnHeaderGroup.invalidateDisplayList();
+ _dataGrid.columnHeaderGroup.validateNow();
+ _dataGrid.grid.validateNow();
+ _dataGrid.validateNow();
+
+ for (var pointName:String in _keyPoints)
+ {
+ for (var j:int = 0; j < directions.length; j++)
+ {
+ assertThat_(getAdjacentPoint(_keyPoints[pointName], directions[j]), pointName, directions[j]);
+ _dataGrid.columnHeaderGroup.invalidateDisplayList();
+ _dataGrid.columnHeaderGroup.validateNow();
+ _dataGrid.grid.validateNow();
+ _dataGrid.validateNow();
+ }
+ }
+ }
+ }
+
+ private function assertAssumptionsAboutPoint(point:Point, pointName:String, currentTransformation:Matrix):void
+ {
assertThatHeaderContainsPointOrNot(point, pointName, currentTransformation);
+ assertThatCoordinatesOverHeaderViewOrNot(point, pointName, currentTransformation);
assertThatHeaderIndexIsCorrect(point, pointName, currentTransformation);
assertThatColumnIndexIsCorrect(point, pointName, currentTransformation);
- assertThatCoordinatesOverHeaderViewOrNot(point, pointName, currentTransformation);
}
private function assertThatHeaderContainsPointOrNot(point:Point, pointName:String, currentTransformation:Matrix):void
@@ -192,11 +251,12 @@ package spark.components.gridClasses {
private function assertThatCoordinatesOverHeaderViewOrNot(point:Point, pointName:String, currentTransformation:Matrix):void
{
//when
- var shouldBeContainedInMainHeaderView:Boolean = getMainHeaderViewContainsPointAssumption(point);
+ const visibleHeaderViewRectangle:Rectangle = getVisibleHeaderViewRectangle(getCurrentHScrollPosition());
+ var shouldBeContainedInMainHeaderView:Boolean = getMainHeaderViewContainsPointAssumption(visibleHeaderViewRectangle, point);
var shouldBeContainedInFixedHeaderView:Boolean = getFixedHeaderViewContainsPointAssumption(point);
const shouldBeContainedInAHeaderView:Boolean = shouldBeContainedInMainHeaderView || shouldBeContainedInFixedHeaderView;
var actuallyContainedInAHeaderView:Boolean = _sut.areCoordinatesOverAHeaderView(point);
- const errorMessageHeaderViewContainsPoint:String = getHeaderViewContainsPointErrorMessage(pointName, currentTransformation, point, shouldBeContainedInAHeaderView, actuallyContainedInAHeaderView);
+ const errorMessageHeaderViewContainsPoint:String = getHeaderViewContainsPointErrorMessage(pointName, currentTransformation, point, shouldBeContainedInAHeaderView, actuallyContainedInAHeaderView, visibleHeaderViewRectangle);
//then
assertEquals(errorMessageHeaderViewContainsPoint, shouldBeContainedInAHeaderView, actuallyContainedInAHeaderView);
@@ -205,9 +265,10 @@ package spark.components.gridClasses {
private function assertThatHeaderIndexIsCorrect(point:Point, pointName:String, currentTransformation:Matrix):void
{
//when
- var expectedHeaderIndex:int = getHeaderIndexAssumption(point);
+ const visibleColumnHeaderRectangles:Array = getVisibleColumnHeaderRectangles(getCurrentHScrollPosition());
+ var expectedHeaderIndex:int = getHeaderIndexAssumption(point, visibleColumnHeaderRectangles);
var actualHeaderIndex:int = getHeaderIndexAtGlobalPoint(point);
- const errorMessageHeaderIndex:String = getHeaderIndexErrorMessage(pointName, currentTransformation, point, expectedHeaderIndex, actualHeaderIndex);
+ const errorMessageHeaderIndex:String = getHeaderIndexErrorMessage(pointName, currentTransformation, point, expectedHeaderIndex, actualHeaderIndex, visibleColumnHeaderRectangles);
//then
assertEquals(errorMessageHeaderIndex, expectedHeaderIndex, actualHeaderIndex);
@@ -216,30 +277,33 @@ package spark.components.gridClasses {
private function assertThatColumnIndexIsCorrect(point:Point, pointName:String, currentTransformation:Matrix):void
{
//when
- var expectedColumnIndex:int = getColumnIndexAssumption(point);
+ const visibleColumnRectangles:Array = getAllColumnRectangles(getCurrentHScrollPosition());
+ var expectedColumnIndex:int = getColumnIndexAssumption(visibleColumnRectangles, point);
var actualColumnIndex:int = getColumnIndexAtGlobalPoint(point);
- const errorMessageColumnIndex:String = getColumnIndexErrorMessage(pointName, currentTransformation, point, expectedColumnIndex, actualColumnIndex);
+ const errorMessageColumnIndex:String = getColumnIndexErrorMessage(pointName, currentTransformation, point, expectedColumnIndex, actualColumnIndex, visibleColumnRectangles);
//then
assertEquals(errorMessageColumnIndex, expectedColumnIndex, actualColumnIndex);
}
- private function getHeaderIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int):String
+ private function getHeaderIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int, visibleColumnHeaderRectangles:Array):String
{
return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should be "
+ (expectedColumnHeaderIndex == -1 ? "outside any column header bounds" : "inside the column header with index " + expectedColumnHeaderIndex)
+ " but was mistakenly found to be "
- + (actualColumnHeaderIndex == -1 ? "outside any column header bounds" : "inside the column header with index " + actualColumnHeaderIndex
- + "\n DEBUG INFO: headerRectangles=" + columnHeaderRectangles);
+ + (actualColumnHeaderIndex == -1 ? "outside any column header bounds" : "inside the column header with index " + actualColumnHeaderIndex)
+ + " given a horizontalScrollPosition of " + getCurrentHScrollPosition()
+ + "\n DEBUG INFO: visibleColumnHeaderRectangles=" + visibleColumnHeaderRectangles;
}
- private function getColumnIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int):String
+ private function getColumnIndexErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, expectedColumnHeaderIndex:int, actualColumnHeaderIndex:int, visibleColumnRectangles:Array):String
{
return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should have its x value "
- + (expectedColumnHeaderIndex == -1 ? "outside any column bounds" : "within the column with index " + expectedColumnHeaderIndex)
+ + (expectedColumnHeaderIndex == -1 ? "outside any column bounds" : "inside the column with index " + expectedColumnHeaderIndex)
+ " but was mistakenly found to be "
- + (actualColumnHeaderIndex == -1 ? "outside any column bounds" : "inside the column with index " + actualColumnHeaderIndex
- + "\n DEBUG INFO: columnRectangles=" + columnRectangles);
+ + (actualColumnHeaderIndex == -1 ? "outside any column bounds" : "inside the column with index " + actualColumnHeaderIndex)
+ + " given a horizontalScrollPosition of " + getCurrentHScrollPosition()
+ + "\n DEBUG INFO: columnRectangles=" + visibleColumnRectangles;
}
private function getHeaderContainsPointErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, shouldBeContainedInHeader:Boolean, isActuallyContainedInHeader:Boolean):String
@@ -248,16 +312,18 @@ package spark.components.gridClasses {
+ (shouldBeContainedInHeader ? "within " : "outside ") + "the header bounds"
+ " but was mistakenly found to be "
+ (isActuallyContainedInHeader ? "within" : "outside")
+ + " given a horizontalScrollPosition of " + getCurrentHScrollPosition()
+ "\n DEBUG INFO: header rectangle=" + entireHeaderRectangle;
}
- private function getHeaderViewContainsPointErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, shouldBeContainedInAHeaderView:Boolean, isActuallyContainedByAHeaderView:Boolean):String
+ private function getHeaderViewContainsPointErrorMessage(pointName:String, direction:Matrix, transformedPoint:Point, shouldBeContainedInAHeaderView:Boolean, isActuallyContainedByAHeaderView:Boolean, visibleHeaderViewRectangle:Rectangle):String
{
return "The point " + pointName + " transformed with Matrix " + direction + " (resulting in " + transformedPoint + ") should be "
+ (shouldBeContainedInAHeaderView ? "within " : "outside ") + "a header view"
+ " but was mistakenly found to be "
+ (isActuallyContainedByAHeaderView ? "within" : "outside")
- + "\n DEBUG INFO: header views=" + fixedHeaderViewRectangle + "; " + mainHeaderViewRectangle;
+ + " given a horizontalScrollPosition of " + getCurrentHScrollPosition()
+ + "\n DEBUG INFO: rectangles of visible header views = " + fixedHeaderViewRectangle + "; " + visibleHeaderViewRectangle;
}
private function getHeaderIndexAtGlobalPoint(globalPoint:Point):int
@@ -282,19 +348,19 @@ package spark.components.gridClasses {
return rectangleContainsPoint(fixedHeaderViewRectangle, point);
}
- private function getMainHeaderViewContainsPointAssumption(point:Point):Boolean
+ private function getMainHeaderViewContainsPointAssumption(visibleHeaderViewRectangle:Rectangle, point:Point):Boolean
{
- return rectangleContainsPoint(mainHeaderViewRectangle, point);
+ return rectangleContainsPoint(visibleHeaderViewRectangle, point);
}
- private function getHeaderIndexAssumption(point:Point):int
+ private function getHeaderIndexAssumption(point:Point, visibleColumnHeaderRectangles:Array):int
{
- return getIndexOfRectangleWhichContainsPoint(point, columnHeaderRectangles);
+ return getIndexOfRectangleWhichContainsPoint(point, visibleColumnHeaderRectangles);
}
- private function getColumnIndexAssumption(point:Point):int
+ private function getColumnIndexAssumption(visibleColumnRectangles:Array, point:Point):int
{
- return getIndexOfRectangleWhichContainsPoint(point, columnRectangles);
+ return getIndexOfRectangleWhichContainsPoint(point, visibleColumnRectangles);
}
private function getIndexOfRectangleWhichContainsPoint(point:Point, rectangles:Array):int
@@ -318,22 +384,21 @@ package spark.components.gridClasses {
return direction.transformPoint(point);
}
- private function generateKeyPoints(dimensions:Array, grid:DataGrid):Array
+ private function generateKeyPoints(grid:DataGrid):Array
{
var keyPoints:Array = [];
- //TODO this code does not yet account for horizontal scrolling!
keyPoints["a"] = new Point(0, 0);
- keyPoints["b0"] = new Point(getX(dimensions), getY(dimensions));
- generateColumnIntermediates(keyPoints, dimensions, "b0");
- keyPoints["c0"] = new Point(getX(dimensions) + getHeaderPaddingLeft(dimensions), getY(dimensions));
- generateColumnIntermediates(keyPoints, dimensions, "c0");
- keyPoints["d"] = new Point(getX(dimensions) + getWidth(dimensions), getY(dimensions));
- keyPoints["e"] = new Point(Point(keyPoints["c0"]).x, getY(dimensions) + getHeaderPaddingTop(dimensions));
- keyPoints["f"] = new Point(Point(keyPoints["c0"]).x, getY(dimensions) + getActualHeaderHeight(grid) - getHeaderPaddingBottom(dimensions));
- keyPoints["g0"] = new Point(getX(dimensions), getY(dimensions) + getActualHeaderHeight(grid));
- generateColumnIntermediates(keyPoints, dimensions, "g0");
- keyPoints["i"] = new Point(getX(dimensions) + getWidth(dimensions), Point(keyPoints["g0"]).y);
+ keyPoints["b0"] = new Point(getX(_dimensions), getY(_dimensions));
+ generateColumnIntermediates(keyPoints, _dimensions, "b0");
+ keyPoints["c0"] = new Point(getX(_dimensions) + getHeaderPaddingLeft(_dimensions), getY(_dimensions));
+ generateColumnIntermediates(keyPoints, _dimensions, "c0");
+ keyPoints["d"] = new Point(getX(_dimensions) + getWidth(_dimensions), getY(_dimensions));
+ keyPoints["e"] = new Point(Point(keyPoints["c0"]).x, getY(_dimensions) + getHeaderPaddingTop(_dimensions));
+ keyPoints["f"] = new Point(Point(keyPoints["c0"]).x, getY(_dimensions) + getActualHeaderHeight(grid) - getHeaderPaddingBottom(_dimensions));
+ keyPoints["g0"] = new Point(getX(_dimensions), getY(_dimensions) + getActualHeaderHeight(grid));
+ generateColumnIntermediates(keyPoints, _dimensions, "g0");
+ keyPoints["i"] = new Point(getX(_dimensions) + getWidth(_dimensions), Point(keyPoints["g0"]).y);
return keyPoints;
}
@@ -350,119 +415,128 @@ package spark.components.gridClasses {
}
}
- private function generateKeyRectangles(keyPoints:Array, dimensions:Array):Array
+ private function generateKeyRectangles():Array
{
var keyRectangles:Array = [];
- keyRectangles[COLUMN_HEADER_RECTANGLES] = generateHeaderColumnRectangles(keyPoints, dimensions);
- keyRectangles[COLUMN_RECTANGLES] = generateColumnRectangles(keyPoints, dimensions);
- keyRectangles[ENTIRE_HEADER_RECTANGLE] = generateVisibleHeaderRectangle(keyPoints, dimensions);
- keyRectangles[MAIN_HEADER_VIEW_RECTANGLE] = generateMainHeaderViewRectangle(keyPoints, dimensions);
- keyRectangles[FIXED_HEADER_VIEW_RECTANGLE] = generateFixedHeaderViewRectangle(keyPoints, dimensions);
+ keyRectangles[ENTIRE_HEADER_RECTANGLE] = generateVisibleHeaderRectangle();
+ keyRectangles[FIXED_HEADER_VIEW_RECTANGLE] = generateFixedHeaderViewRectangle();
return keyRectangles;
}
- private function generateMainHeaderViewRectangle(keyPoints:Array, dimensions:Array):Rectangle
+ private function generateFixedHeaderViewRectangle():Rectangle
{
//this is the GridColumnHeaderGroup.centerGridColumnHeaderView, which is holds the non-fixed columns; padding excluded
- const topLeftCorner:Point = keyPoints["e"];
- return new Rectangle(topLeftCorner.x, topLeftCorner.y,
- getHeaderWidthFromKeyPoints(keyPoints) - getHeaderPaddingLeft(dimensions),
- getHeaderHeightFromKeyPoints(keyPoints) - getHeaderPaddingTop(dimensions) - getHeaderPaddingBottom(dimensions));
- }
-
- private function generateFixedHeaderViewRectangle(keyPoints:Array, dimensions:Array):Rectangle
- {
- //this is the GridColumnHeaderGroup.centerGridColumnHeaderView, which is holds the non-fixed columns; padding excluded
- const topLeftCorner:Point = keyPoints["e"];
+ const topLeftCorner:Point = _keyPoints["e"];
return new Rectangle(topLeftCorner.x, topLeftCorner.y, 0, 0);
}
- private function generateVisibleHeaderRectangle(keyPoints:Array, dimensions:Array):Rectangle
+ private function generateVisibleHeaderRectangle():Rectangle
{
- const topLeftCorner:Point = keyPoints["b0"];
- const bottomRightCorner:Point = keyPoints["i"];
+ const topLeftCorner:Point = _keyPoints["b0"];
+ const bottomRightCorner:Point = _keyPoints["i"];
return new Rectangle(topLeftCorner.x, topLeftCorner.y, bottomRightCorner.x - topLeftCorner.x, bottomRightCorner.y - topLeftCorner.y);
}
- private function generateHeaderColumnRectangles(keyPoints:Array, dimensions:Array):Array
+
+ private function getActualHeaderHeight(grid:DataGrid):Number
{
- var headerRectangles:Array = [];
+ //Note that we're assuming the grid is on stage and validated by this point!
+ return grid.columnHeaderGroup.height;
+ }
- const headerPaddingTop:Number = getHeaderPaddingTop(dimensions);
- const headerPaddingBottom:Number = getHeaderPaddingBottom(dimensions);
- const headerHeight:Number = getHeaderHeightFromKeyPoints(keyPoints) - headerPaddingTop - headerPaddingBottom;
- for (var i:int = 0; i < getColumnWidths(dimensions).length; i++)
- {
- var topLeft:Point = keyPoints["c" + i];
- var topRight:Point = keyPoints["c" + (i+1)];
- headerRectangles.push(new Rectangle(topLeft.x, topLeft.y + headerPaddingTop, topRight.x - topLeft.x, headerHeight));
- }
+ private function getCurrentHScrollPosition():Number
+ {
+ return _dataGrid.grid.horizontalScrollPosition;
+ }
- //correct last header rectangle to extend to grid boundaries. This is one of the issues which prompted
- //this unit test in the first place.
- var lastHeaderRectangle:Rectangle = headerRectangles[headerRectangles.length - 1];
- lastHeaderRectangle.width = Point(keyPoints["d"]).x - lastHeaderRectangle.x;
- return headerRectangles;
+ private function getVisibleHeaderViewRectangle(hScrollPosition:Number = 0):Rectangle
+ {
+ //this is the GridColumnHeaderGroup.centerGridColumnHeaderView, which holds the non-fixed columns; padding excluded
+ const topLeftCorner:Point = _keyPoints["e"];
+ return new Rectangle(topLeftCorner.x, topLeftCorner.y,
+ getHeaderWidthFromKeyPoints(_keyPoints) - getHeaderPaddingLeft(_dimensions),
+ getHeaderHeightFromKeyPoints(_keyPoints) - getHeaderPaddingTop(_dimensions) - getHeaderPaddingBottom(_dimensions));
}
- //Note that the height and y of the rectangles doesn't matter until FLEX-35280 is fixed
- private function generateColumnRectangles(keyPoints:Array, dimensions:Array):Array
+ private function getVisibleColumnHeaderRectangles(hScrollPosition:Number = 0):Array
{
- var columnRectangles:Array = [];
+ var headerRectangles:Array = [];
- for (var i:int = 0; i < getColumnWidths(dimensions).length; i++)
+ const headerPaddingTop:Number = getHeaderPaddingTop(_dimensions);
+ const headerPaddingBottom:Number = getHeaderPaddingBottom(_dimensions);
+ const headerHeight:Number = getHeaderHeightFromKeyPoints(_keyPoints) - headerPaddingTop - headerPaddingBottom;
+ const numColumns:uint = getColumnWidths(_dimensions).length;
+ const headerPaddingLeft:Number = getHeaderPaddingLeft(_dimensions);
+ const headerWidth:Number = getWidth(_dimensions) - headerPaddingLeft;
+ const e:Point = _keyPoints["e"];
+ const visibleRectangle:Rectangle = new Rectangle(e.x, e.y, headerWidth, 100);
+ var totalColumnWidths:Number = getTotalColumnWidths(_dimensions);
+ var columnHeaderY:Number = NaN;
+
+ //create the header rectangles from the first visible point on the left until the end
+ for (var i:int = 0; i < numColumns; i++)
{
- var topLeft:Point = keyPoints["g" + i];
- var topRight:Point = keyPoints["g" + (i+1)];
- columnRectangles.push(new Rectangle(topLeft.x, -10000, topRight.x - topLeft.x, Number.MAX_VALUE));
- }
+ var topLeft:Point = _keyPoints["c" + i];
+ var topRight:Point = _keyPoints["c" + (i+1)];
+ var topLeftX:Number = topLeft.x - hScrollPosition;
+ var topRightX:Number = topRight.x - hScrollPosition;
- return columnRectangles;
- }
+ if(isNaN(columnHeaderY))
+ columnHeaderY = topLeft.y + headerPaddingTop;
- private function forEachPoint(assertThat_:Function):void
- {
- for (var pointName:String in _keyPoints)
- {
- for (var i:int = 0; i < directions.length; i++)
+ var endsBeforeVisibleRectangle:Boolean = topRightX < visibleRectangle.x;
+ var startsAfterVisibleRectangle:Boolean = topLeftX >= visibleRectangle.x + visibleRectangle.width;
+
+ if(!(endsBeforeVisibleRectangle || startsAfterVisibleRectangle))
{
- assertThat_(getAdjacentPoint(_keyPoints[pointName], directions[i]), pointName, directions[i]);
+ const startingX:Number = Math.max(topLeftX, visibleRectangle.x);
+ const rightEdge:Number = Math.min(topRightX, visibleRectangle.x + visibleRectangle.width);
+ const width:Number = rightEdge - startingX;
+ headerRectangles.push(new Rectangle(startingX, columnHeaderY, width, headerHeight));
}
}
- }
+ assertThat("no example has 0 columns, so we expect this Array to have at least one item.", headerRectangles.length > 0);
- private function getActualHeaderHeight(grid:DataGrid):Number
- {
- //Note that we're assuming the grid is on stage and validated by this point!
- return grid.columnHeaderGroup.height;
+ //correct last header rectangle to extend to grid boundaries if the total width of all the columns is smaller
+ //than the grid's width. It is one of the issues which prompted this unit test in the first place.
+ if(totalColumnWidths <= headerWidth)
+ {
+ var lastHeaderRectangle:Rectangle = headerRectangles[headerRectangles.length - 1];
+ lastHeaderRectangle.width = Point(_keyPoints["d"]).x - lastHeaderRectangle.x;
+ }
+
+ return headerRectangles;
}
- /* key rectangles getters */
- private function get columnHeaderRectangles():Array
+ //Note that the height and y of the rectangles needs to be all-encompassing until FLEX-35280 is fixed
+ private function getAllColumnRectangles(hScrollPosition:Number = 0):Array
{
- return _keyRectangles[COLUMN_HEADER_RECTANGLES];
- }
+ var columnRectangles:Array = [];
+ const numColumns:uint = getColumnWidths(_dimensions).length;
- private function get columnRectangles():Array
- {
- return _keyRectangles[COLUMN_RECTANGLES];
+ for (var i:int = 0; i < numColumns; i++)
+ {
+ var topLeft:Point = _keyPoints["g" + i];
+ var topRight:Point = _keyPoints["g" + (i+1)];
+
+ columnRectangles.push(new Rectangle(topLeft.x, -10000, topRight.x - topLeft.x, Number.MAX_VALUE));
+ }
+
+ return columnRectangles;
}
+ /* key rectangles getters */
+
private function get entireHeaderRectangle():Rectangle //includes padding
{
return _keyRectangles[ENTIRE_HEADER_RECTANGLE] as Rectangle;
}
- private function get mainHeaderViewRectangle():Rectangle
- {
- return _keyRectangles[MAIN_HEADER_VIEW_RECTANGLE] as Rectangle;
- }
-
private function get fixedHeaderViewRectangle():Rectangle
{
return _keyRectangles[FIXED_HEADER_VIEW_RECTANGLE] as Rectangle;
@@ -536,6 +610,15 @@ package spark.components.gridClasses {
}
+ private function onEnterFrame(event:Event):void
+ {
+ if(!--_noEnterFramesRemaining)
+ {
+ UIImpersonator.testDisplay.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+ _finishNotifier.dispatchEvent(new Event(Event.COMPLETE));
+ }
+ }
+
private function get _sut():GridColumnHeaderGroup
{
return _dataGrid.columnHeaderGroup;