diff options
author | Fabian Guerra Soto <fabian.guerra@mapbox.com> | 2019-03-21 12:36:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-21 12:36:39 -0700 |
commit | 1388f3a502220b32b7eb00ad57e6c048e99b9fcd (patch) | |
tree | 4740cfee447c047053e50ee5b56b853d505355ba /platform/darwin/test/MGLExpressionTests.mm | |
parent | 0945165353afde4403ffee44b01abd51bff763ce (diff) | |
download | qtlocation-mapboxgl-1388f3a502220b32b7eb00ad57e6c048e99b9fcd.tar.gz |
[ios, macos] Fix conditional expression parsing error. (#14181)
Fixed an error that caused conditional expressions to crash when a conditional parameter was also a conditional expression.
Diffstat (limited to 'platform/darwin/test/MGLExpressionTests.mm')
-rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index ec51f2bf6c..2a4d40b4c5 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -846,12 +846,9 @@ using namespace std::string_literals; } { NSExpression *expression = [NSExpression expressionWithFormat:@"TERNARY(0 = 1, TRUE, TERNARY(1 = 2, TRUE, FALSE))"]; - NSArray *jsonExpression = @[@"case", @[@"==", @0, @1], @YES, @[@"==", @1, @2], @YES, @NO]; + NSArray *jsonExpression = @[@"case", @[@"==", @0, @1], @YES, @[@"case", @[@"==", @1, @2], @YES, @NO]]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); XCTAssertEqualObjects([expression expressionValueWithObject:nil context:nil], @NO); - expression = [NSExpression expressionWithFormat:@"MGL_IF(%@, TRUE, %@, TRUE, FALSE)", - MGLConstantExpression([NSPredicate predicateWithFormat:@"0 = 1"]), - MGLConstantExpression([NSPredicate predicateWithFormat:@"1 = 2"])]; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { |