FLEX-35037 Swapping arguments in asserts, to get better error messages. (No changes in test results.)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a0006003 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a0006003 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a0006003 Branch: refs/heads/develop Commit: a0006003c0ea348c0e98c0faf3ff87204f6f746e Parents: 1773814 Author: Mihai Chira <[email protected]> Authored: Mon Feb 22 19:01:42 2016 +0100 Committer: Mihai Chira <[email protected]> Committed: Mon Feb 22 19:01:42 2016 +0100 ---------------------------------------------------------------------- .../tests/mx/collections/AddRemoveNumbers.as | 58 +++---- .../tests/mx/collections/AddRemoveObjects.as | 96 ++++++------ .../tests/mx/collections/AddRemoveStrings.as | 38 ++--- .../tests/mx/collections/FilerAndSortNumbers.as | 52 +++---- .../tests/mx/collections/FilerAndSortStrings.as | 52 +++---- .../tests/mx/collections/FilterNumbers.as | 98 ++++++------ .../tests/mx/collections/FilterStrings.as | 152 +++++++++---------- .../tests/mx/collections/SortNumbers.as | 82 +++++----- .../tests/mx/collections/SortStrings.as | 144 +++++++++--------- 9 files changed, 386 insertions(+), 386 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/AddRemoveNumbers.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/AddRemoveNumbers.as b/frameworks/projects/framework/tests/mx/collections/AddRemoveNumbers.as index 9269d7e..efd43f5 100644 --- a/frameworks/projects/framework/tests/mx/collections/AddRemoveNumbers.as +++ b/frameworks/projects/framework/tests/mx/collections/AddRemoveNumbers.as @@ -46,11 +46,11 @@ package mx.collections { public function addNumbers():void { _sut.addItem(1); - assertEquals("Length is not one", _sut.length, 1); - assertEquals("First element not correct", _sut[0], 1); + assertEquals("Length is not one", 1, _sut.length); + assertEquals("First element not correct", 1, _sut[0]); _sut.addItem(2); - assertEquals("Length is not two", _sut.length, 2); - assertEquals("Second element not correct", _sut[1], 2); + assertEquals("Length is not two", 2, _sut.length); + assertEquals("Second element not correct", 2, _sut[1]); } [Test] @@ -58,10 +58,10 @@ package mx.collections { { addNumbers(); _sut.addItem(1); - assertEquals("Length is not three", _sut.length, 3); - assertEquals("First element not correct", _sut[0], 1); - assertEquals("Second element not correct", _sut[1], 2); - assertEquals("Second element not correct", _sut[2], 1); + assertEquals("Length is not three", 3, _sut.length); + assertEquals("First element not correct", 1, _sut[0]); + assertEquals("Second element not correct", 2, _sut[1]); + assertEquals("Second element not correct", 1, _sut[2]); } [Test] @@ -70,9 +70,9 @@ package mx.collections { addNumbers(); _sut.addItem(1); _sut.removeItemAt(0); - assertEquals("Length is not two", _sut.length, 2); - assertEquals("First element not correct", _sut[0], 2); - assertEquals("Second element not correct", _sut[1], 1); + assertEquals("Length is not two", 2, _sut.length); + assertEquals("First element not correct", 2, _sut[0]); + assertEquals("Second element not correct", 1, _sut[1]); } [Test] @@ -80,7 +80,7 @@ package mx.collections { { addNumbers(); _sut.removeAll(); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -88,10 +88,10 @@ package mx.collections { { addNumbers(); _sut.removeItemAt(0); - assertEquals("First element not correct", _sut[0], 2); - assertEquals("Length is not one", _sut.length, 1); + assertEquals("First element not correct", 2, _sut[0]); + assertEquals("Length is not one", 1, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -99,10 +99,10 @@ package mx.collections { { addNumbers(); _sut.removeItemAt(1); - assertEquals("First element not correct", _sut[0], 1); - assertEquals("Length is not one", _sut.length, 1); + assertEquals("First element not correct", 1, _sut[0]); + assertEquals("Length is not one", 1, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -110,10 +110,10 @@ package mx.collections { { addNumbers(); _sut.removeItemAt(_sut.getItemIndex(1)); - assertEquals("First element not correct", _sut[0], 2); - assertEquals("Length is not one", _sut.length, 1); + assertEquals("First element not correct", 2, _sut[0]); + assertEquals("Length is not one", 1, _sut.length); _sut.removeItemAt(_sut.getItemIndex(2)); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -127,7 +127,7 @@ package mx.collections { { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); try { _sut.removeItemAt(10); } @@ -135,7 +135,7 @@ package mx.collections { { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); } [Test] @@ -149,9 +149,9 @@ package mx.collections { _sut.setItemAt(item2,0); _sut.setItemAt(item1,1); - assertEquals("Length is not two", _sut.length, 2); - assertEquals("First element not correct", _sut[0], 2); - assertEquals("Second element not correct", _sut[1], 1); + assertEquals("Length is not two", 2, _sut.length); + assertEquals("First element not correct", 2, _sut[0]); + assertEquals("Second element not correct", 1, _sut[1]); } [Test] @@ -165,9 +165,9 @@ package mx.collections { _sut.setItemAt(item1,1); _sut.setItemAt(item2,0); - assertEquals("Length is not two", _sut.length, 2); - assertEquals("First element not correct", _sut[0], 2); - assertEquals("Second element not correct", _sut[1], 1); + assertEquals("Length is not two", 2, _sut.length); + assertEquals("First element not correct", 2, _sut[0]); + assertEquals("Second element not correct", 1, _sut[1]); } } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/AddRemoveObjects.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/AddRemoveObjects.as b/frameworks/projects/framework/tests/mx/collections/AddRemoveObjects.as index 45797fb..69817d4 100644 --- a/frameworks/projects/framework/tests/mx/collections/AddRemoveObjects.as +++ b/frameworks/projects/framework/tests/mx/collections/AddRemoveObjects.as @@ -55,14 +55,14 @@ package mx.collections { public function addObjects():void { _sut = new ArrayCollection(players); - assertEquals("Length is not seven", _sut.length, 7); - assertEquals("First element not correct", _sut[0], players[0]); - assertEquals("Second element not correct", _sut[1], players[1]); - assertEquals("Third element not correct", _sut[2], players[2]); - assertEquals("Fouth element not correct", _sut[3], players[3]); - assertEquals("Fifth element not correct", _sut[4], players[4]); - assertEquals("Sixth element not correct", _sut[5], players[5]); - assertEquals("Seventh element not correct", _sut[6], players[6]); + assertEquals("Length is not seven", 7, _sut.length); + assertEquals("First element not correct", players[0], _sut[0]); + assertEquals("Second element not correct", players[1], _sut[1]); + assertEquals("Third element not correct", players[2], _sut[2]); + assertEquals("Fouth element not correct", players[3], _sut[3]); + assertEquals("Fifth element not correct", players[4], _sut[4]); + assertEquals("Sixth element not correct", players[5], _sut[5]); + assertEquals("Seventh element not correct", players[6], _sut[6]); } [Test] @@ -70,15 +70,15 @@ package mx.collections { { addObjects(); _sut.addItem(players[0]); - assertEquals("Length is not eight", _sut.length, 8); - assertEquals("First element not correct", _sut[0], players[0]); - assertEquals("Second element not correct", _sut[1], players[1]); - assertEquals("Third element not correct", _sut[2], players[2]); - assertEquals("Fouth element not correct", _sut[3], players[3]); - assertEquals("Fifth element not correct", _sut[4], players[4]); - assertEquals("Sixth element not correct", _sut[5], players[5]); - assertEquals("Seventh element not correct", _sut[6], players[6]); - assertEquals("Eighth element not correct", _sut[7], players[0]); + assertEquals("Length is not eight", 8, _sut.length); + assertEquals("First element not correct", players[0], _sut[0]); + assertEquals("Second element not correct", players[1], _sut[1]); + assertEquals("Third element not correct", players[2], _sut[2]); + assertEquals("Fouth element not correct", players[3], _sut[3]); + assertEquals("Fifth element not correct", players[4], _sut[4]); + assertEquals("Sixth element not correct", players[5], _sut[5]); + assertEquals("Seventh element not correct", players[6], _sut[6]); + assertEquals("Eighth element not correct", players[0], _sut[7]); } [Test] @@ -98,14 +98,14 @@ package mx.collections { _sut.addItem(players[0]); _sut.removeItemAt(0); //then - assertEquals("Length is not seven", _sut.length, 7); - assertEquals("First element not correct", _sut[0], secondPlayer); - assertEquals("Second element not correct", _sut[1], thirdPlayer); - assertEquals("Third element not correct", _sut[2], fourthPlayer); - assertEquals("Fourth element not correct", _sut[3], fifthPlayer); - assertEquals("Fifth element not correct", _sut[4], sixthPlayer); - assertEquals("Sixth element not correct", _sut[5], seventhPlayer); - assertEquals("Seventh element not correct", _sut[6], firstPlayer); + assertEquals("Length is not seven", 7, _sut.length); + assertEquals("First element not correct", secondPlayer, _sut[0]); + assertEquals("Second element not correct", thirdPlayer, _sut[1]); + assertEquals("Third element not correct", fourthPlayer, _sut[2]); + assertEquals("Fourth element not correct", fifthPlayer, _sut[3]); + assertEquals("Fifth element not correct", sixthPlayer, _sut[4]); + assertEquals("Sixth element not correct", seventhPlayer, _sut[5]); + assertEquals("Seventh element not correct", firstPlayer, _sut[6]); } [Test] @@ -113,7 +113,7 @@ package mx.collections { { addObjects(); _sut.removeAll(); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -133,32 +133,32 @@ package mx.collections { //when _sut.removeItemAt(0); //then - assertEquals("Length is not five", _sut.length, 5); + assertEquals("Length is not five", 5, _sut.length); //when _sut.removeItemAt(0); //then - assertEquals("Length is not four", _sut.length, 4); + assertEquals("Length is not four", 4, _sut.length); //when _sut.removeItemAt(0); //then - assertEquals("Length is not three", _sut.length, 3); + assertEquals("Length is not three", 3, _sut.length); //when _sut.removeItemAt(0); //then - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); //when _sut.removeItemAt(0); //then - assertEquals("Length is not one", _sut.length, 1); + assertEquals("Length is not one", 1, _sut.length); //when _sut.removeItemAt(0); //then - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -166,20 +166,20 @@ package mx.collections { { addObjects(); _sut.removeItemAt(6); - assertEquals("First element not correct", _sut[0], players[0]); - assertEquals("Length is not six", _sut.length, 6); + assertEquals("First element not correct", players[0], _sut[0]); + assertEquals("Length is not six", 6, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not five", _sut.length, 5); + assertEquals("Length is not five", 5, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not four", _sut.length, 4); + assertEquals("Length is not four", 4, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not three", _sut.length, 3); + assertEquals("Length is not three", 3, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not one", _sut.length, 1); + assertEquals("Length is not one", 1, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -218,7 +218,7 @@ package mx.collections { { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not seven", _sut.length, 7); + assertEquals("Length is not seven", 7, _sut.length); try { _sut.removeItemAt(10); } @@ -226,7 +226,7 @@ package mx.collections { { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not seven", _sut.length, 7); + assertEquals("Length is not seven", 7, _sut.length); } [Test] @@ -244,9 +244,9 @@ package mx.collections { _sut.setItemAt(item1,1); //then - assertEquals("Length is not seven", _sut.length, 7); - assertEquals("First element not correct", _sut[0], secondPlayer); - assertEquals("Second element not correct", _sut[1], firstPlayer); + assertEquals("Length is not seven", 7, _sut.length); + assertEquals("First element not correct", secondPlayer, _sut[0]); + assertEquals("Second element not correct", firstPlayer, _sut[1]); } [Test] @@ -264,9 +264,9 @@ package mx.collections { _sut.setItemAt(item2,0); //then - assertEquals("Length is not seven", _sut.length, 7); - assertEquals("First element not correct", _sut[0], secondPlayer); - assertEquals("Second element not correct", _sut[1], firstPlayer); + assertEquals("Length is not seven", 7, _sut.length); + assertEquals("First element not correct", secondPlayer, _sut[0]); + assertEquals("Second element not correct", firstPlayer, _sut[1]); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/AddRemoveStrings.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/AddRemoveStrings.as b/frameworks/projects/framework/tests/mx/collections/AddRemoveStrings.as index b63ff7e..d6bdc53 100644 --- a/frameworks/projects/framework/tests/mx/collections/AddRemoveStrings.as +++ b/frameworks/projects/framework/tests/mx/collections/AddRemoveStrings.as @@ -91,10 +91,10 @@ package mx.collections { //then assertEquals("Length is not four", 4, _sut.length); - assertEquals("First element not correct", _sut[0], "A"); - assertEquals("Second element not correct", _sut[1], "D"); - assertEquals("Second element not correct", _sut[2], "C"); - assertEquals("Second element not correct", _sut[3], "B"); + assertEquals("First element not correct", "A", _sut[0]); + assertEquals("Second element not correct", "D", _sut[1]); + assertEquals("Second element not correct", "C", _sut[2]); + assertEquals("Second element not correct", "B", _sut[3]); } [Test] @@ -102,7 +102,7 @@ package mx.collections { { addStrings(); _sut.removeAll(); - assertEquals("Length is not zero", _sut.length, 0); + assertEquals("Length is not zero", 0, _sut.length); } [Test] @@ -110,10 +110,10 @@ package mx.collections { { addStrings(); _sut.removeItemAt(0); - assertEquals("First element not correct", _sut[0], "B"); - assertEquals("Length is not three", _sut.length, 3); + assertEquals("First element not correct", "B", _sut[0]); + assertEquals("Length is not three", 3, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); } [Test] @@ -121,10 +121,10 @@ package mx.collections { { addStrings(); _sut.removeItemAt(1); - assertEquals("First element not correct", _sut[0], "A"); - assertEquals("Length is not three", _sut.length, 3); + assertEquals("First element not correct", "A", _sut[0]); + assertEquals("Length is not three", 3, _sut.length); _sut.removeItemAt(0); - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); } [Test] @@ -132,10 +132,10 @@ package mx.collections { { addStrings(); _sut.removeItemAt(_sut.getItemIndex("B")); - assertEquals("First element not correct", _sut[0], "A"); - assertEquals("Length is not three", _sut.length, 3); + assertEquals("First element not correct", "A", _sut[0]); + assertEquals("Length is not three", 3, _sut.length); _sut.removeItemAt(_sut.getItemIndex("D")); - assertEquals("Length is not two", _sut.length, 2); + assertEquals("Length is not two", 2, _sut.length); } [Test] @@ -173,9 +173,9 @@ package mx.collections { _sut.setItemAt(item1, 1); //then - assertEquals("Length is not four", _sut.length, 4); - assertEquals("First element not correct", _sut[0], "B"); - assertEquals("Second element not correct", _sut[1], "A"); + assertEquals("Length is not four", 4, _sut.length); + assertEquals("First element not correct", "B", _sut[0]); + assertEquals("Second element not correct", "A", _sut[1]); } [Test] @@ -192,8 +192,8 @@ package mx.collections { //then assertEquals("Length is not four", 4, _sut.length); - assertEquals("First element not correct", _sut[0], "B"); - assertEquals("Second element not correct", _sut[1], "A"); + assertEquals("First element not correct", "B", _sut[0]); + assertEquals("Second element not correct", "A", _sut[1]); } } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/FilerAndSortNumbers.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/FilerAndSortNumbers.as b/frameworks/projects/framework/tests/mx/collections/FilerAndSortNumbers.as index 8adac2c..46a1613 100644 --- a/frameworks/projects/framework/tests/mx/collections/FilerAndSortNumbers.as +++ b/frameworks/projects/framework/tests/mx/collections/FilerAndSortNumbers.as @@ -65,49 +65,49 @@ package mx.collections { ac.sort = new Sort(); ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 4); - assertEquals("Third element not correct", ac[2], 6); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 4, ac[1]); + assertEquals("Third element not correct", 6, ac[2]); ac.filterFunction = odd; ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 3); - assertEquals("Third element not correct", ac[2], 5); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 3, ac[1]); + assertEquals("Third element not correct", 5, ac[2]); ac.sort = new Sort(); ac.sort.fields = [new SortField(null, false, true, true)]; ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 5); - assertEquals("Second element not correct", ac[1], 3); - assertEquals("Third element not correct", ac[2], 1); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 5, ac[0]); + assertEquals("Second element not correct", 3, ac[1]); + assertEquals("Third element not correct", 1, ac[2]); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not six", ac.length, 6); - assertEquals("First element not correct", ac[0], 6); - assertEquals("Second element not correct", ac[1], 5); - assertEquals("Third element not correct", ac[2], 4); - assertEquals("Fourth element not correct", ac[3], 3); - assertEquals("Fith element not correct", ac[4], 2); - assertEquals("Six element not correct", ac[5], 1); + assertEquals("Length is not six", 6, ac.length); + assertEquals("First element not correct", 6, ac[0]); + assertEquals("Second element not correct", 5, ac[1]); + assertEquals("Third element not correct", 4, ac[2]); + assertEquals("Fourth element not correct", 3, ac[3]); + assertEquals("Fith element not correct", 2, ac[4]); + assertEquals("Six element not correct", 1, ac[5]); ac.sort = null; ac.refresh(); - assertEquals("Length is not six", ac.length, 6); - assertEquals("First element not correct", ac[0], 6); - assertEquals("Second element not correct", ac[1], 2); - assertEquals("Third element not correct", ac[2], 3); - assertEquals("Fourth element not correct", ac[3], 1); - assertEquals("Fith element not correct", ac[4], 5); - assertEquals("Six element not correct", ac[5], 4); + assertEquals("Length is not six", 6, ac.length); + assertEquals("First element not correct", 6, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); + assertEquals("Third element not correct", 3, ac[2]); + assertEquals("Fourth element not correct", 1, ac[3]); + assertEquals("Fith element not correct", 5, ac[4]); + assertEquals("Six element not correct", 4, ac[5]); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/FilerAndSortStrings.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/FilerAndSortStrings.as b/frameworks/projects/framework/tests/mx/collections/FilerAndSortStrings.as index 2fa4505..0de4b95 100644 --- a/frameworks/projects/framework/tests/mx/collections/FilerAndSortStrings.as +++ b/frameworks/projects/framework/tests/mx/collections/FilerAndSortStrings.as @@ -65,49 +65,49 @@ package mx.collections { ac.sort = new Sort(); ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 4); - assertEquals("Third element not correct", ac[2], 6); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 4, ac[1]); + assertEquals("Third element not correct", 6, ac[2]); ac.filterFunction = odd; ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 3); - assertEquals("Third element not correct", ac[2], 5); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 3, ac[1]); + assertEquals("Third element not correct", 5, ac[2]); ac.sort = new Sort(); ac.sort.fields = [new SortField(null, false, true, true)]; ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], 5); - assertEquals("Second element not correct", ac[1], 3); - assertEquals("Third element not correct", ac[2], 1); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", 5, ac[0]); + assertEquals("Second element not correct", 3, ac[1]); + assertEquals("Third element not correct", 1, ac[2]); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not six", ac.length, 6); - assertEquals("First element not correct", ac[0], 6); - assertEquals("Second element not correct", ac[1], 5); - assertEquals("Third element not correct", ac[2], 4); - assertEquals("Fourth element not correct", ac[3], 3); - assertEquals("Fith element not correct", ac[4], 2); - assertEquals("Six element not correct", ac[5], 1); + assertEquals("Length is not six", 6, ac.length); + assertEquals("First element not correct", 6, ac[0]); + assertEquals("Second element not correct", 5, ac[1]); + assertEquals("Third element not correct", 4, ac[2]); + assertEquals("Fourth element not correct", 3, ac[3]); + assertEquals("Fith element not correct", 2, ac[4]); + assertEquals("Six element not correct", 1, ac[5]); ac.sort = null; ac.refresh(); - assertEquals("Length is not six", ac.length, 6); - assertEquals("First element not correct", ac[0], 6); - assertEquals("Second element not correct", ac[1], 2); - assertEquals("Third element not correct", ac[2], 3); - assertEquals("Fourth element not correct", ac[3], 1); - assertEquals("Fith element not correct", ac[4], 5); - assertEquals("Six element not correct", ac[5], 4); + assertEquals("Length is not six", 6, ac.length); + assertEquals("First element not correct", 6, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); + assertEquals("Third element not correct", 3, ac[2]); + assertEquals("Fourth element not correct", 1, ac[3]); + assertEquals("Fith element not correct", 5, ac[4]); + assertEquals("Six element not correct", 4, ac[5]); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/FilterNumbers.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/FilterNumbers.as b/frameworks/projects/framework/tests/mx/collections/FilterNumbers.as index b74547c..8f27acc 100644 --- a/frameworks/projects/framework/tests/mx/collections/FilterNumbers.as +++ b/frameworks/projects/framework/tests/mx/collections/FilterNumbers.as @@ -64,9 +64,9 @@ package mx.collections { ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -76,9 +76,9 @@ package mx.collections { ac.filterFunction = allIn; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -88,7 +88,7 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not two", ac.length, 0); + assertEquals("Length is not two", 0, ac.length); } @@ -99,9 +99,9 @@ package mx.collections { ac.filterFunction = allOut; // Filter should not take effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -111,9 +111,9 @@ package mx.collections { ac.filterFunction = null; // Filter should not take effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -123,15 +123,15 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; ac.refresh(); // Filter should not take effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } // RTEs in Apache Flex 4.9.1 @@ -143,23 +143,23 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; addNumbers(); // Filter should be in effect and first 2 items sorted // item added after are not filtered until refresh called - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); - assertEquals("First element not correct", ac[2], 1); - assertEquals("Second element not correct", ac[3], 2); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); + assertEquals("First element not correct", 1, ac[2]); + assertEquals("Second element not correct", 2, ac[3]); } [Test] @@ -171,7 +171,7 @@ package mx.collections { ac.refresh(); ac.filterFunction = null; - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); try { ac.removeItemAt(0); @@ -181,10 +181,10 @@ package mx.collections { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.refresh(); - assertEquals("Length is not two", ac.length, 2); + assertEquals("Length is not two", 2, ac.length); } [Test] @@ -196,10 +196,10 @@ package mx.collections { ac.filterFunction = isOne; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); + assertEquals("Length is not two", 2, ac.length); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 1); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 1, ac[1]); } // Fails in Apache Flex 4.9.1 @@ -237,9 +237,9 @@ package mx.collections { ac.setItemAt(item1,1); ac.setItemAt(item2,0); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 1); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 1, ac[1]); } [Test] @@ -249,18 +249,18 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not two", ac.length, 0); + assertEquals("Length is not two", 0, ac.length); ac.removeAll(); - assertEquals("Length is not two", ac.length, 0); + assertEquals("Length is not two", 0, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -270,17 +270,17 @@ package mx.collections { ac.filterFunction = isOne; ac.refresh(); - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); ac.removeItemAt(ac.getItemIndex(1)); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not two", ac.length, 1); - assertEquals("First element not correct", ac[0], 2); + assertEquals("Length is not two", 1, ac.length); + assertEquals("First element not correct", 2, ac[0]); } [Test] @@ -290,7 +290,7 @@ package mx.collections { ac.filterFunction = isOne; ac.refresh(); - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); try { // not removed as filter hids it - perhaps it should be removed? @@ -301,14 +301,14 @@ package mx.collections { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("First element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("First element not correct", 2, ac[1]); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/FilterStrings.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/FilterStrings.as b/frameworks/projects/framework/tests/mx/collections/FilterStrings.as index 347b39b..7413421 100644 --- a/frameworks/projects/framework/tests/mx/collections/FilterStrings.as +++ b/frameworks/projects/framework/tests/mx/collections/FilterStrings.as @@ -66,11 +66,11 @@ package mx.collections { ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -80,11 +80,11 @@ package mx.collections { ac.filterFunction = allIn; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -94,7 +94,7 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); } @@ -105,11 +105,11 @@ package mx.collections { ac.filterFunction = allOut; // Filter should not take effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -119,11 +119,11 @@ package mx.collections { ac.filterFunction = null; // Filter should not take effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -133,17 +133,17 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; ac.refresh(); // Filter should not take effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } // RTEs in Apache Flex 4.9.1 @@ -155,29 +155,29 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; addStrings(); // Filter should be in effect and first 2 items sorted // item added after are not filtered until refresh called - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); ac.refresh(); - assertEquals("Length is not eight", ac.length, 8); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); - assertEquals("First element not correct", ac[4], "A"); - assertEquals("Second element not correct", ac[5], "B"); - assertEquals("Third element not correct", ac[6], "D"); - assertEquals("Four element not correct", ac[7], "C"); + assertEquals("Length is not eight", 8, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); + assertEquals("First element not correct", "A", ac[4]); + assertEquals("Second element not correct", "B", ac[5]); + assertEquals("Third element not correct", "D", ac[6]); + assertEquals("Four element not correct", "C", ac[7]); } [Test] @@ -189,7 +189,7 @@ package mx.collections { ac.refresh(); ac.filterFunction = null; - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); try { ac.removeItemAt(0); @@ -199,10 +199,10 @@ package mx.collections { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.refresh(); - assertEquals("Length is not four", ac.length, 4); + assertEquals("Length is not four", 4, ac.length); } [Test] @@ -214,10 +214,10 @@ package mx.collections { ac.filterFunction = isA; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); + assertEquals("Length is not two", 2, ac.length); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "A"); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "A", ac[1]); } // Fails in Apache Flex 4.9.1 @@ -237,11 +237,11 @@ package mx.collections { ac.setItemAt(item1,1); //then - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", "B", ac[0]); - assertEquals("Second element not correct", "A", ac[1]); - assertEquals("Third element not correct", "D", ac[2]); - assertEquals("Four element not correct", "C", ac[3]); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", ac[0], "B"); + assertEquals("Second element not correct", ac[1], "A"); + assertEquals("Third element not correct", ac[2], "D"); + assertEquals("Four element not correct", ac[3], "C"); } [Test] @@ -257,11 +257,11 @@ package mx.collections { ac.setItemAt(item1,1); ac.setItemAt(item2,0); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "B"); - assertEquals("Second element not correct", ac[1], "A"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "B", ac[0]); + assertEquals("Second element not correct", "A", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -271,20 +271,20 @@ package mx.collections { ac.filterFunction = allOut; ac.refresh(); - assertEquals("Length is not two", ac.length, 0); + assertEquals("Length is not two", 0, ac.length); ac.removeAll(); - assertEquals("Length is not two", ac.length, 0); + assertEquals("Length is not two", 0, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } [Test] @@ -294,17 +294,17 @@ package mx.collections { ac.filterFunction = isA; ac.refresh(); - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); ac.removeItemAt(ac.getItemIndex("A")); - assertEquals("Length is not zero", ac.length, 0); + assertEquals("Length is not zero", 0, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], "B"); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", "B", ac[0]); } [Test] @@ -314,7 +314,7 @@ package mx.collections { ac.filterFunction = isA; ac.refresh(); - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); try { // not removed as filter hids it - perhaps it should be removed? @@ -325,16 +325,16 @@ package mx.collections { assertTrue("Error not range error", error is RangeError); } - assertEquals("Length is not one", ac.length, 1); + assertEquals("Length is not one", 1, ac.length); ac.filterFunction = null; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("Third element not correct", ac[2], "D"); - assertEquals("Four element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("Third element not correct", "D", ac[2]); + assertEquals("Four element not correct", "C", ac[3]); } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/SortNumbers.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/SortNumbers.as b/frameworks/projects/framework/tests/mx/collections/SortNumbers.as index bc1be2a..73ed1fd 100644 --- a/frameworks/projects/framework/tests/mx/collections/SortNumbers.as +++ b/frameworks/projects/framework/tests/mx/collections/SortNumbers.as @@ -49,9 +49,9 @@ package mx.collections { ac.sort = null; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -61,9 +61,9 @@ package mx.collections { ac.sort = new Sort(); ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -75,9 +75,9 @@ package mx.collections { ac.sort = sort; ac.refresh(); - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 1); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 1, ac[1]); } [Test] @@ -89,9 +89,9 @@ package mx.collections { ac.sort = sort; // Short should not take effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -105,16 +105,16 @@ package mx.collections { ac.sort = null; // Sort should be in effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 1); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 1, ac[1]); ac.refresh(); // and back to original - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } [Test] @@ -129,9 +129,9 @@ package mx.collections { ac.refresh(); // Sort should not be in effect - assertEquals("Length is not two", ac.length, 2); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); + assertEquals("Length is not two", 2, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); } // RTEs in APache flex 4.9.1 @@ -149,20 +149,20 @@ package mx.collections { // Sort should be in effect and first 2 items sorted // item added after are not sorted - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 1); - assertEquals("Third element not correct", ac[2], 1); - assertEquals("Fourth element not correct", ac[3], 2); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 1, ac[1]); + assertEquals("Third element not correct", 1, ac[2]); + assertEquals("Fourth element not correct", 2, ac[3]); ac.refresh(); // and back to being unsorted - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], 1); - assertEquals("Second element not correct", ac[1], 2); - assertEquals("Third element not correct", ac[2], 1); - assertEquals("Fourth element not correct", ac[3], 2); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", 1, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); + assertEquals("Third element not correct", 1, ac[2]); + assertEquals("Fourth element not correct", 2, ac[3]); } // RTEs in Apache Flex 4.9.1 @@ -177,17 +177,17 @@ package mx.collections { ac.refresh(); ac.sort = null; - assertEquals("Length is not two", ac.length, 2); + assertEquals("Length is not two", 2, ac.length); ac.removeItemAt(0); // still sorted so 2 is removed leaving 1 - assertEquals("Length is not one", ac.length, 1); - assertEquals("First element not correct", ac[0], 1); + assertEquals("Length is not one", 1, ac.length); + assertEquals("First element not correct", 1, ac[0]); ac.refresh(); // still the same - assertEquals("Length is not one", ac.length, 1); - assertEquals("First element not correct", ac[0], 1); + assertEquals("Length is not one", 1, ac.length); + assertEquals("First element not correct", 1, ac[0]); } [Test] @@ -201,12 +201,12 @@ package mx.collections { ac.sort = sort; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); + assertEquals("Length is not four", 4, ac.length); - assertEquals("First element not correct", ac[0], 2); - assertEquals("Second element not correct", ac[1], 2); - assertEquals("Third element not correct", ac[2], 1); - assertEquals("Fourth element not correct", ac[3], 1); + assertEquals("First element not correct", 2, ac[0]); + assertEquals("Second element not correct", 2, ac[1]); + assertEquals("Third element not correct", 1, ac[2]); + assertEquals("Fourth element not correct", 1, ac[3]); } } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a0006003/frameworks/projects/framework/tests/mx/collections/SortStrings.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/framework/tests/mx/collections/SortStrings.as b/frameworks/projects/framework/tests/mx/collections/SortStrings.as index 6427cfa..bbdfbe7 100644 --- a/frameworks/projects/framework/tests/mx/collections/SortStrings.as +++ b/frameworks/projects/framework/tests/mx/collections/SortStrings.as @@ -51,11 +51,11 @@ package mx.collections { ac.sort = null; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "D"); - assertEquals("Second element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "D", ac[2]); + assertEquals("Second element not correct", "C", ac[3]); } [Test] @@ -65,11 +65,11 @@ package mx.collections { ac.sort = new Sort(); ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "C"); - assertEquals("Second element not correct", ac[3], "D"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "C", ac[2]); + assertEquals("Second element not correct", "D", ac[3]); } [Test] @@ -81,11 +81,11 @@ package mx.collections { ac.sort = sort; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "D"); - assertEquals("Second element not correct", ac[1], "C"); - assertEquals("First element not correct", ac[2], "B"); - assertEquals("Second element not correct", ac[3], "A"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "D", ac[0]); + assertEquals("Second element not correct", "C", ac[1]); + assertEquals("First element not correct", "B", ac[2]); + assertEquals("Second element not correct", "A", ac[3]); } [Test] @@ -97,11 +97,11 @@ package mx.collections { ac.sort = sort; ac.refresh(); - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "C"); - assertEquals("Second element not correct", ac[3], "D"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "C", ac[2]); + assertEquals("Second element not correct", "D", ac[3]); } [Test] @@ -113,11 +113,11 @@ package mx.collections { ac.sort = sort; // Short should not take effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "D"); - assertEquals("Second element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "D", ac[2]); + assertEquals("Second element not correct", "C", ac[3]); } [Test] @@ -131,20 +131,20 @@ package mx.collections { ac.sort = null; // Sort should be in effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "C"); - assertEquals("Second element not correct", ac[3], "D"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "C", ac[2]); + assertEquals("Second element not correct", "D", ac[3]); ac.refresh(); // and back to original - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "D"); - assertEquals("Second element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "D", ac[2]); + assertEquals("Second element not correct", "C", ac[3]); } [Test] @@ -159,11 +159,11 @@ package mx.collections { ac.refresh(); // Sort should not be in effect - assertEquals("Length is not four", ac.length, 4); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "D"); - assertEquals("Second element not correct", ac[3], "C"); + assertEquals("Length is not four", 4, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "D", ac[2]); + assertEquals("Second element not correct", "C", ac[3]); } // RTEs in APache flex 4.9.1 @@ -181,28 +181,28 @@ package mx.collections { // Sort should be in effect and first 4 items sorted // item added after are not sorted - assertEquals("Length is not eight", ac.length, 8); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "C"); - assertEquals("Second element not correct", ac[3], "D"); - assertEquals("First element not correct", ac[4], "A"); - assertEquals("Second element not correct", ac[5], "B"); - assertEquals("First element not correct", ac[6], "D"); - assertEquals("Second element not correct", ac[7], "C"); + assertEquals("Length is not eight", 8, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "C", ac[2]); + assertEquals("Second element not correct", "D", ac[3]); + assertEquals("First element not correct", "A", ac[4]); + assertEquals("Second element not correct", "B", ac[5]); + assertEquals("First element not correct", "D", ac[6]); + assertEquals("Second element not correct", "C", ac[7]); ac.refresh(); // and back to being unsorted - assertEquals("Length is not eight", ac.length, 8); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "B"); - assertEquals("First element not correct", ac[2], "D"); - assertEquals("Second element not correct", ac[3], "C"); - assertEquals("First element not correct", ac[4], "A"); - assertEquals("Second element not correct", ac[5], "B"); - assertEquals("First element not correct", ac[6], "D"); - assertEquals("Second element not correct", ac[7], "C"); + assertEquals("Length is not eight", 8, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "B", ac[1]); + assertEquals("First element not correct", "D", ac[2]); + assertEquals("Second element not correct", "C", ac[3]); + assertEquals("First element not correct", "A", ac[4]); + assertEquals("Second element not correct", "B", ac[5]); + assertEquals("First element not correct", "D", ac[6]); + assertEquals("Second element not correct", "C", ac[7]); } // RTEs in Apache Flex 4.9.1 @@ -217,16 +217,16 @@ package mx.collections { ac.refresh(); ac.sort = null; - assertEquals("Length is not four", ac.length, 4); + assertEquals("Length is not four", 4, ac.length); ac.removeItemAt(0); // still sorted so 2 is removed leaving 1 - assertEquals("Length is not three", ac.length, 3); - assertEquals("First element not correct", ac[0], "B"); + assertEquals("Length is not three", 3, ac.length); + assertEquals("First element not correct", "B", ac[0]); ac.refresh(); - assertEquals("Length is not four", ac.length, 3); - assertEquals("First element not correct", ac[0], "A"); + assertEquals("Length is not four", 3, ac.length); + assertEquals("First element not correct", "A", ac[0]); } [Test] @@ -240,15 +240,15 @@ package mx.collections { ac.sort = sort; ac.refresh(); - assertEquals("Length is not eight", ac.length, 8); - assertEquals("First element not correct", ac[0], "A"); - assertEquals("Second element not correct", ac[1], "A"); - assertEquals("First element not correct", ac[2], "B"); - assertEquals("Second element not correct", ac[3], "B"); - assertEquals("First element not correct", ac[4], "C"); - assertEquals("Second element not correct", ac[5], "C"); - assertEquals("First element not correct", ac[6], "D"); - assertEquals("Second element not correct", ac[7], "D"); + assertEquals("Length is not eight", 8, ac.length); + assertEquals("First element not correct", "A", ac[0]); + assertEquals("Second element not correct", "A", ac[1]); + assertEquals("First element not correct", "B", ac[2]); + assertEquals("Second element not correct", "B", ac[3]); + assertEquals("First element not correct", "C", ac[4]); + assertEquals("Second element not correct", "C", ac[5]); + assertEquals("First element not correct", "D", ac[6]); + assertEquals("Second element not correct", "D", ac[7]); } }
