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/07/16 22:48:09 UTC
[1/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34854 Minor
edits while checking a mustella failure.
Repository: flex-sdk
Updated Branches:
refs/heads/develop b709fd13a -> a722cf981
FLEX-34854
Minor edits while checking a mustella failure.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/33c0a067
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/33c0a067
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/33c0a067
Branch: refs/heads/develop
Commit: 33c0a067ada244eb5f867037a2d920e4f85895e9
Parents: b709fd1
Author: Mihai Chira <mi...@apache.org>
Authored: Thu Jul 16 22:23:14 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Thu Jul 16 22:23:14 2015 +0200
----------------------------------------------------------------------
.../framework/src/mx/collections/Sort.as | 9 +++--
.../Japanese/tests/runtimeErrorTests.mxml | 37 +++++++++++---------
2 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/33c0a067/frameworks/projects/framework/src/mx/collections/Sort.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/collections/Sort.as b/frameworks/projects/framework/src/mx/collections/Sort.as
index 6348691..2859f48 100644
--- a/frameworks/projects/framework/src/mx/collections/Sort.as
+++ b/frameworks/projects/framework/src/mx/collections/Sort.as
@@ -264,8 +264,8 @@ public class Sort extends EventDispatcher implements ISort
*/
public function set compareFunction(value:Function):void
{
- _compareFunction = value;
- usingCustomCompareFunction = _compareFunction != null;
+ _compareFunction = value;
+ usingCustomCompareFunction = _compareFunction != null;
}
//----------------------------------
@@ -402,8 +402,7 @@ public class Sort extends EventDispatcher implements ISort
{
fieldsForCompare = [];
//build up the fields we can compare, if we skip a field in the
- //middle throw an error. it is ok to not have all the fields
- //though
+ //middle throw an error. It is ok to not have all the fields though
var field:ISortField;
var hadPreviousFieldName:Boolean = true;
for (var i:int = 0; i < fields.length; i++)
@@ -431,7 +430,7 @@ public class Sort extends EventDispatcher implements ISort
}
else
{
- //this is ok because sometimes a sortfield might
+ //this is ok because sometimes a SortField might
//have a custom comparator
fieldsForCompare.push(null);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/33c0a067/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
index a168bf8..cde5798 100644
--- a/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
+++ b/mustella/tests/LangPacks/Japanese/tests/runtimeErrorTests.mxml
@@ -59,7 +59,7 @@
private function triggerMissingCardNumberRTE():void{
var ccv:CreditCardValidator = new CreditCardValidator();
- var obj:Object = new Object();
+ var obj:Object = {};
obj.cardType=CreditCardValidatorCardType.MASTER_CARD;
obj.cardNumber=null;
CreditCardValidator.validateCreditCard(ccv, obj, "");
@@ -145,40 +145,45 @@
s.findItem(null, null, null);
}
- private function cmpFn(o1:Object, o2:Object):void{
+ private function cmpFn(o1:Object, o2:Object):void
+ {
}
private function triggerFindConditionRTE():void{
- var a:Array = new Array();
- var s:Sort = new Sort();
- a.push("a");
+ var a:Array = [];
+ a.push("a");
+
+ var s:Sort = new Sort();
s.compareFunction = cmpFn;
- var sfArray:Array = new Array();
+
+ var sfArray:Array = [];
sfArray.push(new SortField("0"));
sfArray.push(new SortField("field1"));
- var o:Object = new Object();
+
+ var o:Object = {};
o["0"] = undefined;
o["field1"] = 2;
+
s.fields = sfArray;
s.findItem(a, o, null);
}
private function triggerFindRestrictionRTE():void{
- var a:Array = new Array();
+ var a:Array = [];
var s:Sort = new Sort();
a.push("a");
s.compareFunction = cmpFn;
- var sfArray:Array = new Array();
+ var sfArray:Array = [];
sfArray.push(new SortField("0"));
- var o:Object = new Object();
+ var o:Object = {};
o["0"] = undefined;
s.fields = sfArray;
s.findItem(a, o, null);
}
private function triggerUnknownModeRTE():void{
- var a:Array = new Array();
+ var a:Array = [];
var s:Sort = new Sort();
a.push(new Object());
s.compareFunction = cmpFn;
@@ -186,11 +191,11 @@
}
private function triggerNonUniqueRTE():void{
- var a:Array = new Array();
+ var a:Array = [];
var s:Sort = new Sort();
a.push("a");
a.push("b");
- var sfArray:Array = new Array();
+ var sfArray:Array = [];
sfArray.push(new SortField("0"));
s.fields = sfArray;
s.unique = true;
@@ -198,13 +203,13 @@
}
private function triggerNoComparatorSortFieldRTE():void{
- var a:Array = new Array();
+ var a:Array = [];
var s:Sort = new Sort();
var o2:Object = new Object();
o2["0"] = new Bitmap();
a.push(null);
a.push(o2);
- var sfArray:Array = new Array();
+ var sfArray:Array = [];
sfArray.push(new SortField("0"));
sfArray.push(new SortField("1"));
s.fields = sfArray;
@@ -214,7 +219,7 @@
private function triggerInvalidTypeRTE():void{
var x:XMLListAdapter = new XMLListAdapter();
- x.addItemAt(new Object(), 0);
+ x.addItemAt({}, 0);
}
private function triggerColumnNotFoundRTE():void{
[2/2] git commit: [flex-sdk] [refs/heads/develop] - FLEX-34852 Fixing
mustella failure introduced by a commit on this ticket. The bug was that
SortField.objectHasSortFieldValue() returned true instead of false when the
object didn't have that field. This
Posted by mi...@apache.org.
FLEX-34852
Fixing mustella failure introduced by a commit on this ticket. The bug was that SortField.objectHasSortFieldValue() returned true instead of false when the object didn't have that field. This was because an object typed as Object is always null, even when undefined is assigned to it. It needed to be typed as *. (This is reproduced in SortField_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/a722cf98
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a722cf98
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a722cf98
Branch: refs/heads/develop
Commit: a722cf981df6d85fae701137d2588bd9e59de2e7
Parents: 33c0a06
Author: Mihai Chira <mi...@apache.org>
Authored: Thu Jul 16 22:44:49 2015 +0200
Committer: Mihai Chira <mi...@apache.org>
Committed: Thu Jul 16 22:44:49 2015 +0200
----------------------------------------------------------------------
.../framework/src/mx/collections/SortField.as | 2 +-
.../projects/framework/tests/SortField_Tests.as | 22 ++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a722cf98/frameworks/projects/framework/src/mx/collections/SortField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/collections/SortField.as b/frameworks/projects/framework/src/mx/collections/SortField.as
index 821690e..a465656 100644
--- a/frameworks/projects/framework/src/mx/collections/SortField.as
+++ b/frameworks/projects/framework/src/mx/collections/SortField.as
@@ -676,7 +676,7 @@ public class SortField extends EventDispatcher implements ISortField
protected function getSortFieldValue(obj:Object):*
{
- var result:Object = undefined;
+ var result:* = undefined;
try
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a722cf98/frameworks/projects/framework/tests/SortField_Tests.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/tests/SortField_Tests.as b/frameworks/projects/framework/tests/SortField_Tests.as
new file mode 100644
index 0000000..3cd3871
--- /dev/null
+++ b/frameworks/projects/framework/tests/SortField_Tests.as
@@ -0,0 +1,22 @@
+package {
+ import mx.collections.SortField;
+
+ import org.flexunit.asserts.assertFalse;
+
+ public class SortField_Tests {
+ private var _sut:SortField;
+
+ [Test]
+ public function fix_mustella_failure_due_to_FLEX_34852():void
+ {
+ //given
+ _sut = new SortField("someField");
+
+ //when
+ var emptyObjectHasASortField:Boolean = _sut.objectHasSortField({});
+
+ //then
+ assertFalse(emptyObjectHasASortField);
+ }
+ }
+}