diff options
| author | jmkiley <jordan.kiley@mapbox.com> | 2019-09-18 14:33:46 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2019-09-25 14:28:56 -0700 |
| commit | 06f4094502ec1490fd6168dc68b0257578d99869 (patch) | |
| tree | ea06eca67b27441f4eef51024a73aab241a42553 | |
| parent | fbe7ce8ada734bfa71a2a4a3481ed8e28b1aa21d (diff) | |
| download | qtlocation-mapboxgl-06f4094502ec1490fd6168dc68b0257578d99869.tar.gz | |
[ios] Fix spacing, a couple of tests
| -rw-r--r-- | platform/darwin/src/NSExpression+MGLAdditions.mm | 11 | ||||
| -rw-r--r-- | platform/darwin/test/MGLExpressionTests.mm | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/platform/darwin/src/NSExpression+MGLAdditions.mm b/platform/darwin/src/NSExpression+MGLAdditions.mm index e07216ecc8..ee598bfdd5 100644 --- a/platform/darwin/src/NSExpression+MGLAdditions.mm +++ b/platform/darwin/src/NSExpression+MGLAdditions.mm @@ -1057,7 +1057,8 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { NSString *function = self.function; BOOL hasCollectionProperty = !(self.arguments.firstObject.expressionType == NSConstantValueExpressionType || self.arguments.firstObject.expressionType == NSKeyPathExpressionType - || self.arguments.firstObject.expressionType == NSVariableExpressionType || !self.arguments.firstObject.expressionType); + || self.arguments.firstObject.expressionType == NSVariableExpressionType || !self.arguments.firstObject.expressionType + ); NSString *op = MGLExpressionOperatorsByFunctionNames[function]; if (op) { NSArray *arguments = self.arguments.mgl_jsonExpressionObject; @@ -1082,7 +1083,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } else if ([function isEqualToString:@"min:"]) { NSArray *arguments; if (!hasCollectionProperty) { - arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; + arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; } else { arguments = [self.arguments.firstObject.collection valueForKeyPath:@"mgl_jsonExpressionObject"]; } @@ -1090,9 +1091,9 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } else if ([function isEqualToString:@"max:"]) { NSArray *arguments; if (!hasCollectionProperty) { - arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; + arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; } else { - arguments = [self.arguments.firstObject.collection valueForKeyPath:@"mgl_jsonExpressionObject"]; + arguments = [self.arguments.firstObject.collection valueForKeyPath:@"mgl_jsonExpressionObject"]; } return [@[@"max"] arrayByAddingObjectsFromArray:arguments]; } else if ([function isEqualToString:@"exp:"]) { @@ -1103,7 +1104,7 @@ NSArray *MGLSubexpressionsWithJSONObjects(NSArray *objects) { } else if ([function isEqualToString:@"mgl_join:"]) { NSArray *arguments; if (!hasCollectionProperty) { - arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; + arguments = [self.arguments valueForKeyPath:@"mgl_jsonExpressionObject"]; } else { arguments = [self.arguments.firstObject.collection valueForKeyPath:@"mgl_jsonExpressionObject"]; } diff --git a/platform/darwin/test/MGLExpressionTests.mm b/platform/darwin/test/MGLExpressionTests.mm index b4455f9da4..e5f78365b8 100644 --- a/platform/darwin/test/MGLExpressionTests.mm +++ b/platform/darwin/test/MGLExpressionTests.mm @@ -356,12 +356,6 @@ using namespace std::string_literals; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { - NSExpression *expression = [NSExpression expressionForFunction:@"sum:" arguments:@[@1, @2, @2, @3, @4, @7, @9]]; - NSArray *jsonExpression = @[@"+", @1, @2, @2, @3, @4, @7, @9]; - XCTAssertEqualObjects([expression expressionValueWithObject:nil context:nil], @28); - XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); - } - { NSExpression *expression = [NSExpression expressionWithFormat:@"count({1, 2, 2, 3, 4, 7, 9})"]; NSArray *jsonExpression = @[@"length", @[@"literal", @[@1, @2, @2, @3, @4, @7, @9]]]; XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); @@ -394,6 +388,12 @@ using namespace std::string_literals; XCTAssertEqualObjects([NSExpression expressionWithMGLJSONObject:jsonExpression], expression); } { + NSExpression *expression = [NSExpression expressionForFunction:@"sum:" arguments:arguments]; + NSArray *jsonExpression = @[@"+", @1, @1]; + XCTAssertEqualObjects(expression.mgl_jsonExpressionObject, jsonExpression); + XCTAssertEqualObjects([NSExpression expressionWithFormat:@"1 + 1"].mgl_jsonExpressionObject, jsonExpression); + } + { NSArray *threeArguments = @[MGLConstantExpression(@1), MGLConstantExpression(@1), MGLConstantExpression(@1)]; NSExpression *expression = [NSExpression expressionForFunction:@"add:to:" arguments:threeArguments]; NSArray *jsonExpression = @[@"+", @1, @1, @1]; |