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 2015/05/22 19:02:22 UTC
[10/10] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
'FLEX-34837' into develop
Merge branch 'FLEX-34837' into develop
Conflicts:
frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e80b203f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e80b203f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e80b203f
Branch: refs/heads/develop
Commit: e80b203f3ed74ef706d796d20f0eca0f46ba2cc9
Parents: ab0805a 9c40493
Author: Mihai Chira <mi...@apache.org>
Authored: Fri May 22 18:55:38 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Fri May 22 18:55:38 2015 +0200
----------------------------------------------------------------------
frameworks/build.xml | 4 +
frameworks/projects/framework/build.xml | 6 +
.../src/mx/binding/utils/BindingUtils.as | 4 +-
.../src/mx/binding/utils/ChangeWatcher.as | 2 +-
.../framework/src/mx/collections/ISort.as | 2 +-
.../src/mx/collections/ListCollectionView.as | 2 +-
.../framework/src/mx/collections/SortField.as | 21 +-
.../ListCollectionView_FLEX_34837_Tests.as | 132 +++++-
.../tests/ListCollectionView_Sort_Tests.as | 471 +++++++++++++++++++
9 files changed, 608 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e80b203f/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
----------------------------------------------------------------------
diff --cc frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
index 5ef19fb,2ebf97f..f11e906
--- a/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
+++ b/frameworks/projects/framework/tests/ListCollectionView_FLEX_34837_Tests.as
@@@ -89,20 -162,39 +162,39 @@@ package
_sut.removeItemAt(_sut.getItemIndex(newItem)); //if the bug is present, this will throw an RTE
}
- private function generateObjects(no:int):IList
+ private function assertIndexesAre(indexes:Array):void
{
- var result:ArrayList = new ArrayList();
+ assertEquals(indexes.length, _sut.length);
+
+ for(var i:int = 0; i < _sut.length; i++)
+ {
+ assertEquals(ListCollectionView_FLEX_34837_VO(_sut.getItemAt(i)).index, indexes[i]);
+ }
+ }
+
+
+ private static function generateVOs(no:int, reverse:Boolean = false):IList
+ {
+ return generateObjects(no, reverse, generateOneObject);
+ }
+
+ private static function generateObjects(no:int, reverse:Boolean, generator:Function):IList
+ {
+ var result:Array = [];
for(var i:int = 0; i < no; i++)
{
- result.addItem(generateOneObject(i));
+ result.push(generator(i));
}
- return result;
+ if(reverse)
+ result.reverse();
+
+ return new ArrayList(result);
}
- private static function generateOneObject(i:int):ListCollectionView_FLEX_34837_VO
- private static function generateOneObject(index:Number):ListCollectionView_FLEX_34837_VO
++ private static function generateOneObject(i:Number):ListCollectionView_FLEX_34837_VO
{
- return new ListCollectionView_FLEX_34837_VO("Object"+i, "Street"+i);
- return new ListCollectionView_FLEX_34837_VO(index, "Object", "Street");
++ return new ListCollectionView_FLEX_34837_VO(i, "Object"+i, "Street"+i);
}
}
}