Fixed: preserve type of boolean values when parsing CPPredicate format

When parsing a predicate format that contains a constant boolean expression
(e.g., 'key = YES') the value of the returned constant value expression has
the wrong type. Instead of using native types as values, the parser uses
[CPNumber +numberWithBool:].

This commit changes the format parser (CPPredicateScanner) to use native
booleans for constant value expression.

There's a test case that checks the parse result and an additional test
that ensures boolean expressions evaluate as expected with different kinds
of objects. The latter test passed before the fix but was added to ensure
compliance with Cocoa.
This commit is contained in:
Malte Tancred committed 2015-08-12 17:05:56 +02:00
1 parent 6420a51dd0
commit 26bb54472f
2 files changed
+53 -2

No files matched your search

+2 -2
View File
@@ -605,11 +605,11 @@
}
if ([self scanPredicateKeyword:@"TRUE"] || [self scanPredicateKeyword:@"YES"])
{
return [CPExpression expressionForConstantValue:[CPNumber numberWithBool:YES]];
return [CPExpression expressionForConstantValue:YES];
}
if ([self scanPredicateKeyword:@"FALSE"] || [self scanPredicateKeyword:@"NO"])
{
return [CPExpression expressionForConstantValue:[CPNumber numberWithBool:NO]];
return [CPExpression expressionForConstantValue:NO];
}
if ([self scanPredicateKeyword:@"SELF"])
{
+51
View File
@@ -526,6 +526,57 @@
[self assertTrue:[result isEqual:data] message:"[1, 2, 3] filtered with '" + [ctpred description] + "' should return [1, 2, 3]"];
}
- (void)testConstantValueExpressionWithBooleanValueIsBoolean
{
var right = [[CPPredicate predicateWithFormat:@"k = YES"] rightExpression];
[self assert:CPConstantValueExpressionType equals:[right expressionType]];
[self assert:YES equals:[right constantValue]];
[self assert:'boolean' equals:typeof [right constantValue]];
right = [[CPPredicate predicateWithFormat:@"k = NO"] rightExpression];
[self assert:CPConstantValueExpressionType equals:[right expressionType]];
[self assert:NO equals:[right constantValue]];
[self assert:'boolean' equals:typeof [right constantValue]];
}
- (void)testEvaluateBooleanConstantValueExpressionWithDifferentObjects
{
var yesPredicate = [CPPredicate predicateWithFormat:@"self = YES"],
noPredicate = [CPPredicate predicateWithFormat:@"self = NO"];
var evalYesPredicate = function(object) { return [yesPredicate evaluateWithObject:object]; },
evalNoPredicate = function(object) { return [noPredicate evaluateWithObject:object]; };
var fixtures = [
{
message:@"booleans",
values: [YES, NO],
expected_yes: [YES, NO],
expected_no: [ NO, YES]
},
{
message:@"numbers",
values: [ 0, 1, 2],
expected_yes: [ NO, YES, NO],
expected_no: [YES, NO, NO]
},
{
message:@"strings",
values: [@"1", @"2", @"true", @"false", @"", @"YES", @"NO"],
expected_yes: [ NO , NO , NO , NO , NO, NO , NO ],
expected_no: [ NO , NO , NO , NO , NO, NO , NO ]
}];
for (var i = 0; i < [fixtures count]; i++)
{
var fixture = fixtures[i];
[self assert:fixture.expected_yes equals:fixture.values.map(evalYesPredicate) message:fixture.message + " with YES-predicate"];
[self assert:fixture.expected_no equals:fixture.values.map(evalNoPredicate) message:fixture.message + " with NO-predicate"];
}
}
@end
@implementation CPObject (PredicateTesting)